diff --git a/media/css/reader.css b/media/css/reader.css index 68ccf2ede..df1775bf0 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -1840,7 +1840,7 @@ background: transparent; background-image: -moz-linear-gradient(center top , #FEFEFE 0%, #F3F4EF 100%); background-image: linear-gradient(top, #FEFEFE, #F3F4EF); - border-bottom: 1px solid #ADADAD; + border-bottom: 1px solid rgba(0, 0, 0, .2); position: relative; overflow: hidden; @@ -2051,7 +2051,8 @@ background: transparent; } .NB-feed-story.read a.NB-feed-story-title { - color: #8C8E88; + font-weight: normal; + color: #41423F; } .NB-feed-story a.NB-feed-story-title:hover, @@ -2686,19 +2687,20 @@ background: transparent; } .NB-story-comments-shares-teaser { - background-color: whiteSmoke; - background-image: -moz-linear-gradient(center bottom , #EBEBEC 10%, #F5F5F5 84%); - color: #202020; + background-color: #F5F5EF; + color: #898989; cursor: default; text-shadow: 0 1px 0 #FFF; - font-weight: bold; + font-weight: normal; text-transform: uppercase; font-size: 10px; padding: 8px 12px 0px 28px; overflow: hidden; height: 27px; - border-bottom: 1px solid #898989; - border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #E3E3DF; + -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, .1); + -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, .1); + box-shadow: inset 0px 1px 1px rgba(0, 0, 0, .1); -webkit-transition: all .12s ease-out; -moz-transition: all .12s ease-out; -o-transition: all .12s ease-out; @@ -2751,7 +2753,7 @@ background: transparent; cursor: pointer; } .NB-story-comments-label b { - font-size: 12px; +/* font-size: 12px;*/ } .NB-story-share-label { float: right; diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 25138e382..731779174 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -1332,12 +1332,16 @@ this.apply_resizable_layout(true); - if (this.active_story && story_layout == 'list') { - this.active_story.story_title_view.render_inline_story_detail(); + if (story_layout == 'list') { + if (this.active_story) { + this.active_story.story_title_view.render_inline_story_detail(); + } NEWSBLUR.app.story_list.clear(); - } else if (this.active_story && story_layout == 'split') { + } else if (story_layout == 'split') { NEWSBLUR.app.story_list.render(); - this.active_story.story_title_view.destroy_inline_story_detail(); + if (this.active_story) { + this.active_story.story_title_view.destroy_inline_story_detail(); + } } this.switch_to_correct_view(); @@ -1853,13 +1857,14 @@ // = Story Pane - All Views = // ========================== - switch_to_correct_view: function(found_story_in_page) { - // NEWSBLUR.log(['Found story', this.story_view, found_story_in_page, this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); + switch_to_correct_view: function(options) { + options = options || {}; + // NEWSBLUR.log(['Found story', this.story_view, options.found_story_in_page, this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); if (NEWSBLUR.assets.preference('story_layout') == 'list') { if (this.story_view == 'page' || this.story_view == 'story') { this.switch_taskbar_view('feed', {skip_save_type: 'layout'}); } - } else if (found_story_in_page === false) { + } else if (options.story_not_found) { // Story not found, show in feed view with link to page view if (this.story_view == 'page' && !this.flags['page_view_showing_feed_view']) { // NEWSBLUR.log(['turn on feed view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); diff --git a/media/js/newsblur/views/original_tab_view.js b/media/js/newsblur/views/original_tab_view.js index 18cc3cff9..5a7626336 100644 --- a/media/js/newsblur/views/original_tab_view.js +++ b/media/js/newsblur/views/original_tab_view.js @@ -648,7 +648,9 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({ !options.selected_in_original && !options.selected_by_scrolling) { var found = this.scroll_to_selected_story(model); - NEWSBLUR.reader.switch_to_correct_view(found); + NEWSBLUR.reader.switch_to_correct_view({ + story_not_found: !found + }); if (!found) { NEWSBLUR.app.story_list.scroll_to_selected_story(model); } diff --git a/media/js/newsblur/views/story_list_view.js b/media/js/newsblur/views/story_list_view.js index c6cc7bb83..358e8c4e8 100644 --- a/media/js/newsblur/views/story_list_view.js +++ b/media/js/newsblur/views/story_list_view.js @@ -36,6 +36,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({ // ========== render: function() { + console.log(["Rendering story list", NEWSBLUR.assets.preference('story_layout')]); if (NEWSBLUR.assets.preference('story_layout') != 'split') return; var collection = this.collection; @@ -74,6 +75,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({ }, clear: function() { + console.log(["Clearing story list"]); _.invoke(this.stories, 'destroy'); this.$el.empty(); },