public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing feedchooser to work with new data-less feeds. Also fixing hiding/showing when hide-unread-feeds is on. Also widened feedchooser in case of scrollbar.

Browse source
This commit is contained in:
Samuel Clay 2011-03-31 09:25:48 -04:00
parent 213b3493c4
commit 5bbd13931d
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
media/css/reader.css
View file

@ -673,24 +673,24 @@ body.NB-theme-serif #story_pane .NB-feed-story-content {
text-shadow: none;
}
.NB-feedlist-hide-read-feeds #feed_list .feed {
.NB-feedlist-hide-read-feeds .NB-feedlist .feed {
display: none;
}
.NB-feedlist-hide-read-feeds #feed_list.unread_view_positive .unread_positive {
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_positive .unread_positive {
display: block;
}
.NB-feedlist-hide-read-feeds #feed_list.unread_view_neutral .unread_positive,
.NB-feedlist-hide-read-feeds #feed_list.unread_view_neutral .unread_neutral {
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_neutral .unread_positive,
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_neutral .unread_neutral {
display: block;
}
.NB-feedlist-hide-read-feeds #feed_list.unread_view_negative .unread_positive,
.NB-feedlist-hide-read-feeds #feed_list.unread_view_negative .unread_neutral,
.NB-feedlist-hide-read-feeds #feed_list.unread_view_negative .unread_negative {
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_negative .unread_positive,
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_negative .unread_neutral,
.NB-feedlist-hide-read-feeds .NB-feedlist.unread_view_negative .unread_negative {
display: block;
}
.NB-feedlist-hide-read-feeds #feed_list .feed.NB-empty {
.NB-feedlist-hide-read-feeds .NB-feedlist .feed.NB-empty {
display: block;
}
@ -4253,7 +4253,7 @@ background: transparent;
font-size: 12px;
color: #606060;
text-shadow: 1px 1px 0 #F0F0F0;
width: 685px;
width: 715px;
}
.NB-modal-feedchooser .NB-modal-subtitle b {
/* margin: 0 0 4px 0;*/
@ -4267,7 +4267,7 @@ background: transparent;
.NB-modal-feedchooser .NB-feedchooser-type {
float: left;
width: 330px;
width: 345px;
margin: 24px 24px 0 0;
padding: 0 24px 0 0;
border-right: 1px solid #E0E0E0;
@ -4332,8 +4332,7 @@ background: transparent;
}
.NB-modal-feedchooser .NB-modal-submit.NB-modal-submit-paypal {
border-radius: 20px;
padding: 12px;
border-radius: 12px;
border: 1px solid #F6BD44;
padding: 0 8px 4px 0px;
background-color: #FFED68;
@ -4365,7 +4364,6 @@ background: transparent;
margin: 0px 0px 0px 0;
padding: 4px 0 4px 2px;
font-weight: bold;
width: 112px;
}
.NB-modal-feedchooser .NB-feedchooser-dollar-value {
@ -4431,6 +4429,9 @@ background: transparent;
text-transform: uppercase;
}
.NB-modal-feedchooser #NB-feedchooser-feeds .feed {
display: block;
}
.NB-modal-feedchooser .feed.NB-feedchooser-approve .feed_title {
font-weight: bold;
}

10
media/js/newsblur/reader_feedchooser.js
View file

@ -176,8 +176,8 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
open_modal: function() {
var self = this;
this.$modal.modal({
'minWidth': 750,
'maxWidth': 750,
'minWidth': 780,
'maxWidth': 780,
'overlayClose': true,
'onOpen': function (dialog) {
dialog.overlay.fadeIn(200, function () {
@ -234,7 +234,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
var $feeds = {};
$('.feed', $feed_list).each(function() {
var feed_id = $(this).data('feed_id');
var feed_id = parseInt($(this).attr('data-id'), 10);
if (!(feed_id in $feeds)) {
$feeds[feed_id] = $([]);
}
@ -338,7 +338,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
// Approve or decline
var feeds = [];
$feeds.each(function() {
var feed_id = $(this).data('feed_id');
var feed_id = parseInt($(this).attr('data-id'), 10);
if (_.contains(active_feeds, feed_id)) {
self.add_feed_to_approve(feed_id);
@ -406,7 +406,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
$.targetIs(e, { tagSelector: '.feed' }, _.bind(function($t, $p) {
e.preventDefault();
var feed_id = $t.data('feed_id');
var feed_id = parseInt($t.attr('data-id'), 10);
if (_.contains(this.approve_list, feed_id)) {
this.add_feed_to_decline(feed_id, true);
} else {