jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

style changes

Browse source
This commit is contained in:
Kyle Mahan 2015-06-20 22:09:04 +00:00
parent cf49cfea2c
commit 48ba226148
7 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
requirements.txt
View file

@ -17,7 +17,7 @@ blinker==1.3
cffi==0.9.2 cffi==0.9.2
click==4.0 click==4.0
cryptography==0.8.2 cryptography==0.8.2
feedparser==5.2.0 feedparser>=5.2.0
html5lib==0.99999 html5lib==0.99999
itsdangerous==0.24 itsdangerous==0.24
mf2py==0.2.6 mf2py==0.2.6

9
woodwind/static/style.css
View file

@ -370,6 +370,11 @@ a {
a:hover { a:hover {
color: #993366; } color: #993366; }
p:first-child {
margin-top: 0; }
p:last-child {
margin-bottom: 0; }
header, main { header, main {
max-width: 600px; max-width: 600px;
margin: 0 auto; } margin: 0 auto; }
@ -386,10 +391,10 @@ ul#navigation {
display: inline-block; display: inline-block;
padding: 3px; } padding: 3px; }
.pager { .button-link {
text-align: center; text-align: center;
margin: 1em 0; } margin: 1em 0; }
.pager a { .button-link a {
padding: 0.5em; padding: 0.5em;
background-color: #353129; background-color: #353129;
color: #ecebf0; color: #ecebf0;

11
woodwind/static/style.scss
View file

@ -32,6 +32,15 @@ a:hover {
} }
p {
&:first-child {
margin-top:0;
}
&:last-child {
margin-bottom:0;
}
}
header, main { header, main {
max-width: 600px; max-width: 600px;
margin: 0 auto; margin: 0 auto;
@ -53,7 +62,7 @@ ul#navigation {
} }
} }
.pager { .button-link {
text-align: center; text-align: center;
margin: 1em 0; margin: 1em 0;

2
woodwind/templates/base.jinja2
View file

@ -8,7 +8,7 @@
<link rel="shortcut icon" href="{{ url_for('static', filename='logo.png') }}"/> <link rel="shortcut icon" href="{{ url_for('static', filename='logo.png') }}"/>
<link rel="apple-touch-icon" href="{{ url_for('static', filename='logo.png') }}"/> <link rel="apple-touch-icon" href="{{ url_for('static', filename='logo.png') }}"/>
<link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-05-12') }}"/> <link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-06-17') }}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"/> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"/>
<script src="//code.jquery.com/jquery-2.1.3.min.js"></script> <script src="//code.jquery.com/jquery-2.1.3.min.js"></script>
<script src="{{ url_for('static', filename='moment.min.js') }}"></script> <script src="{{ url_for('static', filename='moment.min.js') }}"></script>

6
woodwind/templates/feed.jinja2
View file

@ -4,7 +4,7 @@
{% if ws_topic %} {% if ws_topic %}
<script>var WS_TOPIC = "{{ ws_topic }}";</script> <script>var WS_TOPIC = "{{ ws_topic }}";</script>
{% endif %} {% endif %}
<script src="{{url_for('static', filename='feed.js', version='2015-05-12_1')}}"></script> <script src="{{url_for('static', filename='feed.js', version='2015-05-28')}}"></script>
{% if current_user and current_user.settings {% if current_user and current_user.settings
and current_user.settings.get('reply-method') == 'indie-config' %} and current_user.settings.get('reply-method') == 'indie-config' %}
@ -32,7 +32,7 @@
{% block body %} {% block body %}
<div class="pager"> <div class="button-link">
<a id="unfold-link" href="#">n New Entries</a> <a id="unfold-link" href="#">n New Entries</a>
</div> </div>
@ -44,7 +44,7 @@
{% endfor %} {% endfor %}
{% if entries and not solo %} {% if entries and not solo %}
<div class="pager"> <div class="pager button-link">
<a id="older-link" href="{{ url_for_other_page(page=page+1) }}">Older</a> <a id="older-link" href="{{ url_for_other_page(page=page+1) }}">Older</a>
</div> </div>
{% endif %} {% endif %}

2
woodwind/util.py
View file

@ -4,7 +4,7 @@ import re
bleach.ALLOWED_TAGS += [ bleach.ALLOWED_TAGS += [
'a', 'img', 'p', 'br', 'marquee', 'blink', 'a', 'img', 'p', 'br', 'marquee', 'blink',
'audio', 'video', 'table', 'tbody', 'td', 'tr', 'div', 'span', 'audio', 'video', 'table', 'tbody', 'td', 'tr', 'div', 'span',
'pre', 'pre', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
] ]
bleach.ALLOWED_ATTRIBUTES.update({ bleach.ALLOWED_ATTRIBUTES.update({

2
woodwind/views.py
View file

@ -336,7 +336,7 @@ def add_subscription(origin, feed_url, type, tags=None):
if not name: if not name:
p = urllib.parse.urlparse(origin) p = urllib.parse.urlparse(origin)
name = p.netloc + p.path name = p.netloc + p.path
feed = Feed(name=name, origin=origin, feed=feed_url, type=type) feed = Feed(name=name[:140], origin=origin, feed=feed_url, type=type)
if feed: if feed:
db.session.add(feed) db.session.add(feed)