From b01a8c08bf94e3534d7cd52d2a4525c8af853ddd Mon Sep 17 00:00:00 2001 From: Roy Yang Date: Tue, 7 Aug 2012 12:49:08 -0700 Subject: [PATCH] adding in highlight state to login --- media/ios/Classes/LoginViewController.m | 4 + media/ios/Classes/StoryDetailViewController.m | 4 +- media/ios/NewsBlur.xcodeproj/project.pbxproj | 16 + .../Classes/LoginViewController~ipad.xib | 872 +++++++++++++++--- .../Resources-iPad/Images/fountain_pen.png | Bin 2312 -> 2252 bytes .../Resources-iPad/Images/fountain_pen@2x.png | Bin 4154 -> 4276 bytes .../Resources-iPad/Images/fountain_pen_on.png | Bin 0 -> 2686 bytes .../Images/fountain_pen_on@2x.png | Bin 0 -> 5681 bytes media/ios/Resources-iPad/Images/user.png | Bin 2343 -> 2311 bytes media/ios/Resources-iPad/Images/user@2x.png | Bin 3936 -> 4013 bytes media/ios/Resources-iPad/Images/user_on.png | Bin 0 -> 2870 bytes .../ios/Resources-iPad/Images/user_on@2x.png | Bin 0 -> 5876 bytes media/ios/reader.css | 16 +- media/ios/sample_text.html | 12 +- media/ios/storyDetailView.css | 33 +- 15 files changed, 811 insertions(+), 146 deletions(-) create mode 100644 media/ios/Resources-iPad/Images/fountain_pen_on.png create mode 100644 media/ios/Resources-iPad/Images/fountain_pen_on@2x.png create mode 100644 media/ios/Resources-iPad/Images/user_on.png create mode 100644 media/ios/Resources-iPad/Images/user_on@2x.png 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 c26d9bb7fd07f12f3587832f5a497e52826101f4..eaf7f6c53c4a515b7fb04c20af15d89325b63d2f 100644 GIT binary patch delta 1617 zcmZ{lYdjMQ7{<3@v8GMzv?Ogr3bn05GPc>qh&pJh4UrUG7|GohvQ5clIk{F=vs0~b zR{XHzx?GP?l$@0^M`a0JP?Medoy)gAJn!@6|GXcchqv+%12lh+x0^o17yU~50)%1y^JyF9N01pR=9JIjFvrlyL$N0gpFBk) zdbh`m*9>1tV^MGo>+YM`ASYn)%@kTHg-?HbHWg6ySu(m z`rvm<^ZyvRWpQeLXwrWGLwTGpu_wtzWq)NU+>+7tIqL*gP4CT&Y{ymx$&)P|hbfsTuP7(8jUlMTp&mkQCcM z5egLSmFufFi$ghcOKm<87INpC(k?xCQGKawOW3UXVsrSwdRiMAF`e*ulEAY!N?T;f zn}4U2Q1M3Q z6_1n`CpC!k&)?~d9zi_Ex{K4#vIePH_dmyB<{LX{^u6eDXK_X9GT5%wXRNeFV(9_O zmz8MnWF8!rnaj7z56uYYxU0Ti)=u8p>lcQJZ& z3bV|sj3I92sK?tcR9trbjA4aK>l52-#efVX>dmm(%M12@*?4V6ULQ|ld^A-yblCBx zN~*d=qWv4SKRRR{;c}JftZU^_0OKBMh~CrJEMzQT!kw#TufM4-ej_J`OH{^x8pfrH zZQraQv_c{PZ0HS>UHNtvw2=bFkx~7IbrcE>+f?zX+*%4BY|wk{alJq_!G)PCV2C;f zcv!C>M_h%CemGu-fcifj-kxwOx9HKtZVSJQx7}(JH6Pl4`y#Oz?M`M|bILdNQ0?$B zGp*~&3lZ#F4s57;N+=zBHaMB+drM4Q6i9NqFWB0b3l1+K;J2>DW%u`f(&y_)?)sfb zM9j{3a-K_;GgNH{QC~nnxgq92{RjTQKwdcVD+KID#$o1NOBsVx5&O++08pfG3*5~q z9KXA{aQ0qFt#{kaH4hVAJz{hxkJ+Sf=lmMQVWy{Wj}D^0s6EZqF_ Xv1aD(k-0Q|TL}P-;!VCoI+*r1Y{t|< delta 1700 zcmX>j*de6Y8Q|y6%O%Cdz`(%k>ERLtq!mDzgAGU)S59(^6H^PI z-pRU5k_rZlYR_g#}tkl~TZddyDs^ZHC@GBB`Oc)B=- zRNUGU9-ATSDq@$O_D=2k0>=4FP7VSriV7lJT}mo0I$cQt0^LFJkGlC?KPbNFR?yJZ zonkko>uADC4Ytph5;7f`xEdc#KH3x^(Bh;Z;p16cUzUFC{hXV7?M)3mC+8Sdzd!eG z-upT4|HSRv`^Q}N$-y%z^&2?;i*!2mh-_SSSXO0+q0hOfP1hdmUMRpMYBxcDkJh5| zGA271p6-;_<@%p#t?zcED$rwwr2(5(!TY00|1}PXF%7ou))9h}p zSDhAlVQ%xYJsNVyulb+b8OYsQkk4~{`sY0>x~*GSgoAV5oEEb0PTd(LH?O09!=0;d zl$o|%%vi>dV#V{qyHe2O(190~^3z05>jnpk2&MQZ6&r3YbGdnfn>BoO@|?rd!<~61 zKVrH*S@3&p$5p3|42~}p18TQEyK^{avi23z&ZXy_mPGHU(_-5tm~&@06IY(j)?2L+ zKX?x4U(d>mxD)tfVK8^W9Je?3Tb`;jeXeIIo93!4uKDg_k@H#`@ehTJ=Z&J%Qy3T7 z-#oMGfaIL%Nj&jM#fMn-om4y8+x^{y zu5Ds)I8Q{NAY16I>W|qB|GBnAzhdlPxv!o(?40A5s{(%|Yvze9-4ZczNwU{TiSik& zqB|niKM?6Z_&lB`#Z+5xVhvxE>RqL?u7~AWx%MYy^VLTibNQv3^PDW2us}5>nr+LL zsMVqCF6MMj$!wU05T1 zMC(?*v}KqhE3sl_fc{D`?}9GwwzJX+t8_Cv+S8xL`7CFVtNPVuw8@tziV@((r9pJrSCRcy>nvn-Xk;nKKj@ky1-POBcytF0ikv1Q)3J(6$ts+B)u6x0#B#=eQ=PR{j<5%=Wl3NmCLysuYtTBgAoT>gyoyUhD;GCba~WgpL$!VN`r1qRhRtFMM=Y8XX5sS~{T zSEr@dp{Hce^FZF~K2JXjsgyX>udx1k?0o{8=G zzvYR=x9c-5+e9y&zAWj+t?SX}`eVX2N&FOWI9?+-&EbCGQp+GIjV6=+4Lzqr&C1qF zEfG3<^83N*s@sC!mYMlj)&}^UId0O->lLfj3oBlai+-8cM9``%BXI|mwa>W(WWa0`tj}MpS+_rJ>B1SGzTd9TvVJSQL+ik-?jFtNa0}lJNB(}@w|-gp&&~1= eivDOHV3^yywPN#k*{8sYhr!d;&t;ucLK6TnmD)A{ diff --git a/media/ios/Resources-iPad/Images/fountain_pen@2x.png b/media/ios/Resources-iPad/Images/fountain_pen@2x.png index 0323ab973510d29c4ab8eccb850367da8107d523..518db8af4d3a0619a1a981500de5f01e2c6d8c3e 100644 GIT binary patch delta 3657 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 Gll~39o2Lc< 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 0000000000000000000000000000000000000000..22c0b43e665850ab3767c8fd6dfbfefffd0ed618 GIT binary patch literal 2686 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 literal 0 HcmV?d00001 diff --git a/media/ios/Resources-iPad/Images/user.png b/media/ios/Resources-iPad/Images/user.png index 48664e3bef116adb3105a681f737d52a08d2ef75..c68ca083b68db240401002cc5aad7b3235851bf5 100644 GIT binary patch delta 1676 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 NIORpcHF(l8{sgM_5$pf} diff --git a/media/ios/Resources-iPad/Images/user@2x.png b/media/ios/Resources-iPad/Images/user@2x.png index 9b2d453a7320bc056a731eab45749040d862fd39..b4a7b44b6fd1fcb6db02fd74449c919d3c31a0c6 100644 GIT binary patch delta 3392 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 CL?n;^ delta 3337 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 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 0000000000000000000000000000000000000000..1de7ce99f84084bc9412e37ed2a7ae3251224ffd GIT binary patch literal 2870 zcmaJ@dpJ~iA0K1fFENr!(J?4i=IT0;+h9fwny_xQ#>|nym@zXl5{xeJvcH@?o6g{Q(KaBIYD&3y#Gpj#upHzlLVYzHuy zK|IO<4;*#%pdAgRS<(?UdjKmwUL?Q-c~pSU3=8Mt`PPU}x_Hrk;~0eiK0$b))`)+C z@+P|j4lE7`m?F`}G_)BSFvB1*I1_Vo^IZTIjX|T(SQG|pj4{XKuy`~Y_V`!3V=d)6Nl%_4?k590)|Jh(xgS;P+Sf zlFkkgHs9{d&9%mzhrzRy3<)|3g!Z3Qob}cqQcCbuX}u+hgzbU{I-t}bbihm)cwV-DZU*MMZEh;t>M#PXX^ozhC(6Ti2*uOvlE)!{N_y(Djb0N1 zlC!vVGVPS>wui+54-BUeFo7B!92>P-TF zv4p4sQm|#chF7)%uf}D9zoFqt6WWYGo!dO0&I#;GjF1w1u>B5%c2o{|E;Jk9OgBC1 z=pHMEQ*XML1f=bft!~*`iOBOZ=FyA=6SYv8#gNilwayDx=4sxt$L+BzQkw<~)u;H! z6qHU}uguK;&2*W~tt*+-BE=`-&Eg>@D)3jBDvQc1Bi;CEzSjp&m+AgJ5d+og?w|9NaBF6CP z&Acn`P3u=uT9R^R{!VCnd7A5$bKx(q<5CU#9Zttz`32elotJrsN1f{IG9_7;_R;xs zb3?a!mdqoofA)9}2@CFWK-4-bZmCp$QZA#0v*)mv<}3?V4~_oDFUs%Y8(nM?EOyR( ztXpa2`xoEL=*r8sQg#mO)Hb47-d=NO)=O9PcCmS@z1`hoAK3l_f&f05T^4f2=vKX% zSB16{v$|uOg^!Cu;p!dB(fjg}a#2r(S;yO8Rf+-LJq0`bJF*L|J}nwCR?0G!JHtZ++gLv-MNGXCbEig4CEl(UXGnsvAD{qe`h@s`?bfHw)f= zh%rC2@+Q9pm0Qc7xupm^39ZuHE`7Flgj_|Bh&jA2oLPIda^}ZlDzzCaZWk}y9Uyr^ z3YaF4^1Ej!8Z~xBP6M$=#4XCnG7~}p`Pci$xy$2nvqEJ5?Cs(HxF;}{pwxYNLcF@F zE^6{}-Aa|3n%Wku&VZ|n{=t?}3g2mxQU%3G*zc_VUcA*zxA=?@$7>dqKHPxzKNiF z21N+wi(voE*Go(44bLP`#Vst_{Px3)AF3?3*Bk~g5K_6KX z*3`Sq<}xq4gkB(~dal!O&^Je<%tEc=%4Ti7-m81L`sN5;CmWZmsvBI)EZb~3fAndn zQtO%%+2~g{N7Go%OM}B6oedurhHPEbXz2r^o_ej#YwnWUl6|fL3N9rC@5(bOs()26 zJ{;UlF3d77nbf4KSWTkD9z};q#amu)j5w(uw0*4&aK`AryEnUb>@{KHL{8&7sOP(zA8V!CErtdgc8?enj|zm+Dtkln2Cn&PgW<7;6O!~_qJ+oc>RV|*;TG4YM%(%qleN)5yO#)k5pWw5*_`jtFM8UR zR(LWsgN_){XHB+#MhDIs8EY%Oyf7B_KDw~gW+L}a6d^wEP)1j7O`jN~Y~ef7Gvb*3 z)*d@Ndx&mrC7*xu*ri0hL(B;%Ji|5lRabS*nwvljBDtDXxhRCdH~wTvj;@5;_5mmU E1B^Jo9{>OV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f91c6fb4e75cbb71e1737da97cd6389a6dc23b99 GIT binary patch literal 5876 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 LT*Q~-h>`yTj_6S< literal 0 HcmV?d00001 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
-

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; }
Shared by: