diff --git a/media/ios/Classes/LoginViewController.m b/media/ios/Classes/LoginViewController.m index 6a2fcf56c..f84df8604 100644 --- a/media/ios/Classes/LoginViewController.m +++ b/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:^{ diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index 467cb336e..8ff8c7f0a 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -542,7 +542,7 @@ NSString *reply = [NSString stringWithFormat:@ "
" " " - " " + " " " " "
%@
" "
%@ ago
" @@ -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"; diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index 5eafebd31..f56108ed5 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/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 = ""; }; 432E2A0115C079770006EA51 /* folder_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = folder_white.png; sourceTree = ""; }; 432E2A0215C079770006EA51 /* folder_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "folder_white@2x.png"; sourceTree = ""; }; + 432EBD0C15D1A2B00000729D /* fountain_pen_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen_on.png; sourceTree = ""; }; + 432EBD0D15D1A2B00000729D /* fountain_pen_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen_on@2x.png"; sourceTree = ""; }; + 432EBD1415D1A7800000729D /* user_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = user_on.png; sourceTree = ""; }; + 432EBD1515D1A7800000729D /* user_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_on@2x.png"; sourceTree = ""; }; 433323B6158901A40025064D /* fountain_pen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen.png; sourceTree = ""; }; 433323B7158901A40025064D /* fountain_pen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen@2x.png"; sourceTree = ""; }; 433323BA158901C10025064D /* login_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = login_background.png; sourceTree = ""; }; @@ -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; }; diff --git a/media/ios/Resources-iPad/Classes/LoginViewController~ipad.xib b/media/ios/Resources-iPad/Classes/LoginViewController~ipad.xib index 278381586..1c64c19a4 100644 --- a/media/ios/Resources-iPad/Classes/LoginViewController~ipad.xib +++ b/media/ios/Resources-iPad/Classes/LoginViewController~ipad.xib @@ -49,7 +49,7 @@ {768, 1004} - + _NS:541 NO IBIPadFramework @@ -328,6 +328,7 @@ {{194, 234}, {111, 32}} + _NS:9 NO IBIPadFramework @@ -580,7 +581,7 @@ {{384, 80}, {250, 50}} - + _NS:9 NO IBIPadFramework @@ -595,16 +596,18 @@ 16 0.0 SIGN UP - - 3 - MC42NjY2NjY2NjY3AA - + 3 MQA + + NSImage + fountain_pen_on.png + + NSImage fountain_pen.png @@ -618,10 +621,11 @@ {{134, 80}, {250, 50}} - + _NS:9 NO IBIPadFramework + YES 0 0 0.0 @@ -633,7 +637,7 @@ 16 0.0 LOGIN - + 3 @@ -641,6 +645,11 @@ + + NSImage + user_on.png + + NSImage user.png @@ -977,14 +986,14 @@ YES - - + + @@ -1258,6 +1267,14 @@ YES + + ActivityModule + UIView + + IBProjectSource + ./Classes/ActivityModule.h + + AddSiteViewController UIViewController @@ -1458,18 +1475,60 @@ - FeedDashboardViewController + DashboardViewController UIViewController + + YES + + YES + doLogout: + tapSegmentedButton: + + + YES + id + id + + + + YES + + YES + doLogout: + tapSegmentedButton: + + + YES + + doLogout: + id + + + tapSegmentedButton: + id + + + YES YES + activitiesModule appDelegate + feedbackWebView + interactionsModule + segmentedButton toolbar + topToolbar YES + ActivityModule NewsBlurAppDelegate + UIWebView + InteractionsModule + UISegmentedControl + UIToolbar UIToolbar @@ -1477,24 +1536,49 @@ YES YES + activitiesModule appDelegate + feedbackWebView + interactionsModule + segmentedButton toolbar + topToolbar YES + + activitiesModule + ActivityModule + appDelegate NewsBlurAppDelegate + + feedbackWebView + UIWebView + + + interactionsModule + InteractionsModule + + + segmentedButton + UISegmentedControl + toolbar UIToolbar + + topToolbar + UIToolbar + IBProjectSource - ./Classes/FeedDashboardViewController.h + ./Classes/DashboardViewController.h @@ -1614,30 +1698,17 @@ FeedsMenuViewController UIViewController - - tapCancelButton: - UIBarButtonItem - - - tapCancelButton: - - tapCancelButton: - UIBarButtonItem - - YES YES appDelegate menuTableView - toolbar YES NewsBlurAppDelegate UITableView - UIToolbar @@ -1646,7 +1717,6 @@ YES appDelegate menuTableView - toolbar YES @@ -1658,10 +1728,6 @@ menuTableView UITableView - - toolbar - UIToolbar - @@ -1670,7 +1736,54 @@ - FirstTimeUserViewController + FindSitesViewController + UIViewController + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + NewsBlurAppDelegate + UISearchBar + UITableView + + + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + sitesSearchBar + UISearchBar + + + sitesTable + UITableView + + + + + IBProjectSource + ./Classes/FindSitesViewController.h + + + + FirstTimeUserAddFriendsViewController UIViewController YES @@ -1729,6 +1842,7 @@ googleReaderButton logo nextButton + previousButton toolbar toolbarTitle welcomeView @@ -1742,6 +1856,7 @@ UIButton UIImageView UIBarButtonItem + UIBarButtonItem UIToolbar UIButton UIView @@ -1758,6 +1873,7 @@ googleReaderButton logo nextButton + previousButton toolbar toolbarTitle welcomeView @@ -1792,6 +1908,10 @@ nextButton UIBarButtonItem + + previousButton + UIBarButtonItem + toolbar UIToolbar @@ -1806,6 +1926,362 @@ + + IBProjectSource + ./Classes/FirstTimeUserAddFriendsViewController.h + + + + FirstTimeUserAddNewsBlurViewController + UIViewController + + YES + + YES + tapCategoryButton: + tapGoogleReaderButton + tapNewsBlurButton: + tapNextButton + + + YES + id + id + id + id + + + + YES + + YES + tapCategoryButton: + tapGoogleReaderButton + tapNewsBlurButton: + tapNextButton + + + YES + + tapCategoryButton: + id + + + tapGoogleReaderButton + id + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + + + YES + + YES + addFriendsView + addNewsBlurView + addSitesView + appDelegate + googleReaderButton + logo + nextButton + previousButton + toolbar + toolbarTitle + welcomeView + + + YES + UIView + UIView + UIView + NewsBlurAppDelegate + UIButton + UIImageView + UIBarButtonItem + UIBarButtonItem + UIToolbar + UIButton + UIView + + + + YES + + YES + addFriendsView + addNewsBlurView + addSitesView + appDelegate + googleReaderButton + logo + nextButton + previousButton + toolbar + toolbarTitle + welcomeView + + + YES + + addFriendsView + UIView + + + addNewsBlurView + UIView + + + addSitesView + UIView + + + appDelegate + NewsBlurAppDelegate + + + googleReaderButton + UIButton + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + previousButton + UIBarButtonItem + + + toolbar + UIToolbar + + + toolbarTitle + UIButton + + + welcomeView + UIView + + + + + IBProjectSource + ./Classes/FirstTimeUserAddNewsBlurViewController.h + + + + FirstTimeUserAddSitesViewController + UIViewController + + YES + + YES + tapCategoryButton: + tapGoogleReaderButton + tapNewsBlurButton: + tapNextButton + + + YES + id + id + id + id + + + + YES + + YES + tapCategoryButton: + tapGoogleReaderButton + tapNewsBlurButton: + tapNextButton + + + YES + + tapCategoryButton: + id + + + tapGoogleReaderButton + id + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + + + YES + + YES + addFriendsView + addNewsBlurView + addSitesView + appDelegate + googleReaderButton + logo + nextButton + previousButton + toolbar + toolbarTitle + welcomeView + + + YES + UIView + UIView + UIView + NewsBlurAppDelegate + UIButton + UIImageView + UIBarButtonItem + UIBarButtonItem + UIToolbar + UIButton + UIView + + + + YES + + YES + addFriendsView + addNewsBlurView + addSitesView + appDelegate + googleReaderButton + logo + nextButton + previousButton + toolbar + toolbarTitle + welcomeView + + + YES + + addFriendsView + UIView + + + addNewsBlurView + UIView + + + addSitesView + UIView + + + appDelegate + NewsBlurAppDelegate + + + googleReaderButton + UIButton + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + previousButton + UIBarButtonItem + + + toolbar + UIToolbar + + + toolbarTitle + UIButton + + + welcomeView + UIView + + + + + IBProjectSource + ./Classes/FirstTimeUserAddSitesViewController.h + + + + FirstTimeUserViewController + UIViewController + + tapNextButton + id + + + tapNextButton + + tapNextButton + id + + + + YES + + YES + appDelegate + logo + nextButton + + + YES + NewsBlurAppDelegate + UIImageView + UIBarButtonItem + + + + YES + + YES + appDelegate + logo + nextButton + + + YES + + appDelegate + NewsBlurAppDelegate + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + IBProjectSource ./Classes/FirstTimeUserViewController.h @@ -1851,7 +2327,7 @@ YES appDelegate - fontSizeSgement + fontSizeSegment fontStyleSegment largeFontSizeLabel smallFontSizeLabel @@ -1870,7 +2346,7 @@ YES appDelegate - fontSizeSgement + fontSizeSegment fontStyleSegment largeFontSizeLabel smallFontSizeLabel @@ -1882,7 +2358,7 @@ NewsBlurAppDelegate - fontSizeSgement + fontSizeSegment UISegmentedControl @@ -1904,6 +2380,53 @@ ./Classes/FontSettingsViewController.h + + FriendsListViewController + UIViewController + + YES + + YES + appDelegate + friendSearchBar + friendsTable + + + YES + NewsBlurAppDelegate + UISearchBar + UITableView + + + + YES + + YES + appDelegate + friendSearchBar + friendsTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + friendSearchBar + UISearchBar + + + friendsTable + UITableView + + + + + IBProjectSource + ./Classes/FriendsListViewController.h + + GoogleReaderViewController UIViewController @@ -1955,6 +2478,14 @@ ./Classes/GoogleReaderViewController.h + + InteractionsModule + UIView + + IBProjectSource + ./Classes/InteractionsModule.h + + LoginViewController UIViewController @@ -2302,6 +2833,25 @@ ./Classes/MoveSiteViewController.h + + NBContainerViewController + UIViewController + + appDelegate + NewsBlurAppDelegate + + + appDelegate + + appDelegate + NewsBlurAppDelegate + + + + IBProjectSource + ./Classes/NBContainerViewController.h + + NewsBlurAppDelegate BaseViewController @@ -2310,43 +2860,55 @@ YES addSiteViewController + dashboardViewController feedDashboardViewController feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController + firstTimeUserAddFriendsViewController + firstTimeUserAddNewsBlurViewController + firstTimeUserAddSitesViewController firstTimeUserViewController fontSettingsViewController + friendsListViewController + ftuxNavigationController googleReaderViewController loginViewController + masterContainerViewController moveSiteViewController navigationController originalStoryViewController shareViewController - splitStoryController - splitStoryDetailNavigationController - splitStoryDetailViewController storyDetailViewController + userProfileViewController window YES AddSiteViewController + DashboardViewController FeedDashboardViewController FeedDetailViewController FeedsMenuViewController NewsBlurViewController + FindSitesViewController + FirstTimeUserAddFriendsViewController + FirstTimeUserAddNewsBlurViewController + FirstTimeUserAddSitesViewController FirstTimeUserViewController FontSettingsViewController + FriendsListViewController + UINavigationController GoogleReaderViewController LoginViewController + NBContainerViewController MoveSiteViewController UINavigationController OriginalStoryViewController ShareViewController - UISplitViewController - UINavigationController - SplitStoryDetailViewController StoryDetailViewController + UserProfileViewController UIWindow @@ -2355,22 +2917,28 @@ YES addSiteViewController + dashboardViewController feedDashboardViewController feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController + firstTimeUserAddFriendsViewController + firstTimeUserAddNewsBlurViewController + firstTimeUserAddSitesViewController firstTimeUserViewController fontSettingsViewController + friendsListViewController + ftuxNavigationController googleReaderViewController loginViewController + masterContainerViewController moveSiteViewController navigationController originalStoryViewController shareViewController - splitStoryController - splitStoryDetailNavigationController - splitStoryDetailViewController storyDetailViewController + userProfileViewController window @@ -2379,6 +2947,10 @@ addSiteViewController AddSiteViewController + + dashboardViewController + DashboardViewController + feedDashboardViewController FeedDashboardViewController @@ -2395,6 +2967,22 @@ feedsViewController NewsBlurViewController + + findSitesViewController + FindSitesViewController + + + firstTimeUserAddFriendsViewController + FirstTimeUserAddFriendsViewController + + + firstTimeUserAddNewsBlurViewController + FirstTimeUserAddNewsBlurViewController + + + firstTimeUserAddSitesViewController + FirstTimeUserAddSitesViewController + firstTimeUserViewController FirstTimeUserViewController @@ -2403,6 +2991,14 @@ fontSettingsViewController FontSettingsViewController + + friendsListViewController + FriendsListViewController + + + ftuxNavigationController + UINavigationController + googleReaderViewController GoogleReaderViewController @@ -2411,6 +3007,10 @@ loginViewController LoginViewController + + masterContainerViewController + NBContainerViewController + moveSiteViewController MoveSiteViewController @@ -2427,22 +3027,14 @@ shareViewController ShareViewController - - splitStoryController - UISplitViewController - - - splitStoryDetailNavigationController - UINavigationController - - - splitStoryDetailViewController - SplitStoryDetailViewController - storyDetailViewController StoryDetailViewController + + userProfileViewController + UserProfileViewController + window UIWindow @@ -2461,15 +3053,15 @@ YES YES - doSwitchSitesUnread sectionTapped: sectionUntapped: + sectionUntappedOutside: selectIntelligence - showMenuButton + tapAddSite: YES - id + UIButton UIButton UIButton id @@ -2480,18 +3072,14 @@ YES YES - doSwitchSitesUnread sectionTapped: sectionUntapped: + sectionUntappedOutside: selectIntelligence - showMenuButton + tapAddSite: YES - - doSwitchSitesUnread - id - sectionTapped: UIButton @@ -2500,12 +3088,16 @@ sectionUntapped: UIButton + + sectionUntappedOutside: + UIButton + selectIntelligence id - showMenuButton + tapAddSite: id @@ -2519,9 +3111,8 @@ feedTitlesTable feedViewToolbar homeButton + innerView intelligenceControl - popoverController - sitesButton YES @@ -2530,9 +3121,8 @@ UITableView UIToolbar UIBarButtonItem + UIView UISegmentedControl - UIPopoverController - UIBarButtonItem @@ -2544,9 +3134,8 @@ feedTitlesTable feedViewToolbar homeButton + innerView intelligenceControl - popoverController - sitesButton YES @@ -2570,18 +3159,14 @@ homeButton UIBarButtonItem + + innerView + UIView + intelligenceControl UISegmentedControl - - popoverController - UIPopoverController - - - sitesButton - UIBarButtonItem - @@ -2780,8 +3365,6 @@ appDelegate commentField facebookButton - siteFavicon - siteInformation submitButton toolbarTitle twitterButton @@ -2791,8 +3374,6 @@ NewsBlurAppDelegate UITextView UIButton - UIImageView - UILabel UIBarButtonItem UIBarButtonItem UIButton @@ -2805,8 +3386,6 @@ appDelegate commentField facebookButton - siteFavicon - siteInformation submitButton toolbarTitle twitterButton @@ -2825,14 +3404,6 @@ facebookButton UIButton - - siteFavicon - UIImageView - - - siteInformation - UILabel - submitButton UIBarButtonItem @@ -2852,25 +3423,6 @@ ./Classes/ShareViewController.h - - SplitStoryDetailViewController - UIViewController - - appDelegate - NewsBlurAppDelegate - - - appDelegate - - appDelegate - NewsBlurAppDelegate - - - - IBProjectSource - ./Classes/SplitStoryDetailViewController.h - - StoryDetailViewController UIViewController @@ -2878,8 +3430,11 @@ YES YES + doNextStory doNextUnreadStory doPreviousStory + showOriginalSubview: + tapProgressBar: toggleFontSize: @@ -2887,18 +3442,28 @@ id id id + id + id + id YES YES + doNextStory doNextUnreadStory doPreviousStory + showOriginalSubview: + tapProgressBar: toggleFontSize: YES + + doNextStory + id + doNextUnreadStory id @@ -2907,6 +3472,14 @@ doPreviousStory id + + showOriginalSubview: + id + + + tapProgressBar: + id + toggleFontSize: id @@ -2919,12 +3492,19 @@ YES activity appDelegate + bottomPlaceholderToolbar buttonAction buttonNext + buttonNextStory buttonPrevious feedTitleGradient - popoverController + fontSettingsButton + innerView + noStorySelectedLabel + originalStoryButton progressView + progressViewContainer + subscribeButton toolbar webView @@ -2932,12 +3512,19 @@ YES UIBarButtonItem NewsBlurAppDelegate + UIToolbar + UIBarButtonItem UIBarButtonItem UIBarButtonItem UIBarButtonItem UIView - UIPopoverController + UIBarButtonItem + UIView + UILabel + UIBarButtonItem UIProgressView + UIView + UIBarButtonItem UIToolbar UIWebView @@ -2948,12 +3535,19 @@ YES activity appDelegate + bottomPlaceholderToolbar buttonAction buttonNext + buttonNextStory buttonPrevious feedTitleGradient - popoverController + fontSettingsButton + innerView + noStorySelectedLabel + originalStoryButton progressView + progressViewContainer + subscribeButton toolbar webView @@ -2967,6 +3561,10 @@ appDelegate NewsBlurAppDelegate + + bottomPlaceholderToolbar + UIToolbar + buttonAction UIBarButtonItem @@ -2975,6 +3573,10 @@ buttonNext UIBarButtonItem + + buttonNextStory + UIBarButtonItem + buttonPrevious UIBarButtonItem @@ -2984,13 +3586,33 @@ UIView - popoverController - UIPopoverController + fontSettingsButton + UIBarButtonItem + + + innerView + UIView + + + noStorySelectedLabel + UILabel + + + originalStoryButton + UIBarButtonItem progressView UIProgressView + + progressViewContainer + UIView + + + subscribeButton + UIBarButtonItem + toolbar UIToolbar @@ -3006,6 +3628,14 @@ ./Classes/StoryDetailViewController.h + + UserProfileViewController + UIViewController + + IBProjectSource + ./Classes/UserProfileViewController.h + + 0 @@ -3026,17 +3656,21 @@ YES Background.png fountain_pen.png + fountain_pen_on.png login_background.png orange_button.png user.png + user_on.png YES {320, 480} - {32, 32} + {50, 50} + {50, 50} {504, 304} {111, 32} - {32, 32} + {50, 50} + {50, 50} 1181 diff --git a/media/ios/Resources-iPad/Images/fountain_pen.png b/media/ios/Resources-iPad/Images/fountain_pen.png index c26d9bb7f..eaf7f6c53 100644 Binary files a/media/ios/Resources-iPad/Images/fountain_pen.png and b/media/ios/Resources-iPad/Images/fountain_pen.png differ diff --git a/media/ios/Resources-iPad/Images/fountain_pen@2x.png b/media/ios/Resources-iPad/Images/fountain_pen@2x.png index 0323ab973..518db8af4 100644 Binary files a/media/ios/Resources-iPad/Images/fountain_pen@2x.png and b/media/ios/Resources-iPad/Images/fountain_pen@2x.png differ diff --git a/media/ios/Resources-iPad/Images/fountain_pen_on.png b/media/ios/Resources-iPad/Images/fountain_pen_on.png new file mode 100644 index 000000000..22c0b43e6 Binary files /dev/null and b/media/ios/Resources-iPad/Images/fountain_pen_on.png differ diff --git a/media/ios/Resources-iPad/Images/fountain_pen_on@2x.png b/media/ios/Resources-iPad/Images/fountain_pen_on@2x.png new file mode 100644 index 000000000..45d072a78 Binary files /dev/null and b/media/ios/Resources-iPad/Images/fountain_pen_on@2x.png differ diff --git a/media/ios/Resources-iPad/Images/user.png b/media/ios/Resources-iPad/Images/user.png index 48664e3be..c68ca083b 100644 Binary files a/media/ios/Resources-iPad/Images/user.png and b/media/ios/Resources-iPad/Images/user.png differ diff --git a/media/ios/Resources-iPad/Images/user@2x.png b/media/ios/Resources-iPad/Images/user@2x.png index 9b2d453a7..b4a7b44b6 100644 Binary files a/media/ios/Resources-iPad/Images/user@2x.png and b/media/ios/Resources-iPad/Images/user@2x.png differ diff --git a/media/ios/Resources-iPad/Images/user_on.png b/media/ios/Resources-iPad/Images/user_on.png new file mode 100644 index 000000000..1de7ce99f Binary files /dev/null and b/media/ios/Resources-iPad/Images/user_on.png differ diff --git a/media/ios/Resources-iPad/Images/user_on@2x.png b/media/ios/Resources-iPad/Images/user_on@2x.png new file mode 100644 index 000000000..f91c6fb4e Binary files /dev/null and b/media/ios/Resources-iPad/Images/user_on@2x.png differ diff --git a/media/ios/reader.css b/media/ios/reader.css index 9ecae6463..aab245cf0 100644 --- a/media/ios/reader.css +++ b/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; - -moz-transition: all .12s ease-out; - -o-transition: all .12s ease-out; - -ms-transition: all .12s ease-out; + border-bottom: 1px solid #A6A6A6; 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; diff --git a/media/ios/sample_text.html b/media/ios/sample_text.html index 7681528ac..d437c5e65 100644 --- a/media/ios/sample_text.html +++ b/media/ios/sample_text.html @@ -1,8 +1,4 @@ -
6:43am
Glass Half Empty
Shared by:
-

Glass Half Empty

 -

What if a glass of water was, all of a sudden, literally half empty?

-

—Vittorio Iacovella

- - - -
ConstantineXVI
4 hours ago
"the physicist ducks"
\ No newline at end of file +
1:23pm
Ocean gliders are becoming one of the Navy’s main tools...
Shared by 2 people
Shared by:


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.
+

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.

+

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.

+

(via U.S. Naval Research Laboratory)

firefox_stranger
7 days ago
Reply
Favorite
This is really cool.
firefox_stranger
7 days ago
This is my reply
firefox_stranger
7 days ago
Reply 2
roy
1 hour ago
Reply
Edit
Should be firefox still
\ No newline at end of file diff --git a/media/ios/storyDetailView.css b/media/ios/storyDetailView.css index c4c1501cf..6929f4105 100644 --- a/media/ios/storyDetailView.css +++ b/media/ios/storyDetailView.css @@ -55,11 +55,18 @@ margin: 0 90px; } -/* -.NB-ipad-wide .NB-story img { - max-width: 540px !important; +.NB-ipad-wide#story_pane .NB-story-comments-shares-teaser { + padding-left: 90px; + 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 .NB-story img { - max-width: 400px !important; +.NB-ipad-narrow#story_pane .NB-story-comments-shares-teaser { + padding-left: 30px; + 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; }