diff --git a/media/css/reader.css b/media/css/reader.css index efe150a84..2d86a2d0d 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -6839,6 +6839,10 @@ form.opml_import_form input { padding: 12px; overflow: hidden; width: 100%; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .NB-modal-intro .NB-page-2 h4 { diff --git a/media/js/newsblur/reader/reader_intro.js b/media/js/newsblur/reader/reader_intro.js index 45109852d..7c6a3344a 100644 --- a/media/js/newsblur/reader/reader_intro.js +++ b/media/js/newsblur/reader/reader_intro.js @@ -33,8 +33,8 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, { this.make_find_friends_and_services(); this.open_modal(); this.page(this.page_number); - this.fetch_friends(); this.fetch_categories(); + this.fetch_friends(); this.$modal.bind('click', $.rescope(this.handle_click, this)); this.$modal.bind('change', $.rescope(this.handle_change, this)); @@ -209,7 +209,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, { var feed = this.category_feeds[feed_id]; if (!feed) return; feed = new NEWSBLUR.Models.Feed(feed); - var border = feed.get('favicon_fade') || "707070"; + var border = feed.get('favicon_color') || "707070"; return $.make("div", { className: "NB-category-feed", style: "border-left: 4px solid #" + border + "; border-right: 4px solid #" + border }, [ $.make('img', { className: 'NB-category-feed-favicon', src: $.favicon(feed) }), $.make('div', { className: 'NB-category-feed-title' }, feed.get('feed_title'))