mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Stubbing in dashboard river. Has bugs around loading pages.
This commit is contained in:
Samuel Clay
parent
6f8c2ca780
commit
4c40f06c98
8 changed files with 240 additions and 166 deletions
|
|
@ -1616,7 +1616,7 @@ a img {
|
|||
/* = Story Titles - Story = */
|
||||
/* ======================== */
|
||||
|
||||
#story_titles .NB-story-title {
|
||||
.NB-story-title {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
|
|
@ -1634,39 +1634,39 @@ a img {
|
|||
border-top: 1px solid #FFF;
|
||||
border-bottom: 1px solid #F9F8F4;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-has-image {
|
||||
.NB-story-title.NB-has-image {
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title.NB-has-image {
|
||||
.NB-story-pane-west .NB-story-title.NB-has-image {
|
||||
padding-right: 90px;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-title {
|
||||
.NB-theme-feed-size-xs .NB-story-title {
|
||||
font-size: 11px;
|
||||
line-height: 13px;
|
||||
}
|
||||
.NB-theme-feed-size-m #story_titles .NB-story-title {
|
||||
.NB-theme-feed-size-m .NB-story-title {
|
||||
font-size: 13px;
|
||||
line-height: 15px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-title {
|
||||
.NB-theme-feed-size-l .NB-story-title {
|
||||
font-size: 14px;
|
||||
line-height: 15px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-title {
|
||||
.NB-theme-feed-size-xl .NB-story-title {
|
||||
font-size: 15px;
|
||||
line-height: 16px;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title {
|
||||
.NB-story-pane-west .NB-story-title {
|
||||
padding-right: 4px;
|
||||
padding-left: 32px;
|
||||
}
|
||||
.NB-view-river #story_titles .NB-story-title {
|
||||
.NB-view-river .NB-story-title {
|
||||
padding-left: 148px;
|
||||
}
|
||||
.NB-view-river .NB-story-pane-west #story_titles .NB-story-title {
|
||||
.NB-view-river .NB-story-pane-west .NB-story-title {
|
||||
padding-left: 48px;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-storytitles-feed-border-inner,
|
||||
#story_titles .NB-story-title .NB-storytitles-feed-border-outer {
|
||||
.NB-story-title .NB-storytitles-feed-border-inner,
|
||||
.NB-story-title .NB-storytitles-feed-border-outer {
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 4px;
|
||||
|
|
@ -1674,22 +1674,22 @@ a img {
|
|||
top: 0;
|
||||
background-color: #505050;
|
||||
}
|
||||
#story_titles .NB-story-title.read .NB-storytitles-feed-border-inner,
|
||||
#story_titles .NB-story-title.read .NB-storytitles-feed-border-outer {
|
||||
.NB-story-title.read .NB-storytitles-feed-border-inner,
|
||||
.NB-story-title.read .NB-storytitles-feed-border-outer {
|
||||
opacity: .06;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-storytitles-feed-border-inner {
|
||||
.NB-story-title .NB-storytitles-feed-border-inner {
|
||||
left: 4px;
|
||||
background-color: #707070;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-storytitles-sentiment {
|
||||
.NB-story-title .NB-storytitles-sentiment {
|
||||
position: absolute;
|
||||
width: 24px;
|
||||
height: 20px;
|
||||
left: 0;
|
||||
top: 2px;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-storytitles-story-image {
|
||||
.NB-story-title .NB-storytitles-story-image {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
width: 86px;
|
||||
|
|
@ -1701,30 +1701,30 @@ a img {
|
|||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title .NB-storytitles-sentiment {
|
||||
.NB-story-pane-west .NB-story-title .NB-storytitles-sentiment {
|
||||
left: 4px;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-story-positive .NB-storytitles-sentiment {
|
||||
.NB-story-title.NB-story-positive .NB-storytitles-sentiment {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_focus.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.NB-story-neutral .NB-storytitles-sentiment {
|
||||
.NB-story-title.NB-story-neutral .NB-storytitles-sentiment {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_unread.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.NB-story-negative .NB-storytitles-sentiment {
|
||||
.NB-story-title.NB-story-negative .NB-storytitles-sentiment {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_hidden.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-story-starred .NB-storytitles-sentiment {
|
||||
.NB-story-title.NB-story-starred .NB-storytitles-sentiment {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_starred.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.NB-story-starred .NB-storytitles-star,
|
||||
#story_titles .NB-story-title.read.NB-story-starred .NB-storytitles-star {
|
||||
.NB-story-title.NB-story-starred .NB-storytitles-star,
|
||||
.NB-story-title.read.NB-story-starred .NB-storytitles-star {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin: -1px 6px 0 0;
|
||||
|
|
@ -1733,12 +1733,12 @@ a img {
|
|||
float: left;
|
||||
display: none;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-story-starred .NB-storytitles-star,
|
||||
#story_titles .NB-story-title.read.NB-story-starred .NB-storytitles-star {
|
||||
.NB-story-title.NB-story-starred .NB-storytitles-star,
|
||||
.NB-story-title.read.NB-story-starred .NB-storytitles-star {
|
||||
display: block;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-story-shared .NB-storytitles-share,
|
||||
#story_titles .NB-story-title.read.NB-story-shared .NB-storytitles-share {
|
||||
.NB-story-title.NB-story-shared .NB-storytitles-share,
|
||||
.NB-story-title.read.NB-story-shared .NB-storytitles-share {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin: -1px 6px 0 0;
|
||||
|
|
@ -1747,23 +1747,23 @@ a img {
|
|||
float: left;
|
||||
display: none;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-story-shared .NB-storytitles-share,
|
||||
#story_titles .NB-story-title.read.NB-story-shared .NB-storytitles-share {
|
||||
.NB-story-title.NB-story-shared .NB-storytitles-share,
|
||||
.NB-story-title.read.NB-story-shared .NB-storytitles-share {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.read {
|
||||
.NB-story-title.read {
|
||||
font-weight: normal;
|
||||
}
|
||||
#story_titles .NB-story-title.read .NB-storytitles-sentiment {
|
||||
.NB-story-title.read .NB-storytitles-sentiment {
|
||||
opacity: .15;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title:hover .NB-storytitles-sentiment {
|
||||
.NB-story-title:hover .NB-storytitles-sentiment {
|
||||
background: none;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title a.story_title {
|
||||
.NB-story-title a.story_title {
|
||||
text-decoration: none;
|
||||
color: #272727;
|
||||
display: block;
|
||||
|
|
@ -1776,40 +1776,40 @@ a img {
|
|||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.read a.story_title {
|
||||
.NB-story-title.read a.story_title {
|
||||
color: #969696;
|
||||
}
|
||||
.NB-view-river #story_titles .NB-story-title a.story_title {
|
||||
.NB-view-river .NB-story-title a.story_title {
|
||||
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title .NB-storytitles-author {
|
||||
.NB-story-title .NB-storytitles-author {
|
||||
padding-left: 12px;
|
||||
color: #808080;
|
||||
font-size: 11px;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-title .NB-storytitles-author {
|
||||
.NB-theme-feed-size-xs .NB-story-title .NB-storytitles-author {
|
||||
font-size: 9px;
|
||||
}
|
||||
.NB-theme-feed-size-s #story_titles .NB-story-title .NB-storytitles-author {
|
||||
.NB-theme-feed-size-s .NB-story-title .NB-storytitles-author {
|
||||
font-size: 10px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-title .NB-storytitles-author {
|
||||
.NB-theme-feed-size-l .NB-story-title .NB-storytitles-author {
|
||||
font-size: 12px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-title .NB-storytitles-author {
|
||||
.NB-theme-feed-size-xl .NB-story-title .NB-storytitles-author {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.read .NB-storytitles-author {
|
||||
.NB-story-title.read .NB-storytitles-author {
|
||||
color: #B6B6B6;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.NB-selected .NB-storytitles-author {
|
||||
.NB-story-title.NB-selected .NB-storytitles-author {
|
||||
/* text-shadow: 1px 1px 0 rgba(255, 255, 255, .5);*/
|
||||
}
|
||||
|
||||
#story_titles .NB-storytitles-content-preview {
|
||||
.NB-storytitles-content-preview {
|
||||
color: #B6B6B6;
|
||||
font-size: 11px;
|
||||
line-height: 2.2em;
|
||||
|
|
@ -1826,47 +1826,47 @@ a img {
|
|||
display: -webkit-box;
|
||||
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-xs .NB-storytitles-content-preview {
|
||||
font-size: 10px;
|
||||
height: 19px;
|
||||
}
|
||||
.NB-theme-feed-size-m #story_titles .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-m .NB-storytitles-content-preview {
|
||||
font-size: 12px;
|
||||
height: 21px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-l .NB-storytitles-content-preview {
|
||||
font-size: 13px;
|
||||
height: 22px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-xl .NB-storytitles-content-preview {
|
||||
font-size: 14px;
|
||||
height: 23px;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-storytitles-content-preview {
|
||||
.NB-story-pane-west .NB-storytitles-content-preview {
|
||||
-webkit-line-clamp: 2;
|
||||
line-height: 14px;
|
||||
height: 36px;
|
||||
padding: 6px 0 0;
|
||||
}
|
||||
|
||||
.NB-story-layout-list #story_titles .NB-selected .NB-storytitles-content-preview {
|
||||
.NB-story-layout-list .NB-selected .NB-storytitles-content-preview {
|
||||
display: none;
|
||||
}
|
||||
#story_titles .read .NB-storytitles-content-preview {
|
||||
.read .NB-storytitles-content-preview {
|
||||
color: #B6B6B6;
|
||||
}
|
||||
#story_titles .NB-storytitles-shares {
|
||||
.NB-storytitles-shares {
|
||||
position: absolute;
|
||||
height: 16px;
|
||||
right: 2px;
|
||||
top: 2px;
|
||||
max-width: 56px;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-storytitles-shares {
|
||||
.NB-story-pane-west .NB-storytitles-shares {
|
||||
top: inherit;
|
||||
bottom: 4px;
|
||||
}
|
||||
#story_titles .NB-storytitles-shares .NB-icon {
|
||||
.NB-storytitles-shares .NB-icon {
|
||||
float: right;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
|
|
@ -1874,7 +1874,7 @@ a img {
|
|||
background: transparent url('/media/embed/icons/circular/share.png') no-repeat 0 0;
|
||||
background-size: 16px;
|
||||
}
|
||||
#story_titles .NB-storytitles-shares .NB-user-avatar {
|
||||
.NB-storytitles-shares .NB-user-avatar {
|
||||
float: right;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
|
|
@ -1883,7 +1883,7 @@ a img {
|
|||
display: block;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title .NB-story-feed {
|
||||
.NB-story-title .NB-story-feed {
|
||||
display: none;
|
||||
left: -120px;
|
||||
top: 6px;
|
||||
|
|
@ -1892,13 +1892,13 @@ a img {
|
|||
color: #707070;
|
||||
position: absolute;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title .NB-story-feed {
|
||||
.NB-story-pane-west .NB-story-title .NB-story-feed {
|
||||
left: -18px;
|
||||
}
|
||||
.NB-view-river #story_titles .NB-story-title .NB-story-feed {
|
||||
.NB-view-river .NB-story-title .NB-story-feed {
|
||||
display: block;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-story-feed .feed_favicon {
|
||||
.NB-story-title .NB-story-feed .feed_favicon {
|
||||
position: absolute;
|
||||
top: -2px;
|
||||
left: 0;
|
||||
|
|
@ -1907,10 +1907,10 @@ a img {
|
|||
height: 16px;
|
||||
width: 16px;
|
||||
}
|
||||
#story_titles .NB-story-title.read .feed_favicon {
|
||||
.NB-story-title.read .feed_favicon {
|
||||
opacity: .4;
|
||||
}
|
||||
#story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-story-title .NB-story-feed .feed_title {
|
||||
display: block;
|
||||
|
||||
font-size: 10px;
|
||||
|
|
@ -1922,31 +1922,31 @@ a img {
|
|||
width: 100px;
|
||||
line-height: 1.3em;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-theme-feed-size-xs .NB-story-title .NB-story-feed .feed_title {
|
||||
font-size: 9px;
|
||||
height: 12px;
|
||||
}
|
||||
.NB-theme-feed-size-m #story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-theme-feed-size-m .NB-story-title .NB-story-feed .feed_title {
|
||||
font-size: 11px;
|
||||
height: 15px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-theme-feed-size-l .NB-story-title .NB-story-feed .feed_title {
|
||||
font-size: 12px;
|
||||
height: 15px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-theme-feed-size-xl .NB-story-title .NB-story-feed .feed_title {
|
||||
font-size: 12px;
|
||||
height: 15px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title.NB-selected .NB-story-feed .feed_title {
|
||||
.NB-story-title.NB-selected .NB-story-feed .feed_title {
|
||||
/* text-shadow: 1px 1px 0 rgba(255, 255, 255, .5);*/
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title .NB-story-feed .feed_title {
|
||||
.NB-story-pane-west .NB-story-title .NB-story-feed .feed_title {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title .NB-story-manage-icon {
|
||||
.NB-story-title .NB-story-manage-icon {
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
|
|
@ -1956,27 +1956,27 @@ a img {
|
|||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title .NB-story-manage-icon {
|
||||
.NB-story-pane-west .NB-story-title .NB-story-manage-icon {
|
||||
left: 4px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title:hover .NB-story-manage-icon {
|
||||
.NB-story-title:hover .NB-story-manage-icon {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title:hover .NB-story-manage-icon:hover {
|
||||
.NB-story-title:hover .NB-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-hover-inverse:hover .NB-story-manage-icon:hover {
|
||||
.NB-story-title.NB-hover-inverse:hover .NB-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
||||
#story_titles .NB-story-sentiment {
|
||||
.NB-story-sentiment {
|
||||
position: absolute;
|
||||
width: 22px;
|
||||
height: 16px;
|
||||
|
|
@ -1985,42 +1985,42 @@ a img {
|
|||
display: none;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title:hover .NB-story-sentiment {
|
||||
.NB-story-title:hover .NB-story-sentiment {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-like {
|
||||
.NB-story-like {
|
||||
left: 22px;
|
||||
background: transparent url('/media/embed/reader/thumbs_up.png') no-repeat 2px 3px;
|
||||
opacity: .25;
|
||||
}
|
||||
#story_titles .NB-story-like:hover {
|
||||
.NB-story-like:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title .story_date {
|
||||
.NB-story-title .story_date {
|
||||
position: absolute;
|
||||
width: 172px;
|
||||
top: 5px;
|
||||
right: 0;
|
||||
font-size: 11px;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-has-image .story_date {
|
||||
.NB-story-title.NB-has-image .story_date {
|
||||
width: 236px;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-title .story_date {
|
||||
.NB-theme-feed-size-xs .NB-story-title .story_date {
|
||||
font-size: 10px;
|
||||
}
|
||||
.NB-theme-feed-size-m #story_titles .NB-story-title .story_date {
|
||||
.NB-theme-feed-size-m .NB-story-title .story_date {
|
||||
font-size: 12px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-title .story_date {
|
||||
.NB-theme-feed-size-l .NB-story-title .story_date {
|
||||
font-size: 13px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-title .story_date {
|
||||
.NB-theme-feed-size-xl .NB-story-title .story_date {
|
||||
font-size: 14px;
|
||||
}
|
||||
.NB-story-pane-west #story_titles .NB-story-title .story_date {
|
||||
.NB-story-pane-west .NB-story-title .story_date {
|
||||
position: static;
|
||||
margin: 0 0 4px 4px;
|
||||
color: #929697;
|
||||
|
|
@ -2031,15 +2031,15 @@ a img {
|
|||
font-weight: normal;
|
||||
clear: both;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-selected .story_date {
|
||||
.NB-story-title.NB-selected .story_date {
|
||||
/* text-shadow: 1px 1px 0 rgba(255, 255, 255, .5);*/
|
||||
}
|
||||
#story_titles .NB-story-title.read .story_date {
|
||||
.NB-story-title.read .story_date {
|
||||
color: #B6B6B6;
|
||||
}
|
||||
|
||||
|
||||
#story_titles .NB-story-title.NB-selected,
|
||||
.NB-story-title.NB-selected,
|
||||
.NB-interaction:hover:not(.NB-disabled) {
|
||||
color: #304080;
|
||||
border-top: 1px solid #EFEEC3;
|
||||
|
|
@ -2047,11 +2047,11 @@ a img {
|
|||
background-color: #FFFEE2;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-title:hover:not(.NB-selected) {
|
||||
.NB-story-title:hover:not(.NB-selected) {
|
||||
background-color: #F7F7F6;
|
||||
border-top: 1px solid transparent;
|
||||
}
|
||||
#story_titles .NB-story-title.read:hover:not(.NB-selected) {
|
||||
.NB-story-title.read:hover:not(.NB-selected) {
|
||||
background-color: #FDFCFA;
|
||||
/* border-top: 1px solid transparent;*/
|
||||
/* border-bottom: 1px solid white;*/
|
||||
|
|
@ -2105,31 +2105,31 @@ a img {
|
|||
/* = Story Detail in Grid View = */
|
||||
/* ============================= */
|
||||
|
||||
#story_titles.NB-layout-grid {
|
||||
.NB-layout-grid {
|
||||
background-color: #F7F8F5;
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-story-titles {
|
||||
.NB-layout-grid .NB-story-titles {
|
||||
overflow: hidden;
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-story-content-container {
|
||||
.NB-layout-grid .NB-story-content-container {
|
||||
background-color: white;
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-end-line {
|
||||
.NB-layout-grid .NB-end-line {
|
||||
margin-top: 24px;
|
||||
float: left;
|
||||
width: 100%;
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-story-title-container {
|
||||
.NB-layout-grid .NB-story-title-container {
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-story-title-container.NB-selected {
|
||||
.NB-layout-grid .NB-story-title-container.NB-selected {
|
||||
clear: both;
|
||||
overflow: hidden;
|
||||
}
|
||||
#story_titles.NB-layout-grid .NB-story-title-container.NB-selected .NB-story-title {
|
||||
.NB-layout-grid .NB-story-title-container.NB-selected .NB-story-title {
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid {
|
||||
.NB-story-grid {
|
||||
margin: 3% 0 0 3%;
|
||||
border: 1px solid rgba(0, 0, 0, .2);
|
||||
position: relative;
|
||||
|
|
@ -2142,74 +2142,74 @@ a img {
|
|||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#story_titles .NB-story-grid.NB-story-title-hide-preview {
|
||||
.NB-story-grid.NB-story-title-hide-preview {
|
||||
height: 296px;
|
||||
}
|
||||
#story_titles.NB-layout-grid.NB-grid-columns-1 .NB-story-grid,
|
||||
#story_titles.NB-extra-narrow-content .NB-story-grid {
|
||||
.NB-layout-grid.NB-grid-columns-1 .NB-story-grid,
|
||||
.NB-extra-narrow-content .NB-story-grid {
|
||||
width: 94%;
|
||||
}
|
||||
#story_titles.NB-layout-grid.NB-grid-columns-2 .NB-story-grid,
|
||||
#story_titles.NB-narrow-content .NB-story-grid {
|
||||
.NB-layout-grid.NB-grid-columns-2 .NB-story-grid,
|
||||
.NB-narrow-content .NB-story-grid {
|
||||
width: 44%;
|
||||
}
|
||||
#story_titles.NB-layout-grid.NB-grid-columns-3 .NB-story-grid,
|
||||
#story_titles.NB-wide-content .NB-story-grid {
|
||||
.NB-layout-grid.NB-grid-columns-3 .NB-story-grid,
|
||||
.NB-wide-content .NB-story-grid {
|
||||
width: 29%;
|
||||
}
|
||||
#story_titles.NB-layout-grid.NB-grid-columns-4 .NB-story-grid,
|
||||
#story_titles.NB-extra-wide-content .NB-story-grid {
|
||||
.NB-layout-grid.NB-grid-columns-4 .NB-story-grid,
|
||||
.NB-extra-wide-content .NB-story-grid {
|
||||
width: 21%;
|
||||
}
|
||||
.NB-view-river #story_titles .NB-story-grid {
|
||||
.NB-view-river .NB-story-grid {
|
||||
padding-left: 0;
|
||||
border: 1px solid rgba(0, 0, 0, .2);
|
||||
}
|
||||
#story_titles .NB-story-grid,
|
||||
#story_titles .NB-story-title.NB-story-grid:hover {
|
||||
.NB-story-grid,
|
||||
.NB-story-title.NB-story-grid:hover {
|
||||
border: 1px solid rgba(0, 0, 0, .2);
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid.NB-selected {
|
||||
.NB-story-grid.NB-selected {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid .NB-storytitles-content {
|
||||
.NB-story-grid .NB-storytitles-content {
|
||||
position: relative;
|
||||
margin: 12px 24px 8px 30px;
|
||||
height: 100%;
|
||||
z-index: 0;
|
||||
}
|
||||
#story_titles .NB-story-grid a.story_title {
|
||||
.NB-story-grid a.story_title {
|
||||
padding: 2px 0 0 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid .NB-storytitles-title {
|
||||
.NB-story-grid .NB-storytitles-title {
|
||||
font-size: 16px;
|
||||
line-height: 1.3em;
|
||||
padding: 0;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-grid .NB-storytitles-title {
|
||||
.NB-theme-feed-size-xs .NB-story-grid .NB-storytitles-title {
|
||||
font-size: 14px;
|
||||
}
|
||||
.NB-theme-feed-size-s #story_titles .NB-story-grid .NB-storytitles-title {
|
||||
.NB-theme-feed-size-s .NB-story-grid .NB-storytitles-title {
|
||||
font-size: 15px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-grid .NB-storytitles-title {
|
||||
.NB-theme-feed-size-l .NB-story-grid .NB-storytitles-title {
|
||||
font-size: 17px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-grid .NB-storytitles-title {
|
||||
.NB-theme-feed-size-xl .NB-story-grid .NB-storytitles-title {
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-story-grid .NB-storytitles-content-preview {
|
||||
margin: 12px 0 0 0;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-storytitles-story-image-container {
|
||||
.NB-story-grid .NB-storytitles-story-image-container {
|
||||
margin-left: 8px;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-storytitles-story-image {
|
||||
.NB-story-grid .NB-storytitles-story-image {
|
||||
display: none;
|
||||
position: inherit;
|
||||
width: 100%;
|
||||
|
|
@ -2221,46 +2221,46 @@ a img {
|
|||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#story_titles .NB-story-grid.read .NB-storytitles-story-image {
|
||||
.NB-story-grid.read .NB-storytitles-story-image {
|
||||
opacity: .5;
|
||||
}
|
||||
#story_titles .NB-story-grid.NB-selected .NB-storytitles-story-image {
|
||||
.NB-story-grid.NB-selected .NB-storytitles-story-image {
|
||||
display: none;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-storytitles-feed-border-inner,
|
||||
#story_titles .NB-story-grid .NB-storytitles-feed-border-outer {
|
||||
.NB-story-grid .NB-storytitles-feed-border-inner,
|
||||
.NB-story-grid .NB-storytitles-feed-border-outer {
|
||||
/* height: 4px;*/
|
||||
/* width: 100%;*/
|
||||
/* position: static;*/
|
||||
z-index: 1;
|
||||
}
|
||||
#story_titles .NB-story-grid.read .NB-storytitles-feed-border-inner,
|
||||
#story_titles .NB-story-grid.read .NB-storytitles-feed-border-outer {
|
||||
.NB-story-grid.read .NB-storytitles-feed-border-inner,
|
||||
.NB-story-grid.read .NB-storytitles-feed-border-outer {
|
||||
opacity: .2;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-story-grid .NB-storytitles-content-preview {
|
||||
height: auto;
|
||||
-webkit-line-clamp: inherit;
|
||||
font-size: 13px;
|
||||
line-height: 1.44em;
|
||||
}
|
||||
.NB-theme-feed-size-xs #story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-xs .NB-story-grid .NB-storytitles-content-preview {
|
||||
font-size: 11px;
|
||||
}
|
||||
.NB-theme-feed-size-s #story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-s .NB-story-grid .NB-storytitles-content-preview {
|
||||
font-size: 12px;
|
||||
}
|
||||
.NB-theme-feed-size-l #story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-l .NB-story-grid .NB-storytitles-content-preview {
|
||||
font-size: 14px;
|
||||
}
|
||||
.NB-theme-feed-size-xl #story_titles .NB-story-grid .NB-storytitles-content-preview {
|
||||
.NB-theme-feed-size-xl .NB-story-grid .NB-storytitles-content-preview {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
#story_titles .NB-story-grid.read .NB-storytitles-content-preview {
|
||||
.NB-story-grid.read .NB-storytitles-content-preview {
|
||||
color: #D6D6DE;
|
||||
}
|
||||
#story_titles .NB-story-grid.NB-story-title .NB-storytitles-grid-bottom {
|
||||
.NB-story-grid.NB-story-title .NB-storytitles-grid-bottom {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
top: inherit;
|
||||
|
|
@ -2273,41 +2273,41 @@ a img {
|
|||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#story_titles .NB-story-grid:not(.read):hover .NB-storytitles-grid-bottom {
|
||||
.NB-story-grid:not(.read):hover .NB-storytitles-grid-bottom {
|
||||
background-color: #F7F7F6;
|
||||
}
|
||||
#story_titles .NB-story-grid.NB-story-title .NB-storytitles-author {
|
||||
.NB-story-grid.NB-story-title .NB-storytitles-author {
|
||||
float: left;
|
||||
display: block;
|
||||
padding: 0 4px 2px 24px;
|
||||
line-height: 16px;
|
||||
}
|
||||
#story_titles .NB-story-grid .story_date {
|
||||
.NB-story-grid .story_date {
|
||||
position: static;
|
||||
width: auto;
|
||||
float: right;
|
||||
display: block;
|
||||
padding: 0 4px 0 0;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-storytitles-sentiment,
|
||||
#story_titles .NB-story-grid .NB-story-manage-icon {
|
||||
.NB-story-grid .NB-storytitles-sentiment,
|
||||
.NB-story-grid .NB-story-manage-icon {
|
||||
left: -28px;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-story-feed {
|
||||
.NB-story-grid .NB-story-feed {
|
||||
position: static;
|
||||
margin: 10px 0;
|
||||
height: auto;
|
||||
overflow: hidden;
|
||||
}
|
||||
#story_titles .NB-story-grid .story_title {
|
||||
.NB-story-grid .story_title {
|
||||
position: relative;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-story-feed .feed_favicon {
|
||||
.NB-story-grid .NB-story-feed .feed_favicon {
|
||||
margin: 0 4px 0 0;
|
||||
float: left;
|
||||
position: static;
|
||||
}
|
||||
#story_titles .NB-story-grid .NB-story-feed .feed_title {
|
||||
.NB-story-grid .NB-story-feed .feed_title {
|
||||
width: auto;
|
||||
-webkit-line-clamp: 1;
|
||||
height: 16px;
|
||||
|
|
@ -2315,8 +2315,8 @@ a img {
|
|||
line-height: 16px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
#story_titles .NB-story-grid .feed_favicon,
|
||||
#story_titles .NB-story-grid .feed_title {
|
||||
.NB-story-grid .feed_favicon,
|
||||
.NB-story-grid .feed_title {
|
||||
position: static;
|
||||
}
|
||||
|
||||
|
|
@ -8075,7 +8075,7 @@ form.opml_import_form input {
|
|||
top: 24px;
|
||||
position: relative;
|
||||
}
|
||||
.NB-modal-tutorial .NB-page-3 #story_titles {
|
||||
.NB-modal-tutorial .NB-page-3 {
|
||||
position: static;
|
||||
float: right;
|
||||
display: block;
|
||||
|
|
@ -8083,10 +8083,10 @@ form.opml_import_form input {
|
|||
width: 240px;
|
||||
height: 122px;
|
||||
}
|
||||
.NB-modal-tutorial .NB-page-3 #story_titles .story {
|
||||
.NB-modal-tutorial .NB-page-3 .story {
|
||||
padding-right: 0;
|
||||
}
|
||||
.NB-modal-tutorial .NB-page-3 #story_titles .story:last-child {
|
||||
.NB-modal-tutorial .NB-page-3 .story:last-child {
|
||||
border-bottom: 1px solid #E7EDF6;
|
||||
}
|
||||
.NB-modal-tutorial .NB-page-3 ul img.NB-trainer-bullet {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
|
|||
this.folders = new NEWSBLUR.Collections.Folders([]);
|
||||
this.favicons = {};
|
||||
this.stories = new NEWSBLUR.Collections.Stories();
|
||||
this.dashboard_stories = new NEWSBLUR.Collections.Stories();
|
||||
this.starred_feeds = new NEWSBLUR.Collections.StarredFeeds();
|
||||
this.queued_read_stories = {};
|
||||
this.classifiers = {};
|
||||
|
|
@ -670,7 +671,9 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
|
|||
data.stories = [];
|
||||
}
|
||||
}
|
||||
|
||||
self.load_feed_precallback(data, feed_id, callback, first_load);
|
||||
// console.log(['river stories fetch', self.dashboard_stories.length, self.stories.length]);
|
||||
};
|
||||
|
||||
this.feed_id = feed_id;
|
||||
|
|
@ -688,6 +691,29 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
|
|||
});
|
||||
},
|
||||
|
||||
fetch_dashboard_stories: function(feed_id, feeds, page, callback, error_callback) {
|
||||
var self = this;
|
||||
|
||||
var pre_callback = function(data) {
|
||||
if (!NEWSBLUR.Globals.is_premium && NEWSBLUR.Globals.is_authenticated) {
|
||||
data.stories = data.stories.splice(0, 3);
|
||||
}
|
||||
self.dashboard_stories.reset(data.stories, {added: data.stories.length});
|
||||
// console.log(['dashboard stories fetch', self.dashboard_stories.length, self.stories.length]);
|
||||
callback();
|
||||
};
|
||||
|
||||
this.make_request('/reader/river_stories', {
|
||||
feeds: feeds,
|
||||
page: page,
|
||||
order: this.view_setting(feed_id, 'order'),
|
||||
read_filter: this.view_setting(feed_id, 'read_filter')
|
||||
}, pre_callback, error_callback, {
|
||||
'ajax_group': (page ? 'feed_page' : 'feed'),
|
||||
'request_type': 'GET'
|
||||
});
|
||||
},
|
||||
|
||||
fetch_river_blurblogs_stories: function(feed_id, page, options, callback, error_callback, first_load) {
|
||||
var self = this;
|
||||
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@
|
|||
NEWSBLUR.app.feed_selector = new NEWSBLUR.Views.FeedSelector();
|
||||
NEWSBLUR.app.follow_requests_module = new NEWSBLUR.Views.FollowRequestsModule();
|
||||
NEWSBLUR.app.dashboard_search = new NEWSBLUR.Views.DashboardSearch();
|
||||
NEWSBLUR.app.dashboard_river = new NEWSBLUR.Views.DashboardRiver();
|
||||
NEWSBLUR.app.taskbar_info = new NEWSBLUR.Views.ReaderTaskbarInfo().render();
|
||||
NEWSBLUR.app.story_titles_header = new NEWSBLUR.Views.StoryTitlesHeader();
|
||||
|
||||
|
|
@ -1929,7 +1930,6 @@
|
|||
},
|
||||
|
||||
post_open_river_stories: function(data, first_load) {
|
||||
// NEWSBLUR.log(['post_open_river_stories', data, this.active_feed]);
|
||||
if (!data) {
|
||||
return NEWSBLUR.app.taskbar_info.show_stories_error(data);
|
||||
}
|
||||
|
|
|
|||
35
media/js/newsblur/views/dashboard_river.js
Normal file
35
media/js/newsblur/views/dashboard_river.js
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
|
||||
|
||||
el: ".NB-module-river",
|
||||
|
||||
events: {
|
||||
"click .NB-module-search-add-url" : "add_url"
|
||||
},
|
||||
|
||||
initialize: function() {
|
||||
this.$stories = this.$(".NB-module-item");
|
||||
this.story_titles = new NEWSBLUR.Views.StoryTitlesView({
|
||||
collection: NEWSBLUR.assets.dashboard_stories,
|
||||
$story_titles: this.$stories
|
||||
});
|
||||
// this.$stories.html(this.story_titles.$el);
|
||||
|
||||
NEWSBLUR.assets.feeds.bind('reset', _.bind(this.load_stories, this));
|
||||
},
|
||||
|
||||
// ==========
|
||||
// = Events =
|
||||
// ==========
|
||||
|
||||
load_stories: function() {
|
||||
var feeds = NEWSBLUR.assets.folders.feed_ids_in_folder();
|
||||
this.story_titles.show_loading();
|
||||
NEWSBLUR.assets.fetch_dashboard_stories("river:", feeds, 1,
|
||||
_.bind(this.post_load_stories, this), NEWSBLUR.app.taskbar_info.show_stories_error);
|
||||
},
|
||||
|
||||
post_load_stories: function() {
|
||||
console.log(['$story_title', this.story_titles.el, this.$stories[0], NEWSBLUR.reader.$s.$story_titles[0]]);
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -214,7 +214,7 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
|
|||
|
||||
load_url_next_param: function(route_found) {
|
||||
var next = $.getQueryString('next') || $.getQueryString('test');
|
||||
console.log(['load_url_next_param', next, route_found]);
|
||||
// console.log(['load_url_next_param', next, route_found]);
|
||||
if (next == 'optout') {
|
||||
NEWSBLUR.reader.open_account_modal({'animate_email': true});
|
||||
} else if (next == 'goodies') {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
this.collection.bind('no_more_stories', this.check_premium_river, this);
|
||||
this.collection.bind('no_more_stories', this.check_premium_search, this);
|
||||
this.collection.bind('change:selected', this.scroll_to_selected_story, this);
|
||||
NEWSBLUR.reader.$s.$story_titles.scroll(this.scroll);
|
||||
this.$story_titles = this.options.$story_titles || NEWSBLUR.reader.$s.$story_titles;
|
||||
this.$story_titles.scroll(this.scroll);
|
||||
this.stories = [];
|
||||
},
|
||||
|
||||
|
|
@ -26,7 +27,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
|
||||
render: function() {
|
||||
this.clear();
|
||||
NEWSBLUR.reader.$s.$story_titles.scrollTop(0);
|
||||
this.$story_titles.scrollTop(0);
|
||||
var collection = this.collection;
|
||||
var stories = this.collection.map(function(story) {
|
||||
return new NEWSBLUR.Views.StoryTitleView({
|
||||
|
|
@ -69,6 +70,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
},
|
||||
|
||||
clear: function() {
|
||||
// console.log(['clear story titles', this.stories.length, this.$el]);
|
||||
_.invoke(this.stories, 'destroy');
|
||||
this.cache = {};
|
||||
},
|
||||
|
|
@ -77,7 +79,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
if (!NEWSBLUR.reader.active_feed) return;
|
||||
if (NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout') != 'grid') return;
|
||||
var columns = NEWSBLUR.assets.preference('grid_columns');
|
||||
var $layout = NEWSBLUR.reader.$s.$story_titles;
|
||||
var $layout = this.$story_titles;
|
||||
$layout.removeClass('NB-grid-columns-1')
|
||||
.removeClass('NB-grid-columns-2')
|
||||
.removeClass('NB-grid-columns-3')
|
||||
|
|
@ -145,8 +147,8 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
if (NEWSBLUR.reader.counts['page_fill_outs'] < NEWSBLUR.reader.constants.FILL_OUT_PAGES &&
|
||||
!NEWSBLUR.assets.flags['no_more_stories']) {
|
||||
// var $last = this.$('.NB-story-title:visible:last');
|
||||
// var container_height = NEWSBLUR.reader.$s.$story_titles.height();
|
||||
// NEWSBLUR.log(["fill out", $last.length && $last.position().top, container_height, $last.length, NEWSBLUR.reader.$s.$story_titles.scrollTop()]);
|
||||
// var container_height = this.$story_titles.height();
|
||||
// NEWSBLUR.log(["fill out", $last.length && $last.position().top, container_height, $last.length, this.$story_titles.scrollTop()]);
|
||||
NEWSBLUR.reader.counts['page_fill_outs'] += 1;
|
||||
_.delay(_.bind(function() {
|
||||
this.scroll();
|
||||
|
|
@ -160,7 +162,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
options = options || {};
|
||||
if (NEWSBLUR.assets.flags['no_more_stories']) return;
|
||||
|
||||
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
|
||||
var $story_titles = this.$story_titles;
|
||||
this.$('.NB-end-line').remove();
|
||||
var $endline = $.make('div', { className: "NB-end-line NB-short" });
|
||||
$endline.css({'background': '#FFF'});
|
||||
|
|
@ -215,7 +217,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
},
|
||||
|
||||
end_loading: function() {
|
||||
var $endbar = NEWSBLUR.reader.$s.$story_titles.find('.NB-end-line');
|
||||
var $endbar = this.$story_titles.find('.NB-end-line');
|
||||
$endbar.remove();
|
||||
clearInterval(this.feed_stories_loading);
|
||||
|
||||
|
|
@ -231,7 +233,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
]);
|
||||
|
||||
if (_.contains(['list', 'grid'], NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout')) || NEWSBLUR.assets.preference('mark_read_on_scroll_titles')) {
|
||||
var pane_height = NEWSBLUR.reader.$s.$story_titles.height();
|
||||
var pane_height = this.$story_titles.height();
|
||||
var endbar_height = 20;
|
||||
var last_story_height = 80;
|
||||
endbar_height = pane_height - last_story_height;
|
||||
|
|
@ -250,7 +252,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
},
|
||||
|
||||
snap_back_scroll_position: function() {
|
||||
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
|
||||
var $story_titles = this.$story_titles;
|
||||
if (this.post_load_page_scroll_position == $story_titles.scrollTop() &&
|
||||
this.pre_load_page_scroll_position != null &&
|
||||
!NEWSBLUR.reader.flags['select_story_in_feed']) {
|
||||
|
|
@ -278,16 +280,16 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout') != 'grid') return;
|
||||
|
||||
// console.log(["scroll_to_selected_story 1", story, options]);
|
||||
var story_title_visisble = NEWSBLUR.reader.$s.$story_titles.isScrollVisible(story_title_view.$el);
|
||||
var story_title_visisble = this.$story_titles.isScrollVisible(story_title_view.$el);
|
||||
if (!story_title_visisble || options.force ||
|
||||
_.contains(['list', 'grid'], NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout'))) {
|
||||
var container_offset = NEWSBLUR.reader.$s.$story_titles.position().top;
|
||||
var container_offset = this.$story_titles.position().top;
|
||||
var scroll = story_title_view.$el.find('.NB-story-title').position().top;
|
||||
if (options.scroll_to_comments) {
|
||||
scroll = story_title_view.$el.find('.NB-feed-story-comments').position().top;
|
||||
}
|
||||
var container = NEWSBLUR.reader.$s.$story_titles.scrollTop();
|
||||
var height = NEWSBLUR.reader.$s.$story_titles.outerHeight();
|
||||
var container = this.$story_titles.scrollTop();
|
||||
var height = this.$story_titles.outerHeight();
|
||||
var position = scroll+container-height/5;
|
||||
// console.log(["scroll_to_selected_story 2", container_offset, scroll, container, height, position]);
|
||||
if (_.contains(['list', 'grid'], NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout'))) {
|
||||
|
|
@ -298,7 +300,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
}
|
||||
|
||||
// console.log(["scroll_to_selected_story 3", position]);
|
||||
NEWSBLUR.reader.$s.$story_titles.stop().scrollTo(position, {
|
||||
this.$story_titles.stop().scrollTo(position, {
|
||||
duration: NEWSBLUR.assets.preference('animations') ? 260 : 0,
|
||||
queue: false
|
||||
});
|
||||
|
|
@ -310,7 +312,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
// ==========
|
||||
|
||||
scroll: function() {
|
||||
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
|
||||
var $story_titles = this.$story_titles;
|
||||
var scroll_y = $story_titles.scrollTop();
|
||||
|
||||
if (NEWSBLUR.reader.flags['opening_feed']) return;
|
||||
|
|
@ -330,11 +332,11 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
|
|||
},
|
||||
|
||||
mark_read_stories_above_scroll: function(scroll_y) {
|
||||
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
|
||||
var $story_titles = this.$story_titles;
|
||||
var score = NEWSBLUR.reader.get_unread_view_score();
|
||||
var unread_stories = [];
|
||||
var grid = NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout') == 'grid';
|
||||
var point = NEWSBLUR.reader.$s.$story_titles.offset();
|
||||
var point = this.$story_titles.offset();
|
||||
var offset = grid ? {top: 100, left: 100} : {top: 30, left: 30};
|
||||
var $story_title = $(document.elementFromPoint(point.left + offset.left,
|
||||
point.top + offset.top
|
||||
|
|
|
|||
2
media/js/vendor/jquery.newsblur.js
vendored
2
media/js/vendor/jquery.newsblur.js
vendored
|
|
@ -441,7 +441,7 @@ NEWSBLUR.log = function(msg) {
|
|||
|
||||
while (e = r.exec(q))
|
||||
params[d(e[1])] = d(e[2]);
|
||||
console.log(['get query string', name, params, params[name]]);
|
||||
// console.log(['get query string', name, params, params[name]]);
|
||||
return params[name];
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,17 @@
|
|||
{% render_getting_started %}
|
||||
{% endif %}
|
||||
|
||||
<div class="NB-module NB-module-river">
|
||||
<h5 class="NB-module-header">
|
||||
<div class="NB-module-river-settings NB-javascript"></div>
|
||||
All Site Stories
|
||||
</h5>
|
||||
|
||||
<div class="NB-module-item">
|
||||
<div class="NB-story-titles"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% render_features_module %}
|
||||
|
||||
{% if recommended_feeds %}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue