diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index df13dcdc8..ce7d0c328 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -81,7 +81,7 @@ def load_feed_favicon(request, feed_id): not_found = True if not_found or not feed_icon.data: - return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/circular/world.png') + return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/nouns/world.svg') icon_data = base64.b64decode(feed_icon.data) return HttpResponse(icon_data, content_type='image/png') diff --git a/media/css/reader/darkmode.css b/media/css/reader/darkmode.css index 77ebfc0ba..20f928d04 100644 --- a/media/css/reader/darkmode.css +++ b/media/css/reader/darkmode.css @@ -99,13 +99,13 @@ body.NB-dark { .NB-dark .ui-layout-resizer-west { background-color: rgb(52,59,61); - border-left: 1px solid #0B0F20; + border-left: 1px solid #303030; } .NB-dark .right-pane .ui-layout-resizer-south, .NB-dark .right-pane .ui-layout-resizer-north { background-color: rgb(52,59,61); - border-top: 1px solid #0B0F20; - border-bottom: 1px solid #0B0F20; + border-top: 1px solid #303030; + border-bottom: 1px solid #303030; } @@ -181,6 +181,9 @@ color: #a85b40; background-color: #303739; } +.NB-dark .NB-module-account-subscription .NB-module-stats-count-description { + color: #c0c0c0; +} /* "Logout", "Try" & "Add" button colors */ .NB-dark .NB-recommended-try, .NB-dark .NB-recommended-add, @@ -244,13 +247,11 @@ color: #a85b40; color: #797b7c; } -.NB-dark .NB-feeds-header-user-dashboard img, .NB-dark .NB-feeds-header-user-interactions img, .NB-dark .NB-feeds-header-collapse-sidebar img { opacity: 0.9; } -.NB-dark .NB-feeds-header-user-dashboard:hover img, .NB-dark .NB-feeds-header-user-interactions:hover img, .NB-dark .NB-feeds-header-collapse-sidebar:hover img { opacity: 1.0; @@ -855,7 +856,7 @@ color: #a85b40; background: #393b3c; background-color: #393b3c; background-image: none; - border-color: #101719; + border-color: #303030 } /* Buttons on bottom & top bar */ @@ -901,7 +902,7 @@ color: #a85b40; } .NB-dark #story_taskbar { - border-top: 1px solid #101719; + border-top: 1px solid #303030; } .NB-dark .NB-feedbar .NB-taskbar .NB-task-story-previous { border-right: 1px solid rgba(0,0,0,0.1); @@ -1021,8 +1022,8 @@ text-shadow: none; } .NB-dark .NB-feedlist .feed { - border-top: 1px solid #434543; - border-bottom: 1px solid #434543; + /* border-top: 1px solid #434543; */ + /* border-bottom: 1px solid #434543; */ padding-right: 2px; background-color: #434543; } @@ -1033,9 +1034,9 @@ text-shadow: none; .NB-dark .NB-feeds-header.NB-selected, .NB-dark .NB-feedlist .folder.NB-selected>.folder_title { background: none; - background-color: #313E4E; - border-top: 1px solid #2C305D; - border-bottom: 1px solid #2C305D; + background-color: #4d6d95; + /* border-top: 1px solid #2C305D; */ + /* border-bottom: 1px solid #2C305D; */ } /* Shared Stories*/ @@ -1055,14 +1056,14 @@ border-bottom-color: #303739; .NB-dark .NB-feeds-header .NB-feeds-header-title, .NB-dark .NB-feedlists .NB-socialfeeds .feed .feed_title, .NB-dark .NB-feedlist .feed_title { - color: #d2d2d2; + color: #bdbdbd; text-shadow: 0 1px 0 rgba(0,0,0,.8); } /* Feed folder text */ .NB-dark .NB-feedlist .folder_title, .NB-dark .NB-feedlist .folder.NB-selected>.folder_title { - color: #98999B; + color: #bdbdbd; text-shadow: 0 1px 0 rgba(0,0,0,.8); } @@ -1083,16 +1084,16 @@ border-bottom-color: #303739; .NB-dark .NB-feeds-header-searches.NB-feeds-header, .NB-dark .NB-feeds-header-starred.NB-feeds-header, .NB-dark .NB-searches-folder { - border-bottom: 1px solid #333536; + /* border-bottom: 1px solid #333536; */ } .NB-dark .NB-feeds-header-read-container.NB-feeds-header-container { - border-top: 1px solid #333536; + /* border-top: 1px solid #333536; */ } /* Unread feed count badge */ .NB-dark .unread_count_neutral { background-color: #7a7e77; color: #FDFEFE; - text-shadow: 0 1px 0 rgba(0, 0, 0, .3); + /* text-shadow: 0 1px 0 rgba(0, 0, 0, .3); */ } @@ -1119,6 +1120,7 @@ border-bottom-color: #303739; } .NB-dark .NB-story-title-grid.NB-story-title .NB-storytitles-grid-bottom { background-color: #292b2c; + border-top-color: #303030; } .NB-dark .NB-story-title:hover:not(.NB-selected), .NB-dark .NB-story-title:hover:not(.NB-selected) .NB-storytitles-grid-bottom { @@ -1159,8 +1161,8 @@ border-bottom-color: #303739; /* Selected stories highlight */ .NB-dark .NB-story-title.NB-selected { color: #eee; - border-top: 1px solid #414545; - border-bottom: 1px solid #202121; + /* border-top: 1px solid #414545; + border-bottom: 1px solid #202121; */ background: none; background-color: #30393F; } @@ -1374,13 +1376,13 @@ color: #fff; .NB-dark .NB-sideoption { border: none; text-shadow: none; - background-color: #393b3c; + background-color: transparent; } /* Story button text color (Train, Save, Share) */ .NB-dark .NB-sideoption .NB-sideoption-title { - color: rgba(255, 255, 255, 0.2); + color: #808080; } .NB-dark .NB-sideoption-save, diff --git a/media/css/reader/reader.css b/media/css/reader/reader.css index f20755fad..cd913d3c7 100644 --- a/media/css/reader/reader.css +++ b/media/css/reader/reader.css @@ -124,12 +124,10 @@ hr { .NB-show-reader .NB-splash-bottom { display: none; } -.NB-show-reader .NB-feeds-header-user-dashboard, .NB-show-reader .NB-feeds-header-collapse-sidebar { opacity: 1; cursor: pointer; } -.NB-show-reader .NB-feeds-header-user-dashboard:hover img, .NB-show-reader .NB-feeds-header-collapse-sidebar:hover img { opacity: .9; } @@ -585,7 +583,7 @@ hr { } .NB-feedlist li.folder .NB-folder-icon { - background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/folder-open.svg') no-repeat 0 0; width: 16px; height: 16px; background-size: 16px; @@ -603,7 +601,7 @@ hr { top: 4px; } .NB-feedlist li.folder.NB-folder-collapsed .NB-folder-icon{ - background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/folder-closed.svg') no-repeat 0 0; background-size: 16px; } @@ -1947,7 +1945,7 @@ img.feed_favicon { width: 16px; height: 16px; margin: -1px 6px 0 0; - background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0; background-size: 16px; float: left; display: none; @@ -3766,7 +3764,7 @@ body { margin: 6px 0 0; } .NB-feed-story .NB-feed-story-header .NB-feed-story-starred-date .NB-icon { - background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 center; + background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 center; background-size: 16px; height: 16px; margin-top: 6px; @@ -4487,7 +4485,7 @@ body { padding: 9px 4px; height: 100%; float: right; - background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 8px center; + background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 8px center; background-size: 16px; transition: background .12s ease-out; } @@ -4578,7 +4576,7 @@ body { margin: 11px 2px 0 0; width: 16px; height: 16px; - background: transparent url("/media/embed/reader/tag.png") no-repeat 0 0; + background: transparent url("/media/img/icons/nouncs/tag.svg") no-repeat 0 0; background-size: 14px; } .NB-sideoption-save .NB-sideoption-save-title { @@ -4849,6 +4847,9 @@ body { /* ================ */ .NB-feeds-header-wrapper { + position: sticky; + top: 0; + z-index: 1; } .NB-feeds-header-user { @@ -4879,8 +4880,7 @@ body { border-radius: 2px; } .NB-feeds-header-collapse-sidebar, -.NB-feeds-header-user-interactions, -.NB-feeds-header-user-dashboard { +.NB-feeds-header-user-interactions { cursor: pointer; padding: 10px 0 10px; width: 36px; @@ -4893,19 +4893,14 @@ body { .NB-feeds-header-user-interactions { right: 32px; } -.NB-feeds-header-user-dashboard { - right: 64px; -} .NB-feeds-header-collapse-sidebar img, -.NB-feeds-header-user-interactions img, -.NB-feeds-header-user-dashboard img { +.NB-feeds-header-user-interactions img { width: 16px; height: 16px; opacity: .7; } .NB-feeds-header-collapse-sidebar:hover img, -.NB-feeds-header-user-interactions:hover img, -.NB-feeds-header-user-dashboard:hover img { +.NB-feeds-header-user-interactions:hover img { opacity: .9; } .NB-feeds-header-user-interactions .NB-feeds-header-user-interactions-badge { @@ -4926,14 +4921,11 @@ body { text-shadow: 0 1px 0 rgba(0, 0, 0, .2); z-index: 1; } -.NB-feeds-header-user-dashboard, .NB-feeds-header-collapse-sidebar { opacity: .3; cursor: default; } -.NB-feeds-header-user-dashboard img, .NB-feeds-header-collapse-sidebar img, -.NB-feeds-header-user-dashboard:hover img, .NB-feeds-header-collapse-sidebar:hover img { opacity: .7; } @@ -4988,6 +4980,7 @@ body { position: relative; display: none; overflow: hidden; + background-color: #e9ece6; } .NB-feeds-header { @@ -5001,6 +4994,7 @@ body { line-height: 22px; cursor: pointer; overflow: hidden; + transition: transform .08s ease-out, border-radius .08s ease-out; } .NB-theme-feed-size-xs .NB-feeds-header { @@ -5065,23 +5059,13 @@ body { padding: 0 4px; margin: 2px 3px 0 0; } - -.NB-feeds-header-river-container .NB-feeds-header { - /* border-bottom: 1px solid #B7BBAA; */ -} -.NB-feeds-header-read-container.NB-feeds-header-container { - /* border-top: 1px solid #B7BBAA; */ -} -.NB-feeds-header-read.NB-feeds-header, -.NB-feeds-header-searches.NB-feeds-header, -.NB-feeds-header-starred.NB-feeds-header, -.NB-searches-folder { - /* border-bottom: 1px solid #B7BBAA; */ -} .NB-feeds-header-river-container .NB-feeds-header.NB-empty .NB-feeds-header-count { display: none; } +.NB-feeds-header-river-dashboard-container { + display: block; +} /* ============================ */ /* = Header - Starred Stories = */ /* ============================ */ @@ -5102,11 +5086,10 @@ body { .NB-starred-feeds .feed { /* border-top: 1px solid #E9EBEE; */ /* border-bottom: 1px solid #E9EBEE; */ - background-color: #e5e5e5; - padding: 1px 0; + background-color: #dfdcd5; } .NB-starred-feeds { - background-color: #e5e5e5; + background-color: #dfdcd5; } .NB-feeds-header-starred.NB-empty .NB-feeds-header-count { display: none; @@ -5135,11 +5118,11 @@ body { .NB-feeds-header-searches { cursor: default; background-image: inherit; - background-color: #EAECE5; + background-color: inherit; } .NB-feeds-header.NB-feeds-header-searches:hover { background-image: inherit; - background-color: #EAECE5; + background-color: inherit; } .NB-feeds-header-searches .NB-feeds-header-count { @@ -8330,7 +8313,7 @@ form.opml_import_form input { .NB-menu-manage .NB-change-folders .NB-folder-option .NB-icon, .NB-menu-manage .NB-change-folders .NB-add-folder-form .NB-icon { - background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/folder-open.svg') no-repeat 0 0; width: 16px; height: 16px; background-size: 16px; @@ -8339,7 +8322,7 @@ form.opml_import_form input { margin: 1px 4px; } .NB-menu-manage .NB-change-folders .NB-folder-option.NB-folder-option-active .NB-icon { - background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/folder-closed.svg') no-repeat 0 0; background-size: 16px; } .NB-menu-manage .NB-change-folders .NB-folder-option:hover .NB-icon-add { @@ -8615,14 +8598,14 @@ form.opml_import_form input { opacity: 0.2; } .NB-menu-manage .NB-menu-manage-story-star .NB-menu-manage-image { - background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0; background-size: 16px; } .NB-menu-manage .NB-menu-manage-story-open .NB-menu-manage-image { background: transparent url('/media/embed/icons/silk/house.png') no-repeat 0 1px; } .NB-menu-manage.NB-story-starred .NB-menu-manage-story-star .NB-menu-manage-image { - background: transparent url('/media/embed/icons/circular/clock.png') no-repeat 0 0; + background: transparent url('/media/embed/icons/nouns/saved-stories.svg') no-repeat 0 0; background-size: 16px; opacity: .55; } @@ -13435,7 +13418,7 @@ form.opml_import_form input { background-size: 16px; } .NB-stat-realtime .NB-icon { - background: transparent url('/media/embed/icons/circular/clock.png'); + background: transparent url('/media/embed/icons/nouns/saved-stories.svg'); background-size: 16px; } .NB-feedbar-options-stat .NB-stat { diff --git a/media/img/icons/nouns/all-shares.svg b/media/img/icons/nouns/all-shares.svg new file mode 100644 index 000000000..5098b0115 --- /dev/null +++ b/media/img/icons/nouns/all-shares.svg @@ -0,0 +1,9 @@ + + + all-shares + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/all-stories.svg b/media/img/icons/nouns/all-stories.svg new file mode 100644 index 000000000..c75909572 --- /dev/null +++ b/media/img/icons/nouns/all-stories.svg @@ -0,0 +1,9 @@ + + + all-stories + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/folder-closed.svg b/media/img/icons/nouns/folder-closed.svg new file mode 100644 index 000000000..1c23dcd62 --- /dev/null +++ b/media/img/icons/nouns/folder-closed.svg @@ -0,0 +1,9 @@ + + + folder-closed + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/folder-open.svg b/media/img/icons/nouns/folder-open.svg new file mode 100644 index 000000000..0399ddd36 --- /dev/null +++ b/media/img/icons/nouns/folder-open.svg @@ -0,0 +1,9 @@ + + + folder-open + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/global-shares.svg b/media/img/icons/nouns/global-shares.svg new file mode 100644 index 000000000..90dbb6554 --- /dev/null +++ b/media/img/icons/nouns/global-shares.svg @@ -0,0 +1,19 @@ + + + global-shares + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/home.svg b/media/img/icons/nouns/home.svg new file mode 100644 index 000000000..ff59485b9 --- /dev/null +++ b/media/img/icons/nouns/home.svg @@ -0,0 +1,4 @@ + + + + diff --git a/media/img/icons/nouns/saved-stories.svg b/media/img/icons/nouns/saved-stories.svg new file mode 100644 index 000000000..fdd029499 --- /dev/null +++ b/media/img/icons/nouns/saved-stories.svg @@ -0,0 +1,9 @@ + + + saved-stories + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/search-filled.svg b/media/img/icons/nouns/search-filled.svg new file mode 100644 index 000000000..6e7a6de99 --- /dev/null +++ b/media/img/icons/nouns/search-filled.svg @@ -0,0 +1,9 @@ + + + search-filled + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/search.svg b/media/img/icons/nouns/search.svg new file mode 100644 index 000000000..c11e29cd0 --- /dev/null +++ b/media/img/icons/nouns/search.svg @@ -0,0 +1,9 @@ + + + search + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/tag.svg b/media/img/icons/nouns/tag.svg new file mode 100644 index 000000000..5e5d60139 --- /dev/null +++ b/media/img/icons/nouns/tag.svg @@ -0,0 +1,9 @@ + + + tag + + + + + + \ No newline at end of file diff --git a/media/img/icons/nouns/world.svg b/media/img/icons/nouns/world.svg new file mode 100644 index 000000000..c24bae2a8 --- /dev/null +++ b/media/img/icons/nouns/world.svg @@ -0,0 +1,4 @@ + + + + diff --git a/media/js/newsblur/common/modal.js b/media/js/newsblur/common/modal.js index c9082fc3c..9d80e44ab 100644 --- a/media/js/newsblur/common/modal.js +++ b/media/js/newsblur/common/modal.js @@ -99,7 +99,7 @@ NEWSBLUR.Modal.prototype = { this.folder_title = folder_title; this.folder = this.model.get_folder(folder_title); - $('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/g_icn_folder.png'); + $('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/folder-open.svg'); $('.NB-modal-subtitle .NB-modal-feed-title', this.$modal).html(this.folder_title); $('.NB-modal-subtitle .NB-modal-feed-subscribers', this.$modal).hide(); }, diff --git a/media/js/newsblur/models/saved_searches.js b/media/js/newsblur/models/saved_searches.js index e001e22ed..fc6c2ec15 100644 --- a/media/js/newsblur/models/saved_searches.js +++ b/media/js/newsblur/models/saved_searches.js @@ -13,15 +13,15 @@ NEWSBLUR.Models.SavedSearchFeed = Backbone.Model.extend({ var feed_id = this.get('feed_id'); if (feed_id == 'river:' || feed_id == 'river:infrequent') { - url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-allstories.png'; + url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-stories.svg'; } else if (_.string.startsWith(feed_id, 'river:')) { - url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_folder.png'; + url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/folder-open.svg'; } else if (feed_id == "read") { url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_unread.png'; } else if (feed_id == "starred") { - url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/clock.png'; + url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/saved-stories.svg'; } else if (_.string.startsWith(feed_id, 'starred:')) { - url = NEWSBLUR.Globals.MEDIA_URL + 'img/reader/tag.png'; + url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/tag.svg'; } else if (_.string.startsWith(feed_id, 'feed:')) { url = $.favicon(parseInt(feed_id.replace('feed:', ''), 10)); } else if (_.string.startsWith(feed_id, 'social:')) { @@ -29,7 +29,7 @@ NEWSBLUR.Models.SavedSearchFeed = Backbone.Model.extend({ } if (!url) { - url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_search_black.png'; + url = NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/search.svg'; } return url; diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 2a9016082..d2441acf6 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -43,6 +43,7 @@ $feed_link_error: $('.NB-feeds-list-error'), $feeds_progress: $('#NB-progress'), $dashboard: $('.NB-feeds-header-dashboard'), + $header_dashboard: $('.NB-feeds-header-river-dashboard'), $river_sites_header: $('.NB-feeds-header-river-sites'), $river_infrequent_header: $('.NB-feeds-header-river-infrequent'), $river_blurblogs_header: $('.NB-feeds-header-river-blurblogs'), @@ -565,6 +566,7 @@ } this.$s.$body.addClass('NB-show-reader'); this.flags['splash_page_frontmost'] = false; + this.$s.$header_dashboard.removeClass('NB-selected'); if (resize) { this.$s.$layout.layout().resizeAll(); @@ -581,6 +583,7 @@ this.reset_feed(); this.open_sidebar(); this.$s.$body.removeClass('NB-show-reader'); + this.$s.$header_dashboard.addClass('NB-selected'); this.flags['splash_page_frontmost'] = true; if (!skip_router) { diff --git a/media/js/newsblur/views/sidebar.js b/media/js/newsblur/views/sidebar.js index 8e4047ea0..3f3ff4066 100644 --- a/media/js/newsblur/views/sidebar.js +++ b/media/js/newsblur/views/sidebar.js @@ -10,7 +10,8 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({ "click .NB-feeds-header-river-infrequent": "open_river_infrequent_stories", "click .NB-feeds-header-river-blurblogs .NB-feedlist-collapse-icon": "collapse_river_blurblog", "click .NB-feeds-header-river-blurblogs": "open_river_blurblogs_stories", - "click .NB-feeds-header-river-global": "open_river_global_stories" + "click .NB-feeds-header-river-global": "open_river_global_stories", + "click .NB-feeds-header-river-dashboard": "show_splash_page" }, initialize: function() {}, @@ -163,6 +164,10 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({ // = Events = // ========== + show_splash_page: function() { + NEWSBLUR.reader.show_splash_page(); + }, + open_starred_stories: function() { return NEWSBLUR.reader.open_starred_stories(); }, @@ -274,4 +279,4 @@ NEWSBLUR.Views.Sidebar = Backbone.View.extend({ return NEWSBLUR.reader.open_river_blurblogs_stories({'global': true}); } -}); \ No newline at end of file +}); diff --git a/media/js/newsblur/views/sidebar_header_view.js b/media/js/newsblur/views/sidebar_header_view.js index 11c85a1db..90b3859f4 100644 --- a/media/js/newsblur/views/sidebar_header_view.js +++ b/media/js/newsblur/views/sidebar_header_view.js @@ -5,7 +5,6 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({ }, events: { - 'click .NB-feeds-header-user-dashboard' : 'show_splash_page', 'click .NB-feeds-header-user-interactions' : 'show_interactions_popover', 'click .NB-feeds-header-collapse-sidebar' : 'collapse_sidebar' }, @@ -114,10 +113,6 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({ // = Events = // ========== - show_splash_page: function() { - NEWSBLUR.reader.show_splash_page(); - }, - show_interactions_popover: function() { NEWSBLUR.InteractionsPopover.create({}); }, @@ -128,4 +123,4 @@ NEWSBLUR.Views.SidebarHeader = Backbone.View.extend({ } } -}); \ No newline at end of file +}); diff --git a/media/js/vendor/jquery.newsblur.js b/media/js/vendor/jquery.newsblur.js index c69c84e95..e24f357a3 100644 --- a/media/js/vendor/jquery.newsblur.js +++ b/media/js/vendor/jquery.newsblur.js @@ -233,7 +233,7 @@ NEWSBLUR.log = function(msg) { }, favicon: function (feed, empty_on_missing) { - var empty_icon = NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/world.png'; + var empty_icon = NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/world.svg'; if (!feed) return empty_icon; // console.log(['Favicon', feed]); @@ -243,23 +243,23 @@ NEWSBLUR.log = function(msg) { else if (_.isString(feed)) { var feed_id = feed; if (feed_id == 'river:') - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-allstories.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-stories.svg'; if (feed_id == 'river:infrequent') return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/noun_turtle.png'; if (feed_id == 'river:blurblogs') - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-blurblogs.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/all-shares.svg'; if (feed_id == 'river:global') - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/ak-icon-global.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/global-shares.svg'; if (_.string.startsWith(feed_id, 'river:')) - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_folder.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/folder-open.svg'; if (feed_id == "read") return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_unread32.png'; if (feed_id == "starred") - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/clock.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/saved-stories.svg'; if (feed_id == "searches") - return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/circular/g_icn_search_black.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/search.svg'; if (_.string.startsWith(feed_id, 'starred:')) - return NEWSBLUR.Globals.MEDIA_URL + 'img/reader/tag.png'; + return NEWSBLUR.Globals.MEDIA_URL + 'img/icons/nouns/tag.svg'; if (_.string.startsWith(feed_id, 'feed:')) return $.favicon(parseInt(feed_id.replace('feed:', ''), 10)); if (_.string.startsWith(feed_id, 'social:')) @@ -284,7 +284,7 @@ NEWSBLUR.log = function(msg) { if (feed.get('favicon_url')) return feed.get('favicon_url'); if (feed.is_starred()) - return NEWSBLUR.Globals.MEDIA_URL + '/img/reader/tag.png'; + return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/nouns/tag.svg'; if (feed.get('is_newsletter')) return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/email.png'; diff --git a/node/favicons.coffee b/node/favicons.coffee index 2f9e65235..c9f761574 100644 --- a/node/favicons.coffee +++ b/node/favicons.coffee @@ -68,9 +68,9 @@ favicons = (app) => else if ENV_DEBUG log.debug "Redirect: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else "" - if ENV_DEV - res.redirect '/media/img/icons/circular/world.png' + if ENV_DEV or ENV_DOCKER + res.redirect '/media/img/icons/nouns/world.svg' else - res.redirect 'https://www.newsblur.com/media/img/icons/circular/world.png' + res.redirect 'https://www.newsblur.com/media/img/icons/nouns/world.svg' exports.favicons = favicons diff --git a/node/favicons.js b/node/favicons.js index bee28e0c7..d7e3b9f50 100644 --- a/node/favicons.js +++ b/node/favicons.js @@ -85,10 +85,10 @@ if (ENV_DEBUG) { log.debug(`Redirect: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : "")); } - if (ENV_DEV) { - return res.redirect('/media/img/icons/circular/world.png'); + if (ENV_DEV || ENV_DOCKER) { + return res.redirect('/media/img/icons/nouns/world.svg'); } else { - return res.redirect('https://www.newsblur.com/media/img/icons/circular/world.png'); + return res.redirect('https://www.newsblur.com/media/img/icons/nouns/world.svg'); } } }); diff --git a/templates/reader/activities_module.xhtml b/templates/reader/activities_module.xhtml index f5e0d2d10..de5c8eea9 100644 --- a/templates/reader/activities_module.xhtml +++ b/templates/reader/activities_module.xhtml @@ -71,7 +71,7 @@ {% endif %} {% if activity.category == 'star' %} - +
You saved "{{ activity.content|safe|truncatewords:6 }}".
diff --git a/templates/reader/feeds_skeleton.xhtml b/templates/reader/feeds_skeleton.xhtml index 1a8fadb28..bd027ed79 100644 --- a/templates/reader/feeds_skeleton.xhtml +++ b/templates/reader/feeds_skeleton.xhtml @@ -24,9 +24,6 @@
-
- -
@@ -42,13 +39,56 @@ Something went wrong...
Retry
+
+
+ +
+
+ +
+ NewsBlur Dashboard +
+
+
+ +
+
+
+ +
+ Infrequent Site Stories +
+
+
+ +
+
+
+ +
+ All Site Stories +
+
+
+ +
+ + + +
+
+ +
+ Read Stories +
+
@@ -75,37 +115,6 @@
- -
-
-
- -
- Infrequent Site Stories -
-
-
- -
-
-
- -
- All Site Stories -
-
-
- - - -
-
- -
- Read Stories -
-
-
@@ -187,7 +196,7 @@ Focus
  • - + Saved