public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #343 from djc/master

Browse source 
Fix default feed pane size to fit buttons with labels (v3)
This commit is contained in:
Samuel Clay 2013-07-05 19:40:21 -07:00
commit 9f2ab66255
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/profile/models.py
View file

@ -39,7 +39,7 @@ class Profile(models.Model):
preferences = models.TextField(default="{}")
view_settings = models.TextField(default="{}")
collapsed_folders = models.TextField(default="[]")
feed_pane_size = models.IntegerField(default=240)
feed_pane_size = models.IntegerField(default=242)
tutorial_finished = models.BooleanField(default=False)
hide_getting_started = models.NullBooleanField(default=False, null=True, blank=True)
has_setup_feeds = models.NullBooleanField(default=False, null=True, blank=True)
@ -826,4 +826,4 @@ class RNewUserQueue:
r.zrem(cls.KEY, user)
return user

4
config/fixtures/bootstrap.json
View file

@ -12,7 +12,7 @@
"model": "profile.profile",
"fields": {
"secret_token": "4a700381ea08",
"feed_pane_size": 240,
"feed_pane_size": 242,
"last_seen_ip": null,
"view_settings": "{}",
"is_premium": false,
@ -83,4 +83,4 @@
"popular_authors": "[]"
}
}
]
]

4
media/js/newsblur/reader/reader.js
View file

@ -260,7 +260,7 @@
togglerLength_open: 0
});
if (this.model.preference('feed_pane_size') < 240) {
if (this.model.preference('feed_pane_size') < 242) {
this.layout.outerLayout.resizeAll();
}
@ -5645,4 +5645,4 @@
});
})(jQuery);
})(jQuery);

2
templates/base.html
View file

@ -34,7 +34,7 @@
NEWSBLUR.Preferences = {
'unread_view' : 0,
'lock_mouse_indicator' : 100,
'feed_pane_size' : {% firstof user_profile.feed_pane_size 240 %},
'feed_pane_size' : {% firstof user_profile.feed_pane_size 242 %},
'hide_getting_started' : {{ user_profile.hide_getting_started|yesno:"true,false" }},
'has_setup_feeds' : {{ user_profile.has_setup_feeds|yesno:"true,false" }},
'has_found_friends' : {{ user_profile.has_found_friends|yesno:"true,false" }},

4
templates/reader/dashboard.xhtml
View file

@ -31,7 +31,7 @@
<h1 class="NB-splash-heading">NewsBlur</h1>
<h2 class="NB-splash-heading">- The best stories from your friends and favorite blogs, all in one place.</h2>
<div id="NB-splash" style="left: {% firstof user_profile.feed_pane_size 240 %}px">
<div id="NB-splash" style="left: {% firstof user_profile.feed_pane_size 242 %}px">
<div class="NB-splash-modules">
<div class="NB-modules-center">
@ -83,4 +83,4 @@
{% render_feeds_skeleton %}
{% endblock %}
{% endblock %}