diff --git a/media/css/reader.css b/media/css/reader.css index 63c64d824..9e1c6fc19 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -2168,29 +2168,31 @@ background: transparent; .NB-feed-story .NB-feed-story-tags { margin: 9px 0 6px; - overflow: hidden; line-height: 12px; - height: 14px; + height: 16px; } .NB-feed-story .NB-feed-story-tags .NB-middot { color: #A0A0A0; font-size: 10px; - padding-right: 4px; + padding-right: 8px; float: left; font-weight: normal; } .NB-feed-story .NB-feed-story-tag { /* Grey */ float: left; + cursor: pointer; font-weight: normal; font-size: 9px; - padding: 0px 4px 1px; - margin: 0 2px 2px; - background-color: #D8DEE2; - color: #9D9A95; - text-shadow: 0 1px 0 rgba(255, 255, 255, .5); border-radius: 4px; - cursor: pointer; + + padding: 1px 5px; + margin: -2px 4px 4px 0; + background-color: rgba(0, 0, 0, .1); + color: #959B8B; + text-shadow: 0 1px 0 rgba(255, 255, 255, .5); + border: 1px solid transparent; + border-color: rgba(255, 255, 255, .3) transparent rgba(0, 0, 0, .1); } .NB-feed-story .NB-feed-story-tag:first-child { margin-left: 0; diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index 6a614a2b2..637631604 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -206,7 +206,7 @@ footerString ]; -// NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString); + NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString); NSString *path = [[NSBundle mainBundle] bundlePath]; NSURL *baseURL = [NSURL fileURLWithPath:path]; @@ -282,7 +282,7 @@ int authorScore = [[[[appDelegate.activeClassifiers objectForKey:feedId] objectForKey:@"authors"] objectForKey:author] intValue]; - storyAuthor = [NSString stringWithFormat:@"·%@", author, authorScore > 0 ? @"NB-story-author-positive" : authorScore < 0 ? @"NB-story-author-negative" : @"", @@ -329,15 +329,13 @@ NSString *storyHeader = [NSString stringWithFormat:@ "
As part of a thought experiment to reform the electoral college, Neil Freeman redrew the US into 50 new states with equal population. In trying to balance the interests of the popular vote vs the integrity of states, he's split the baby so that no one is likely to be happy. Perfect!
+As part of a thought experiment to reform the electoral college, Neil Freeman redrew the US into 50 new states with equal population. In trying to balance the interests of the popular vote vs the integrity of states, he's split the baby so that no one is likely to be happy. Perfect!
diff --git a/media/ios/static/storyDetailView.css b/media/ios/static/storyDetailView.css index 8e84e66d0..df28976f3 100644 --- a/media/ios/static/storyDetailView.css +++ b/media/ios/static/storyDetailView.css @@ -43,7 +43,7 @@ */ .NB-ipad-wide .NB-header { - padding: 15px 0 5px; + padding: 15px 0; } .NB-ipad-wide .NB-header .NB-header-inner { @@ -81,7 +81,7 @@ */ .NB-ipad-narrow .NB-header { - padding: 15px 30px 5px; + padding: 12px 30px; } .NB-ipad-narrow .NB-story { @@ -118,7 +118,7 @@ */ .NB-iphone .NB-header { - padding: 12px 12px 5px; + padding: 8px 12px; } .NB-iphone .NB-story { @@ -153,14 +153,47 @@ body.NB-iphone { line-height: 110%; } + +/* ========== */ +/* = Header = */ +/* ========== */ + +.NB-story-title { + clear: left; + margin: 2px 0 4px; + color: #313330; +} + +.NB-story-title-positive { + color: #58A353; + text-shadow: 0 1px 0 #E9F6E9; +} +.NB-story-title-negative { + color: #B85044; + text-shadow: 0 1px 0 #F6E9E9; +} +.NB-story-date { + display: inline; + color: #818776; + font-size: 11px; + white-space: nowrap; +} + +.NB-middot { + display: inline-block; + color: #A0A0A0; + padding: 0 8px 0; + line-height: 8px; + font-weight: normal; +} + .NB-story-author { - color: #969696; + display: inline; + font-size: 11px; + color: #959B8B; text-decoration: none; - text-transform: uppercase; - margin: 4px 8px 0px 0; - margin-bottom: 8px; - text-shadow: 0 1px 0 rgba(255, 255, 255, .9); - float: left; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255, 255, 255, .5); position: relative; } .NB-story-author-positive { @@ -171,24 +204,28 @@ body.NB-iphone { color: #B85044; text-shadow: 0 1px 0 #F6E9E9; } + .NB-story-tags { overflow: hidden; - padding: 5px 2px 2px 2px; - margin-bottom: 8px; - text-transform: uppercase; + padding: 5px 2px 2px 0; + line-height: 12px; + height: 14px; } .NB-story-tag { float: left; text-decoration: none; font-weight: normal; - padding: 0px 4px 0px; + padding: 1px 5px; margin: 0px 4px 4px 0; - background-color: #C9CBC6; - color: #505050; - text-shadow: 0 1px 0 #E0E8DB; + background-color: rgba(0, 0, 0, .1); + color: #959B8B; + text-shadow: 0 1px 0 rgba(255, 255, 255, .5); -webkit-border-radius: 4px; + border: 1px solid transparent; + border-color: rgba(255, 255, 255, .3) transparent rgba(0, 0, 0, .1); position: relative; + font-size: 9px; } .NB-story-tag-positive { background-color: #88B383; @@ -221,29 +258,6 @@ body.NB-iphone { } -.NB-story-date { - color: #454D6C; -} - -.NB-story-author { - font-size: 10px; - line-height: 12px -} - -.NB-story-tags { - line-height: 12px; - height: 12px; -} - -.NB-story-tag { - font-size: 9px; -} - -.NB-story-date { - font-size: 11px; - line-height: 13px; -} - .NB-story h1, .NB-story h2, .NB-story h3, @@ -307,10 +321,9 @@ div + p { .NB-header { font-size: 22px; line-height: 1.2em; - font-weight: 600; background-image: -webkit-gradient(linear, left top, left bottom, from(#FEFEFE), to(#F3F4EF)); border-bottom: 1px solid #C2C5BE; - text-shadow: 0 1px 0 rgba(255, 255, 255, .9); + text-shadow: 0 1px 0 rgba(255, 255, 255, .5); overflow: hidden; max-width: none; @@ -318,7 +331,7 @@ div + p { } .NB-iphone .NB-header { - font-size: 14px; + font-size: 16px; } .NB-story { @@ -360,19 +373,6 @@ div + p { clear: both; } -.NB-story-title { - clear: left; - margin: 8px 0 4px; -} - -.NB-story-title-positive { - color: #58A353; - text-shadow: 0 1px 0 #E9F6E9; -} -.NB-story-title-negative { - color: #B85044; - text-shadow: 0 1px 0 #F6E9E9; -} ins { text-decoration: none; }