mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Whitney everywhere. This is a big change. I think everything needs a 1px bump up in size.
This commit is contained in:
Samuel Clay
parent
4cb24cf7f2
commit
cb0ccb3e02
6 changed files with 109 additions and 26 deletions
|
|
@ -5,6 +5,11 @@
|
|||
dest: /srv/newsblur/newsblur_web/local_settings.py
|
||||
register: app_changed
|
||||
|
||||
- name: Add SERVER_NAME to app secrets
|
||||
lineinfile:
|
||||
path: /srv/newsblur/newsblur_web/local_settings.py
|
||||
line: 'SERVER_NAME = "{{ inventory_hostname }}"'
|
||||
|
||||
- name: "Start docker containers"
|
||||
become: yes
|
||||
docker_container:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@
|
|||
dest: /srv/newsblur/newsblur_web/local_settings.py
|
||||
register: app_changed
|
||||
|
||||
- name: Add SERVER_NAME to app secrets
|
||||
lineinfile:
|
||||
path: /srv/newsblur/newsblur_web/local_settings.py
|
||||
line: 'SERVER_NAME = "{{ inventory_hostname }}"'
|
||||
|
||||
- name: Start monitor docker container
|
||||
become: yes
|
||||
docker_container:
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@
|
|||
dest: /srv/newsblur/newsblur_web/local_settings.py
|
||||
register: app_changed
|
||||
|
||||
- name: Add SERVER_NAME to app secrets
|
||||
lineinfile:
|
||||
path: /srv/newsblur/newsblur_web/local_settings.py
|
||||
line: 'SERVER_NAME = "{{ inventory_hostname }}"'
|
||||
|
||||
- name: Start NewsBlur Web Docker container
|
||||
become: yes
|
||||
docker_container:
|
||||
|
|
|
|||
|
|
@ -973,11 +973,11 @@ hr {
|
|||
float: right;
|
||||
font-weight: bold;
|
||||
color: #FFF;
|
||||
padding: 3px 1px 1px;
|
||||
padding: 2px 1px 1px;
|
||||
margin: 3px 1px 0;
|
||||
background-color: #8eb6e8;
|
||||
display: none;
|
||||
line-height: 10px;
|
||||
line-height: 11px;
|
||||
border-radius: 4px;
|
||||
/* border-top: 1px solid rgba(255, 255, 255, .4);*/
|
||||
border-bottom: 1px solid rgba(0, 0, 0, .1);
|
||||
|
|
@ -1896,7 +1896,7 @@ hr {
|
|||
margin: 3px 0;
|
||||
color: #B6B6B6;
|
||||
font-size: 11px;
|
||||
line-height: 2.2em;
|
||||
line-height: 1.2em;
|
||||
overflow: hidden;
|
||||
font-weight: normal;
|
||||
text-overflow: ellipsis;
|
||||
|
|
@ -2612,7 +2612,7 @@ hr {
|
|||
/* ==================== */
|
||||
|
||||
body {
|
||||
font-family: "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif;
|
||||
font-family: 'Whitney A', 'Whitney B', -apple-system, BlinkMacSystemFont, "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif;
|
||||
}
|
||||
|
||||
.NB-theme-sans-serif-alt1 #story_pane {
|
||||
|
|
@ -5044,6 +5044,7 @@ background: transparent;
|
|||
font-weight: bold;
|
||||
}
|
||||
.NB-filter-popover .NB-menu-manage-view-setting-contentpreview .NB-icon,
|
||||
.NB-style-popover .NB-menu-manage-view-setting-contentpreview .NB-icon,
|
||||
.NB-style-popover .NB-options-line-spacing .NB-icon {
|
||||
width: 32px;
|
||||
height: 20px;
|
||||
|
|
@ -5052,13 +5053,16 @@ background: transparent;
|
|||
background-repeat: no-repeat;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-small .NB-icon {
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-small .NB-icon,
|
||||
.NB-style-popover .NB-view-setting-contentpreview-small .NB-icon {
|
||||
background-image: url("/media/embed/reader/content_preview_small.png");
|
||||
}
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-medium .NB-icon {
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-medium .NB-icon,
|
||||
.NB-style-popover .NB-view-setting-contentpreview-medium .NB-icon {
|
||||
background-image: url("/media/embed/reader/content_preview_medium.png");
|
||||
}
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-large .NB-icon {
|
||||
.NB-filter-popover .NB-view-setting-contentpreview-large .NB-icon,
|
||||
.NB-style-popover .NB-view-setting-contentpreview-large .NB-icon {
|
||||
background-image: url("/media/embed/reader/content_preview_large.png");
|
||||
}
|
||||
.NB-style-popover .NB-options-line-spacing-xs .NB-icon {
|
||||
|
|
@ -5128,7 +5132,7 @@ background: transparent;
|
|||
padding: 1px 4px;
|
||||
line-height: 10px;
|
||||
margin: 2px 4px 0;
|
||||
font-family: "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif;
|
||||
/* font-family: "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif; */
|
||||
}
|
||||
.NB-style-popover .NB-premium-explainer {
|
||||
font-size: 10px;
|
||||
|
|
@ -5383,7 +5387,7 @@ form.opml_import_form input {
|
|||
margin: 0;
|
||||
padding: 0;
|
||||
font-weight: 300;
|
||||
font-family: "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif;
|
||||
/* font-family: "Lucida Grande", Verdana, "Helvetica Neue", Helvetica, sans-serif; */
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link {
|
||||
|
|
@ -8182,7 +8186,7 @@ form.opml_import_form input {
|
|||
padding: 8px;
|
||||
margin: 0;
|
||||
border: 1px solid #E0E0E0;
|
||||
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
|
||||
/* font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; */
|
||||
}
|
||||
.NB-modal-recommend .NB-modal-recommend-credit {
|
||||
color: #505050;
|
||||
|
|
@ -8313,7 +8317,7 @@ form.opml_import_form input {
|
|||
padding: 8px 0 0 8px;
|
||||
margin: 0;
|
||||
border: 1px solid #808080;
|
||||
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
|
||||
/* font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; */
|
||||
}
|
||||
.NB-modal-email .NB-modal-email-to-container,
|
||||
.NB-modal-email .NB-modal-email-from-container {
|
||||
|
|
@ -9850,7 +9854,7 @@ form.opml_import_form input {
|
|||
.NB-modal-goodies .NB-goodies-contenthandler-button {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
font-family: 'Lucida Grande', Verdana, sans-serif;
|
||||
/* font-family: 'Lucida Grande', Verdana, sans-serif; */
|
||||
font-weight: bold;
|
||||
font-size: 11px;
|
||||
border-radius: 8px;
|
||||
|
|
@ -12459,7 +12463,8 @@ form.opml_import_form input {
|
|||
.NB-filter-popover-container .popover-content {
|
||||
padding: 0;
|
||||
}
|
||||
.NB-filter-popover .segmented-control {
|
||||
.NB-filter-popover .segmented-control,
|
||||
.NB-style-popover .segmented-control {
|
||||
margin: 4px 0 0;
|
||||
line-height: 18px;
|
||||
float: none;
|
||||
|
|
@ -12477,14 +12482,21 @@ form.opml_import_form input {
|
|||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li {
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li,
|
||||
.NB-style-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li {
|
||||
padding: 2px 9px 2px;
|
||||
font-size: 11px;
|
||||
width: 30px;
|
||||
height: 20px;
|
||||
}
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li.NB-view-setting-contentpreview-title {
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li.NB-view-setting-contentpreview-title,
|
||||
.NB-style-popover .segmented-control.NB-menu-manage-view-setting-contentpreview li.NB-view-setting-contentpreview-title {
|
||||
width: 64px;
|
||||
}
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-imagepreview li {
|
||||
.NB-filter-popover .segmented-control.NB-menu-manage-view-setting-imagepreview li,
|
||||
.NB-style-popover .segmented-control.NB-menu-manage-view-setting-imagepreview li {
|
||||
padding: 2px 7px 2px;
|
||||
font-size: 11px;
|
||||
width: 62px;
|
||||
}
|
||||
.NB-filter-popover .segmented-control .NB-unread-icon,
|
||||
|
|
@ -12572,10 +12584,13 @@ form.opml_import_form input {
|
|||
.NB-popover-section-title {
|
||||
color: #585A55;
|
||||
text-transform: uppercase;
|
||||
margin: 0 0 10px;
|
||||
margin: 12px 0 10px;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.NB-popover-section-title:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.NB-popover-section {
|
||||
padding: 22px 18px 22px;
|
||||
border-bottom: 1px solid #E8EAE4;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
top: 12,
|
||||
left: -64
|
||||
},
|
||||
'show_contentpreview': true,
|
||||
'show_imagepreview': true,
|
||||
'overlay_bottom': true,
|
||||
'popover_class': 'NB-style-popover-container'
|
||||
},
|
||||
|
|
@ -18,6 +20,7 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
"click .NB-font-family-option": "change_font_family",
|
||||
"click .NB-story-font-size-option": "change_story_font_size",
|
||||
"click .NB-feed-font-size-option": "change_feed_font_size",
|
||||
"click .NB-view-setting-option": "change_view_setting",
|
||||
"click .NB-line-spacing-option": "change_line_spacing",
|
||||
"click .NB-story-titles-pane-option": "change_story_titles_pane",
|
||||
"click .NB-single-story-option": "change_single_story",
|
||||
|
|
@ -140,7 +143,7 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
]))
|
||||
]),
|
||||
$.make('div', { className: 'NB-popover-section' }, [
|
||||
$.make('div', { className: 'NB-popover-section-title' }, 'Font Size - Stories'),
|
||||
$.make('div', { className: 'NB-popover-section-title' }, 'Story styling'),
|
||||
$.make('ul', { className: 'segmented-control NB-options-story-font-size' }, [
|
||||
$.make('li', { className: 'NB-story-font-size-option NB-options-font-size-xs' }, 'XS'),
|
||||
$.make('li', { className: 'NB-story-font-size-option NB-options-font-size-s' }, 'S'),
|
||||
|
|
@ -155,14 +158,25 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
$.make('li', { className: 'NB-line-spacing-option NB-options-line-spacing-l' }, $.make('div', { className: 'NB-icon' })),
|
||||
$.make('li', { className: 'NB-line-spacing-option NB-options-line-spacing-xl' }, $.make('div', { className: 'NB-icon' }))
|
||||
]),
|
||||
$.make('div', { className: 'NB-popover-section-title' }, 'Font Size - Feeds'),
|
||||
$.make('div', { className: 'NB-popover-section-title' }, 'Feed title styling'),
|
||||
$.make('ul', { className: 'segmented-control NB-options-feed-font-size' }, [
|
||||
$.make('li', { className: 'NB-feed-font-size-option NB-options-font-size-xs' }, 'XS'),
|
||||
$.make('li', { className: 'NB-feed-font-size-option NB-options-font-size-s' }, 'S'),
|
||||
$.make('li', { className: 'NB-feed-font-size-option NB-options-font-size-m NB-active' }, 'M'),
|
||||
$.make('li', { className: 'NB-feed-font-size-option NB-options-font-size-l' }, 'L'),
|
||||
$.make('li', { className: 'NB-feed-font-size-option NB-options-font-size-xl' }, 'XL')
|
||||
])
|
||||
]),
|
||||
(this.options.show_contentpreview && $.make('ul', { className: 'segmented-control NB-menu-manage-view-setting-contentpreview' }, [
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-contentpreview-title' }, 'Title only'),
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-contentpreview-small' }, $.make('div', { className: 'NB-icon' })),
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-contentpreview-medium' }, $.make('div', { className: 'NB-icon' })),
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-contentpreview-large' }, $.make('div', { className: 'NB-icon' })),
|
||||
])),
|
||||
(this.options.show_imagepreview && $.make('ul', { className: 'segmented-control NB-menu-manage-view-setting-imagepreview' }, [
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-imagepreview-none' }, 'No image'),
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-imagepreview-small' }, 'Small'),
|
||||
$.make('li', { className: 'NB-view-setting-option NB-view-setting-imagepreview-large' }, 'Large'),
|
||||
]))
|
||||
])
|
||||
]));
|
||||
|
||||
|
|
@ -178,10 +192,13 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
var single_story = NEWSBLUR.assets.preference('feed_view_single_story');
|
||||
var grid_columns = NEWSBLUR.assets.preference('grid_columns');
|
||||
var grid_height = NEWSBLUR.assets.preference('grid_height');
|
||||
var image_preview = NEWSBLUR.assets.preference('show_image_preview');
|
||||
var content_preview = NEWSBLUR.assets.preference('show_content_preview');
|
||||
|
||||
this.$('.NB-font-family-option').removeClass('NB-active');
|
||||
this.$('.NB-options-font-family-'+font_family).addClass('NB-active');
|
||||
|
||||
this.$('.NB-view-setting-option').removeClass('NB-active');
|
||||
this.$('.NB-feed-font-size-option').removeClass('NB-active');
|
||||
this.$('.NB-story-font-size-option').removeClass('NB-active');
|
||||
this.$('.NB-options-story-font-size .NB-options-font-size-'+story_font_size).addClass('NB-active');
|
||||
|
|
@ -199,6 +216,14 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
this.$('.NB-grid-height-option').removeClass('NB-active');
|
||||
this.$('.NB-options-grid-height-'+grid_height).addClass('NB-active');
|
||||
|
||||
this.$('.NB-view-setting-contentpreview-title').toggleClass('NB-active', content_preview == '0' || content_preview == "title");
|
||||
this.$('.NB-view-setting-contentpreview-small').toggleClass('NB-active', content_preview == "small");
|
||||
this.$('.NB-view-setting-contentpreview-medium').toggleClass('NB-active', content_preview == "1" || content_preview == "medium");
|
||||
this.$('.NB-view-setting-contentpreview-large').toggleClass('NB-active', content_preview == "large");
|
||||
this.$('.NB-view-setting-imagepreview-none').toggleClass('NB-active', image_preview == "0" || image_preview == "none");
|
||||
this.$('.NB-view-setting-imagepreview-small').toggleClass('NB-active', image_preview == "small");
|
||||
this.$('.NB-view-setting-imagepreview-large').toggleClass('NB-active', image_preview == "1" || image_preview == "large");
|
||||
|
||||
NEWSBLUR.reader.$s.$taskbar_options.addClass('NB-active');
|
||||
|
||||
if (!NEWSBLUR.Globals.is_premium) {
|
||||
|
|
@ -413,6 +438,36 @@ NEWSBLUR.StoryOptionsPopover = NEWSBLUR.ReaderPopover.extend({
|
|||
NEWSBLUR.reader.resize_window();
|
||||
});
|
||||
},
|
||||
|
||||
change_view_setting: function(e) {
|
||||
var $target = $(e.currentTarget);
|
||||
var options = {};
|
||||
|
||||
if ($target.hasClass("NB-view-setting-contentpreview-title")) {
|
||||
NEWSBLUR.assets.preference('show_content_preview', "title");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-contentpreview-small")) {
|
||||
NEWSBLUR.assets.preference('show_content_preview', "small");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-contentpreview-medium")) {
|
||||
NEWSBLUR.assets.preference('show_content_preview', "medium");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-contentpreview-large")) {
|
||||
NEWSBLUR.assets.preference('show_content_preview', "large");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-imagepreview-none")) {
|
||||
NEWSBLUR.assets.preference('show_image_preview', "none");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-imagepreview-small")) {
|
||||
NEWSBLUR.assets.preference('show_image_preview', "small");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
} else if ($target.hasClass("NB-view-setting-imagepreview-large")) {
|
||||
NEWSBLUR.assets.preference('show_image_preview', "large");
|
||||
NEWSBLUR.reader.apply_story_styling(true);
|
||||
}
|
||||
|
||||
this.show_correct_options();
|
||||
},
|
||||
|
||||
open_premium_modal: function(e) {
|
||||
this.close(e, function() {
|
||||
|
|
|
|||
|
|
@ -117,12 +117,10 @@
|
|||
|
||||
{% include_stylesheets "common" %}
|
||||
|
||||
{% if user_profile.is_premium %}
|
||||
{% if debug %}
|
||||
<link rel="stylesheet" type="text/css" delay="//cloud.typography.com/6565292/731824/css/fonts.css" href="" />
|
||||
{% else %}
|
||||
<link rel="stylesheet" type="text/css" delay="//cloud.typography.com/6565292/711824/css/fonts.css" href="" />
|
||||
{% endif %}
|
||||
{% if debug %}
|
||||
<link rel="stylesheet" type="text/css" delay="//cloud.typography.com/6565292/731824/css/fonts.css" href="" />
|
||||
{% else %}
|
||||
<link rel="stylesheet" type="text/css" delay="//cloud.typography.com/6565292/711824/css/fonts.css" href="" />
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue