adding in highlight state to login

media/ios/Classes/LoginViewController.m

@@ -305,6 +305,8 @@
 
 - (IBAction)selectSignUp {
     isOnSignUpScreen = YES;
+    self.selectSignUpButton.selected = YES;
+    self.selectLoginButton.selected = NO;
     [self.errorLabel setHidden:YES];
     if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
         [UIView animateWithDuration:0.35 animations:^{
@@ -322,6 +324,8 @@
 
 - (IBAction)selectLogin {
     isOnSignUpScreen = NO;
+    self.selectSignUpButton.selected = NO;
+    self.selectLoginButton.selected = YES;
     [self.errorLabel setHidden:YES];
     if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
         [UIView animateWithDuration:0.35 animations:^{

media/ios/Classes/StoryDetailViewController.m

@@ -542,7 +542,7 @@
             NSString *reply = [NSString stringWithFormat:@
                                 "<div class=\"NB-story-comment-reply\" id=\"NB-user-comment-%@\">"
                                 "   <a class=\"NB-show-profile\" href=\"http://ios.newsblur.com/show-profile/%@\">"
-                                "       <img class=\"NB-user-avatar NB-story-comment-reply-photo\" src=\"%@\" />"
+                                "       <img class=\"NB-story-comment-reply-photo\" src=\"%@\" />"
                                 "   </a>"
                                 "   <div class=\"NB-story-comment-username NB-story-comment-reply-username\">%@</div>"
                                 "   <div class=\"NB-story-comment-date NB-story-comment-reply-date\">%@ ago</div>"
@@ -621,7 +621,7 @@
     
     if (contentWidth > 700) {
         contentWidthClass = @"NB-ipad-wide";
-    } else if (contentWidth > 420) {
+    } else if (contentWidth > 480) {
         contentWidthClass = @"NB-ipad-narrow";
     } else {
         contentWidthClass = @"NB-iphone";

media/ios/NewsBlur.xcodeproj/project.pbxproj

@@ -20,6 +20,10 @@
 		432E29FC15BFBCA10006EA51 /* back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 432E29FA15BFBCA10006EA51 /* back@2x.png */; };
 		432E2A0315C079770006EA51 /* folder_white.png in Resources */ = {isa = PBXBuildFile; fileRef = 432E2A0115C079770006EA51 /* folder_white.png */; };
 		432E2A0415C079770006EA51 /* folder_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 432E2A0215C079770006EA51 /* folder_white@2x.png */; };
+		432EBD0E15D1A2B00000729D /* fountain_pen_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 432EBD0C15D1A2B00000729D /* fountain_pen_on.png */; };
+		432EBD0F15D1A2B00000729D /* fountain_pen_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 432EBD0D15D1A2B00000729D /* fountain_pen_on@2x.png */; };
+		432EBD1615D1A7800000729D /* user_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 432EBD1415D1A7800000729D /* user_on.png */; };
+		432EBD1715D1A7800000729D /* user_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 432EBD1515D1A7800000729D /* user_on@2x.png */; };
 		433323B8158901A40025064D /* fountain_pen.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B6158901A40025064D /* fountain_pen.png */; };
 		433323B9158901A40025064D /* fountain_pen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B7158901A40025064D /* fountain_pen@2x.png */; };
 		433323BB158901C10025064D /* login_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323BA158901C10025064D /* login_background.png */; };
@@ -345,6 +349,10 @@
 		432E29FA15BFBCA10006EA51 /* back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back@2x.png"; sourceTree = "<group>"; };
 		432E2A0115C079770006EA51 /* folder_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = folder_white.png; sourceTree = "<group>"; };
 		432E2A0215C079770006EA51 /* folder_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "folder_white@2x.png"; sourceTree = "<group>"; };
+		432EBD0C15D1A2B00000729D /* fountain_pen_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen_on.png; sourceTree = "<group>"; };
+		432EBD0D15D1A2B00000729D /* fountain_pen_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen_on@2x.png"; sourceTree = "<group>"; };
+		432EBD1415D1A7800000729D /* user_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = user_on.png; sourceTree = "<group>"; };
+		432EBD1515D1A7800000729D /* user_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_on@2x.png"; sourceTree = "<group>"; };
 		433323B6158901A40025064D /* fountain_pen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen.png; sourceTree = "<group>"; };
 		433323B7158901A40025064D /* fountain_pen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen@2x.png"; sourceTree = "<group>"; };
 		433323BA158901C10025064D /* login_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = login_background.png; sourceTree = "<group>"; };
@@ -1177,6 +1185,10 @@
 		433323B5158901A40025064D /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				432EBD1415D1A7800000729D /* user_on.png */,
+				432EBD1515D1A7800000729D /* user_on@2x.png */,
+				432EBD0C15D1A2B00000729D /* fountain_pen_on.png */,
+				432EBD0D15D1A2B00000729D /* fountain_pen_on@2x.png */,
 				43C95C41158BD13D0086C69B /* category_selected_background.png */,
 				43C95C4A158BF8810086C69B /* google_reader_selected_background.png */,
 				43C95C3D158BCDD70086C69B /* 19-circle-check.png */,
@@ -1917,6 +1929,10 @@
 				43A4BAE915C866FA00F3B8D4 /* popoverBgSimple.png in Resources */,
 				43A4BAEB15C893E300F3B8D4 /* FriendsListViewController.xib in Resources */,
 				43A4BAF415C89BF600F3B8D4 /* FindSitesViewController.xib in Resources */,
+				432EBD0E15D1A2B00000729D /* fountain_pen_on.png in Resources */,
+				432EBD0F15D1A2B00000729D /* fountain_pen_on@2x.png in Resources */,
+				432EBD1615D1A7800000729D /* user_on.png in Resources */,
+				432EBD1715D1A7800000729D /* user_on@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

media/ios/reader.css

@@ -2,10 +2,6 @@
     float: right;
 }
 
-#story_pane .NB-feed-story-comments {
-        border-bottom: 1px solid #A6A6A6;
-
-}
 #story_pane .NB-story-comment {
     border-top: 1px solid #A6A6A6;
     background: -webkit-gradient(linear,0% 0,0% 100%,from(#F5F9FB),to(#ECF0F2));
@@ -138,6 +134,11 @@
     border-top: 0;
     padding-top: 0;
 }
+
+#story_pane .nb-story-comments-shares-teaser .NB-right {
+    margin-top: 2px;
+}
+
 #story_pane .NB-story-comments-public-teaser,
 #story_pane .NB-story-comments-public-header {
     background-color: #B1B6B4;
@@ -169,10 +170,7 @@
     padding: 8px 12px 0;
     overflow: hidden;
     height: 26px;
-    -webkit-transition: all .12s ease-out;
+    border-bottom: 1px solid #A6A6A6;
-    -moz-transition: all .12s ease-out;
-    -o-transition: all .12s ease-out;
-    -ms-transition: all .12s ease-out;
     background-image: -webkit-gradient(linear,left bottom,left top,color-stop(0.10,#EBEBEC),color-stop(0.84,whiteSmoke));
     background-image: -moz-linear-gradient(center bottom,#EBEBEC 10%,whiteSmoke 84%);
 }
@@ -187,7 +185,7 @@
 }
 #story_pane .NB-story-share-label {
     display: inline-block;
-    margin: 0 4px 0 0;
+    margin: 2px 4px 0 0;
 }
 #story_pane .NB-story-share-profiles {
     display: inline-block;

media/ios/sample_text.html

@@ -1,8 +1,4 @@
-<html><head><link rel="stylesheet" type="text/css" href="reader.css" ><link rel="stylesheet" type="text/css" href="storyDetailView.css" ><meta name="viewport" id="viewport" content="width=320, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/></head><body id="story_pane" class="NB-iphone">    <div class="NB-header"><div class="NB-header-inner"><div class="NB-story-date">6:43am</div><div class="NB-story-title">Glass Half Empty</div><div class="NB-story-author"></div></div></div>    <div class="NB-feed-story-comments"><div class="NB-story-comments-shares-teaser-wrapper"><div class="NB-story-comments-shares-teaser"><div class="NB-story-share-label">Shared by: </div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-33405" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/33405"><img src="http://graph.facebook.com/2231474/picture" /></a></div></div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-32048" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/32048"><img src="http://f.cl.ly/items/0L3E37240r1O1V140k2q/popular.jpg" /></a></div></div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-27551" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/27551"><img src="http://graph.facebook.com/1702670/picture" /></a></div></div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-24425" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/24425"><img src="http://a0.twimg.com/profile_images/689503265/profile_normal.jpg" /></a></div></div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-32768" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/32768"><img src="http://a0.twimg.com/profile_images/481286828/tech2_normal.jpg" /></a></div></div></div></div></div>    <div class="NB-san-serif" id="NB-font-style">       <div class="NB-small" id="NB-font-size">           <div class="NB-story"><article class="entry">
+<html><head><link rel="stylesheet" type="text/css" href="reader.css" ><link rel="stylesheet" type="text/css" href="storyDetailView.css" ><meta name="viewport" id="viewport" content="width=497, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/></head><body id="story_pane" class="NB-ipad-narrow">    <div class="NB-header"><div class="NB-header-inner"><div class="NB-story-date">1:23pm</div><div class="NB-story-title">Ocean gliders are becoming one of the Navy’s main tools...</div><div class="NB-story-author"></div></div></div>    <div class="NB-feed-story-comments"><div class="NB-story-comments-shares-teaser-wrapper"><div class="NB-story-comments-shares-teaser"><div class="NB-right">Shared by 2 people</div><div class="NB-story-share-profiles NB-story-share-profiles-public"></div><div class="NB-story-share-label">Shared by: </div><div class="NB-story-share-profiles NB-story-share-profiles-friends"><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-10" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/10"><img src="http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e" /></a></div></div><div class="NB-story-share-profile"><div class="NB-user-avatar"><a id="NB-user-share-bar-3" class="NB-show-profile" href="http://ios.newsblur.com/show-profile/3"><img src="http://www.gravatar.com/avatar/8cef1a0df909c0290fdc1d87c6c30a55" /></a></div></div></div></div></div></div>    <div class="NB-san-serif" id="NB-font-style">       <div class="NB-small" id="NB-font-size">           <div class="NB-story"><img src="http://25.media.tumblr.com/tumblr_m7s4e2SeX31qz4vmto1_400.jpg" /><br /><br /><blockquote><em>Ocean gliders are becoming one of the Navy’s main tools for collecting data on the internal structure of the ocean for assimilation into ocean models. A glider is a long-endurance autonomous underwater vehicle (AUV) used to collect ocean data; it surfaces periodically to transmit data via satellite. Gliders are capable of collecting numerous types of data, including currents, temperature, salinity, pressure, and optics.</em></blockquote>
-  <a href="http://what-if.xkcd.com/6/"><h1>Glass Half Empty</h1></a>
+<p>I wonder how long these would run for if the world were to suddenly end. I imagine them surfacing every few weeks and transmitting vainly to satellites that’ve fallen out of the sky; sitting on the surface and basking in the sun for a while, perhaps, to recharge their solar cells. Like brittle yellow turtles.</p>
-  <p id="question">What if a glass of water was, all of a sudden, literally half empty?</p>
+<p>They wouldn’t know that everything had died - taken by some disease or disaster. They’d wander around the now-quiet oceans, taking their measure of the world, until, one by one, they’d succumb to salinity or erosion and suddenly stop, mid-journey, before sinking quiet and still to the ocean floor.</p>
-<p id="attribute">—Vittorio Iacovella</p>
+<p>(via <a href="http://www.nrl.navy.mil/media/news-releases/2012/navy-researchers-sail-down-under-to-study-internal-tides-with-auvs" target="_blank">U.S. Naval Research Laboratory</a>)</p></div>       </div>    </div>    <div class='NB-share-header'></div><div class='NB-share-wrapper'><div class='NB-share-inner-wrapper'><div id="NB-share-button-id" class='NB-share-button NB-button'><div><a href="http://ios.newsblur.com/share">Post to Blurblog</a></div></div></div></div>    <div id="NB-comments-wrapper">       <div class="NB-feed-story-comments"><div class="NB-story-comment" id="NB-user-comment-10"><div class="NB-user-avatar"><a class="NB-show-profile" href="http://ios.newsblur.com/show-profile/10"><img src="http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e" /></a></div><div class="NB-story-comment-author-container">       <div class="NB-story-comment-username">firefox_stranger</div>    <div class="NB-story-comment-date">7 days ago</div>    <div class="NB-story-comment-reply-button NB-button">        <div class="NB-story-comment-reply-button-wrapper">            <a href="http://ios.newsblur.com/reply/10/firefox_stranger">Reply</a>        </div>    </div>        <div class="NB-story-comment-like-button NB-button"><div class="NB-story-comment-like-button-wrapper"><a href="http://ios.newsblur.com/like-comment/10">Favorite</a></div></div></div><div class="NB-story-comment-content">This is really cool.</div><div class="NB-story-comment-replies"><div class="NB-story-comment-reply" id="NB-user-comment-50172164c6cd1a057000001c">   <a class="NB-show-profile" href="http://ios.newsblur.com/show-profile/10">       <img class="NB-user-avatar NB-story-comment-reply-photo" src="http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e" />   </a>   <div class="NB-story-comment-username NB-story-comment-reply-username">firefox_stranger</div>   <div class="NB-story-comment-date NB-story-comment-reply-date">7 days ago</div>       <div class="NB-story-comment-reply-content">This is my reply</div></div><div class="NB-story-comment-reply" id="NB-user-comment-50172177c6cd1a057000001e">   <a class="NB-show-profile" href="http://ios.newsblur.com/show-profile/10">       <img class="NB-user-avatar NB-story-comment-reply-photo" src="http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e" />   </a>   <div class="NB-story-comment-username NB-story-comment-reply-username">firefox_stranger</div>   <div class="NB-story-comment-date NB-story-comment-reply-date">7 days ago</div>       <div class="NB-story-comment-reply-content">Reply 2</div></div></div></div><div class="NB-story-comment" id="NB-user-comment-3"><div class="NB-user-avatar NB-story-comment-reshare"><a class="NB-show-profile" href="http://ios.newsblur.com/show-profile/3"><img src="http://www.gravatar.com/avatar/8cef1a0df909c0290fdc1d87c6c30a55" /></a></div><div class="NB-story-comment-author-container">   <div class="NB-story-comment-reshares">    <div class="NB-story-share-profile">        <div class="NB-user-avatar"><img src="http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e"></div>    </div></div>    <div class="NB-story-comment-username">roy</div>    <div class="NB-story-comment-date">1 hour ago</div>    <div class="NB-story-comment-reply-button NB-button">        <div class="NB-story-comment-reply-button-wrapper">            <a href="http://ios.newsblur.com/reply/3/roy">Reply</a>        </div>    </div>    <div class="NB-story-comment-edit-button NB-story-comment-share-edit-button NB-button"><div class="NB-story-comment-edit-button-wrapper"><a href="http://ios.newsblur.com/edit-share/3">Edit</a></div></div>    </div><div class="NB-story-comment-content">Should be firefox still</div></div></div>    </div>    <script src="zepto.js"></script><script src="storyDetailView.js"></script></body></html>
-
-
-
-</article></div>       </div>    </div>    <div class='NB-share-header'></div><div class='NB-share-wrapper'><div class='NB-share-inner-wrapper'><div id="NB-share-button-id" class='NB-share-button NB-button'><div><a href="http://ios.newsblur.com/share">Post to Blurblog</a></div></div></div></div>    <div id="NB-comments-wrapper">       <div class="NB-feed-story-comments"><div class="NB-story-comment" id="NB-user-comment-24425"><div class="NB-user-avatar"><a class="NB-show-profile" href="http://ios.newsblur.com/show-profile/24425"><img src="http://a0.twimg.com/profile_images/689503265/profile_normal.jpg" /></a></div><div class="NB-story-comment-author-container">       <div class="NB-story-comment-username">ConstantineXVI</div>    <div class="NB-story-comment-date">4 hours ago</div></div><div class="NB-story-comment-content">"the physicist ducks"<div style="clear:both">    <div class="NB-story-comment-reply-button NB-button">        <div class="NB-story-comment-reply-button-wrapper">            <a href="http://ios.newsblur.com/reply/24425/ConstantineXVI">Reply</a>        </div>    </div>        <div class="NB-story-comment-like-button NB-button"><div class="NB-story-comment-like-button-wrapper"><a href="http://ios.newsblur.com/like-comment/24425">Favorite</a></div></div></div></div></div></div>    </div>    <script src="zepto.js"></script><script src="storyDetailView.js"></script></body></html>

media/ios/storyDetailView.css

@@ -55,11 +55,18 @@
     margin: 0 90px;
 }
 
-/*
+.NB-ipad-wide#story_pane .NB-story-comments-shares-teaser {
-.NB-ipad-wide .NB-story img {
+    padding-left: 90px;
-    max-width: 540px !important;
+    padding-right: 90px;
+}
+
+.NB-ipad-wide#story_pane .nb-story-comment {
+    padding: 0 90px 2px 150px;
+}
+
+.NB-ipad-wide#story_pane .nb-story-comment .nb-user-avatar { 
+    left: 88px;
 }
- */
 
 /**
  * iPad Narrow Style
@@ -77,12 +84,18 @@
     margin: 0 30px;
 }
 
-/*
+.NB-ipad-narrow#story_pane .NB-story-comments-shares-teaser {
-.NB-ipad-narrow .NB-story img {
+    padding-left: 30px;
-    max-width: 400px !important;
+    padding-right: 30px;
 }
 
- */
+.NB-ipad-narrow#story_pane .nb-story-comment {
+    padding: 0 30px 2px 90px;
+}
+
+.NB-ipad-narrow#story_pane .nb-story-comment .nb-user-avatar { 
+    left: 28px;
+}
 
 /**
  * iPhone Style
@@ -338,6 +351,10 @@ del {
     -webkit-transition: background-color .6s linear;
 }
 
+.NB-story-comment:last-child {
+            border-bottom: 1px solid #A6A6A6;
+}
+
 #story_pane .NB-story-comment .NB-story-comment-content {
     float: none;
 }