Styling river headers in feed list.

This commit is contained in:
Samuel Clay 2013-02-04 17:32:26 -08:00
parent 3b10ff8594
commit 10a96c4401
2 changed files with 38 additions and 31 deletions

View file

@ -422,12 +422,12 @@ body {
}
.NB-feedlists .NB-socialfeeds .feed {
background-color: #C6D3E6;
border-top-color: #C6D3E6;
border-bottom-color: #C6D3E6;
background-color: #E6ECE8;
border-top-color: #E6ECE8;
border-bottom-color: #E6ECE8;
}
.NB-feedlists .NB-socialfeeds {
border-bottom: 1px solid #A0A0A0;
border-bottom: 1px solid #B7BBAA;
}
.NB-feedlists .NB-socialfeeds .feed .feed_title {
text-shadow: 0 1px 0 rgba(250, 250, 250, .4);
@ -3090,7 +3090,6 @@ background: transparent;
/* ================ */
.NB-feeds-header-wrapper {
border-bottom: 1px solid #777D86;
}
.NB-feeds-header-user {
@ -3226,19 +3225,32 @@ background: transparent;
}
.NB-feeds-header {
background: #4F5358 url("/media/embed/reader/feeds_header_background.png") repeat-x scroll left top;
background-color: #EAECE5;
background-image: -webkit-gradient(linear, left top, left bottom, from(#EAECE5), to(#DCDFD6));
background: -moz-linear-gradient(center top , #EAECE5 0%, #DCDFD6 100%);
background-image: linear-gradient(top, #EAECE5, #DCDFD6);
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 22px;
border-top: 1px solid #303030;
border-bottom: 1px solid #E9E9E9;
font-size: 10px;
cursor: pointer;
overflow: hidden;
}
.NB-feeds-header:hover:not(.NB-selected) {
background-color: #E1E6D7;
background-image: -webkit-gradient(linear, left top, left bottom, from(#E1E6D7), to(#CFD6C3));
background: -moz-linear-gradient(center top , #E1E6D7 0%, #CFD6C3 100%);
background-image: linear-gradient(top, #E1E6D7, #CFD6C3);
}
.NB-feeds-header.NB-selected {
border-top: 1px solid #F7F8F5;
}
.NB-feeds-header .NB-feeds-header-icon {
position: absolute;
top: 3px;
@ -3251,21 +3263,14 @@ background: transparent;
display: block;
padding: 0 40px 2px 23px;
text-decoration: none;
color: #F0F0F0;
color: #393939;
line-height: 22px;
height: 22px;
overflow: hidden;
text-shadow: 0 1px 0 rgba(0, 0, 0, .4);
text-shadow: 0 1px 0 rgba(255, 255, 255, .4);
text-transform: uppercase;
}
.NB-feeds-header:hover .NB-feeds-header-title {
color: #C1C1C1;
}
.NB-feeds-header.NB-selected {
border-top: 1px solid #303030;
}
.NB-feeds-header.NB-selected .NB-feeds-header-title {
text-shadow: 0 1px 0 rgba(255, 255, 255, .4);
@ -3278,7 +3283,6 @@ background: transparent;
.NB-feeds-header-river-container {
display: none;
border-bottom: 1px solid #F0F0F0;
}
.NB-feeds-header-river-container .NB-feeds-header-icon {
@ -3293,7 +3297,10 @@ background: transparent;
}
.NB-feeds-header-river-container .NB-feeds-header {
border-bottom: 1px solid #303030;
border-bottom: 1px solid #B7BBAA;
}
.NB-feeds-header-starred.NB-feeds-header {
border-top: 1px solid #B7BBAA;
}
.NB-feeds-header-river-container .NB-feeds-header.NB-empty .NB-feeds-header-count {
display: none;

View file

@ -252,7 +252,7 @@
south__resizable: false,
enableCursorHotkey: false,
togglerLength_open: 0,
south__spacing_open: 1
south__spacing_open: 0
});
this.layout.leftCenterLayout = $('.left-center').layout({
@ -3769,25 +3769,25 @@
}, this));
this.socket.removeAllListeners(NEWSBLUR.Globals.username);
this.socket.on('user:update', _.bind(function(username, feed_id) {
this.socket.on('user:update', _.bind(function(username, message) {
if (this.flags.social_view) return;
if (_.string.contains(feed_id, 'feed:')) {
feed_id = parseInt(feed_id.replace('feed:', ''), 10);
if (_.string.contains(message, 'feed:')) {
feed_id = parseInt(message.replace('feed:', ''), 10);
var active_feed_ids = [];
if (this.active_folder && this.active_folder.length) {
active_feed_ids = this.active_folder.feed_ids_in_folder();
}
if (feed_id != this.active_feed &&
!_.contains(active_feed_ids, feed_id)) {
NEWSBLUR.log(['Real-time user update', username, feed_id]);
this.feed_unread_count(feed_id);
if (message != this.active_feed &&
!_.contains(active_feed_ids, message)) {
NEWSBLUR.log(['Real-time user update', username, message]);
this.feed_unread_count(message);
}
} else if (_.string.contains(feed_id, 'social:')) {
if (feed_id != this.active_feed) {
NEWSBLUR.log(['Real-time user update', username, feed_id]);
this.feed_unread_count(feed_id);
} else if (_.string.contains(message, 'social:')) {
if (message != this.active_feed) {
NEWSBLUR.log(['Real-time user update', username, message]);
this.feed_unread_count(message);
}
} else if (feed_id == "interaction:new") {
} else if (message == "interaction:new") {
this.update_interactions_count();
}
}, this));