public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding in tweaks

Browse source
This commit is contained in:
Roy Yang 2012-08-13 18:45:06 -07:00
parent c24ef73483
commit 09d9b873dd
9 changed files with 1433 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1363
media/ios/Classes/FontSettingsViewController.xib
View file

File diff suppressed because it is too large Load diff

2
media/ios/Classes/NewsBlurAppDelegate.h
View file

@ -44,6 +44,7 @@
UINavigationController *ftuxNavigationController; UINavigationController *ftuxNavigationController;
UINavigationController *navigationController; UINavigationController *navigationController;
UINavigationController *modalNavigationController; UINavigationController *modalNavigationController;
UINavigationController *shareNavigationController;
UINavigationController *userProfileNavigationController; UINavigationController *userProfileNavigationController;
NBContainerViewController *masterContainerViewController; NBContainerViewController *masterContainerViewController;
@ -116,6 +117,7 @@
@property (nonatomic) IBOutlet UINavigationController *ftuxNavigationController; @property (nonatomic) IBOutlet UINavigationController *ftuxNavigationController;
@property (nonatomic) IBOutlet UINavigationController *navigationController; @property (nonatomic) IBOutlet UINavigationController *navigationController;
@property (nonatomic) UINavigationController *modalNavigationController; @property (nonatomic) UINavigationController *modalNavigationController;
@property (nonatomic) UINavigationController *shareNavigationController;
@property (nonatomic) UINavigationController *userProfileNavigationController; @property (nonatomic) UINavigationController *userProfileNavigationController;
@property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController; @property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController;
@property (nonatomic) IBOutlet DashboardViewController *dashboardViewController; @property (nonatomic) IBOutlet DashboardViewController *dashboardViewController;

8
media/ios/Classes/NewsBlurAppDelegate.m
View file

@ -37,6 +37,7 @@
@synthesize ftuxNavigationController; @synthesize ftuxNavigationController;
@synthesize navigationController; @synthesize navigationController;
@synthesize modalNavigationController; @synthesize modalNavigationController;
@synthesize shareNavigationController;
@synthesize userProfileNavigationController; @synthesize userProfileNavigationController;
@synthesize masterContainerViewController; @synthesize masterContainerViewController;
@synthesize dashboardViewController; @synthesize dashboardViewController;
@ -250,8 +251,11 @@
[self.masterContainerViewController transitionToShareView]; [self.masterContainerViewController transitionToShareView];
[self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId]; [self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId];
} else { } else {
UINavigationController *shareNav = [[UINavigationController alloc] initWithRootViewController:self.shareViewController]; if (self.shareNavigationController == nil) {
[self.navigationController presentModalViewController:shareNav animated:YES]; UINavigationController *shareNav = [[UINavigationController alloc] initWithRootViewController:self.shareViewController];
self.shareNavigationController = shareNav;
}
[self.navigationController presentModalViewController:self.shareNavigationController animated:YES];
[self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId]; [self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId];
} }
} }

22
media/ios/Classes/NewsBlurViewController.m
View file

@ -747,15 +747,15 @@
int headerLabelHeight, folderImageViewY, disclosureImageViewY; int headerLabelHeight, folderImageViewY, disclosureImageViewY;
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { // if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
headerLabelHeight = 28; headerLabelHeight = 27;
folderImageViewY = 3; folderImageViewY = 3;
disclosureImageViewY = 7; disclosureImageViewY = 7;
} else { // } else {
headerLabelHeight = 20; // headerLabelHeight = 20;
folderImageViewY = 0; // folderImageViewY = 0;
disclosureImageViewY = 4; // disclosureImageViewY = 4;
} // }
// create the parent view that will hold header Label // create the parent view that will hold header Label
UIControl* customView = [[UIControl alloc] UIControl* customView = [[UIControl alloc]
@ -879,11 +879,7 @@
return 0; return 0;
} }
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad){ return 28;
return 28;
}else{
return 21;
}
} }
- (void)didSelectSectionHeader:(UIButton *)button { - (void)didSelectSectionHeader:(UIButton *)button {
@ -923,6 +919,8 @@
} }
} }
} else { } else {
appDelegate.isSocialRiverView = NO;
appDelegate.isRiverView = YES;
NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:button.tag]; NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:button.tag];
[appDelegate setActiveFolder:folderName]; [appDelegate setActiveFolder:folderName];

28
media/ios/Classes/ShareViewController.m
View file

@ -33,8 +33,8 @@
return self; return self;
} }
- (void)viewDidLoad - (void)viewDidLoad {
{ self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate];
// For textField1 // For textField1
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
@ -48,7 +48,6 @@
UIBarButtonItem *submit = [[UIBarButtonItem alloc] initWithTitle:@"Post" style:UIBarButtonSystemItemDone target:self action:@selector(doShareThisStory:)]; UIBarButtonItem *submit = [[UIBarButtonItem alloc] initWithTitle:@"Post" style:UIBarButtonSystemItemDone target:self action:@selector(doShareThisStory:)];
self.submitButton = submit; self.submitButton = submit;
// self.submitButton.tintColor = UIColorFromRGB(0x217412);
self.navigationItem.rightBarButtonItem = submit; self.navigationItem.rightBarButtonItem = submit;
@ -65,7 +64,10 @@
twitterButton.selected = YES; twitterButton.selected = YES;
} }
self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
}
[super viewDidLoad]; [super viewDidLoad];
} }
@ -95,7 +97,6 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
[self.commentField becomeFirstResponder]; [self.commentField becomeFirstResponder];
[self adjustCommentField]; [self adjustCommentField];
} }
} }
@ -139,6 +140,7 @@
} }
- (void)setSiteInfo:(NSString *)type setUserId:(NSString *)userId setUsername:(NSString *)username setReplyId:(NSString *)replyId { - (void)setSiteInfo:(NSString *)type setUserId:(NSString *)userId setUsername:(NSString *)username setReplyId:(NSString *)replyId {
[self.submitButton setStyle:UIBarButtonItemStyleDone];
if ([type isEqualToString: @"edit-reply"]) { if ([type isEqualToString: @"edit-reply"]) {
[submitButton setTitle:@"Save"]; [submitButton setTitle:@"Save"];
facebookButton.hidden = YES; facebookButton.hidden = YES;
@ -189,11 +191,11 @@
facebookButton.hidden = NO; facebookButton.hidden = NO;
twitterButton.hidden = NO; twitterButton.hidden = NO;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
self.navigationItem.title = @"Post to Blurblog"; // self.navigationItem.title = @"Post to Blurblog";
[submitButton setTitle:@"Share"]; [submitButton setTitle:@"Share this story"];
} else { } else {
self.navigationItem.title = @"Post"; // self.navigationItem.title = @"Post";
[submitButton setTitle:@"Share"]; [submitButton setTitle:@"Share this story"];
} }
[submitButton setAction:(@selector(doShareThisStory:))]; [submitButton setAction:(@selector(doShareThisStory:))];
self.commentField.text = @""; self.commentField.text = @"";
@ -352,13 +354,13 @@
-(void)onTextChange:(NSNotification*)notification { -(void)onTextChange:(NSNotification*)notification {
NSString *text = self.commentField.text; NSString *text = self.commentField.text;
if ([self.submitButton.title isEqualToString:@"Share"] || if ([self.submitButton.title isEqualToString:@"Share this story"] ||
[self.submitButton.title isEqualToString:@"Share Comment"]) { [self.submitButton.title isEqualToString:@"Share with comment"]) {
NSLog(@"text.length is %i", text.length); NSLog(@"text.length is %i", text.length);
if (text.length) { if (text.length) {
self.submitButton.title = @"Share Comment"; self.submitButton.title = @"Share with comment";
} else { } else {
self.submitButton.title = @"Share"; self.submitButton.title = @"Share this story";
} }
} }

10
media/ios/Classes/Utilities.m
View file

@ -69,12 +69,12 @@ static NSMutableDictionary *imageCache;
if (image) { if (image) {
return image; return image;
} else { } else {
// if (isSocial) { if (isSocial) {
// return [UIImage imageNamed:@"user_light.png"]; // return [UIImage imageNamed:@"user_light.png"];
// } else { return nil;
// return [UIImage imageNamed:@"world.png"]; } else {
// } return [UIImage imageNamed:@"world.png"];
return nil; }
} }
} }

149
media/ios/Resources-iPhone/MainWindow.xib
View file

@ -243,7 +243,6 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIViewController" id="121528350"> <object class="IBUIViewController" id="121528350">
<object class="IBUINavigationItem" key="IBUINavigationItem" id="451803536"> <object class="IBUINavigationItem" key="IBUINavigationItem" id="451803536">
<reference key="IBUINavigationBar"/>
<string key="IBUITitle">Title</string> <string key="IBUITitle">Title</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object> </object>
@ -822,7 +821,7 @@
<reference key="dict.values" ref="0"/> <reference key="dict.values" ref="0"/>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">160</int> <int key="maxID">164</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1470,38 +1469,27 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string> <string>tapNewsBlurButton:</string>
<string>tapNextButton</string> <string>tapNextButton</string>
<string>tapPopularButton:</string>
</object> </object>
<object class="NSArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="actionInfosByName"> <object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string> <string>tapNewsBlurButton:</string>
<string>tapNextButton</string> <string>tapNextButton</string>
<string>tapPopularButton:</string>
</object> </object>
<object class="NSArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">tapCategoryButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapGoogleReaderButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">tapNewsBlurButton:</string> <string key="name">tapNewsBlurButton:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
@ -1510,101 +1498,49 @@
<string key="name">tapNextButton</string> <string key="name">tapNextButton</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">tapPopularButton:</string>
<string key="candidateClassName">id</string>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="outlets"> <object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string> <string>appDelegate</string>
<string>googleReaderButton</string> <string>instructionsLabel</string>
<string>logo</string>
<string>nextButton</string> <string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object> </object>
<object class="NSArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>UIView</string>
<string>UIView</string>
<string>UIView</string>
<string>NewsBlurAppDelegate</string> <string>NewsBlurAppDelegate</string>
<string>UIButton</string> <string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string> <string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
<string>UIView</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string> <string>appDelegate</string>
<string>googleReaderButton</string> <string>instructionsLabel</string>
<string>logo</string>
<string>nextButton</string> <string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object> </object>
<object class="NSArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addFriendsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addNewsBlurView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addSitesView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">appDelegate</string> <string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string> <string key="candidateClassName">NewsBlurAppDelegate</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">googleReaderButton</string> <string key="name">instructionsLabel</string>
<string key="candidateClassName">UIButton</string> <string key="candidateClassName">UIButton</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">nextButton</string> <string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string> <string key="candidateClassName">UIBarButtonItem</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">welcomeView</string>
<string key="candidateClassName">UIView</string>
</object>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -1661,6 +1597,7 @@
<string>activityIndicator</string> <string>activityIndicator</string>
<string>appDelegate</string> <string>appDelegate</string>
<string>googleReaderButton</string> <string>googleReaderButton</string>
<string>googleReaderButtonWrapper</string>
<string>instructionLabel</string> <string>instructionLabel</string>
<string>nextButton</string> <string>nextButton</string>
</object> </object>
@ -1669,6 +1606,7 @@
<string>UIActivityIndicatorView</string> <string>UIActivityIndicatorView</string>
<string>NewsBlurAppDelegate</string> <string>NewsBlurAppDelegate</string>
<string>UIButton</string> <string>UIButton</string>
<string>UIView</string>
<string>UILabel</string> <string>UILabel</string>
<string>UIBarButtonItem</string> <string>UIBarButtonItem</string>
</object> </object>
@ -1680,6 +1618,7 @@
<string>activityIndicator</string> <string>activityIndicator</string>
<string>appDelegate</string> <string>appDelegate</string>
<string>googleReaderButton</string> <string>googleReaderButton</string>
<string>googleReaderButtonWrapper</string>
<string>instructionLabel</string> <string>instructionLabel</string>
<string>nextButton</string> <string>nextButton</string>
</object> </object>
@ -1697,6 +1636,10 @@
<string key="name">googleReaderButton</string> <string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string> <string key="candidateClassName">UIButton</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderButtonWrapper</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">instructionLabel</string> <string key="name">instructionLabel</string>
<string key="candidateClassName">UILabel</string> <string key="candidateClassName">UILabel</string>
@ -1924,57 +1867,6 @@
<string key="minorKey">./Classes/FriendsListViewController.h</string> <string key="minorKey">./Classes/FriendsListViewController.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">GoogleReaderViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">tapCancelButton:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">tapCancelButton:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">tapCancelButton:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>webView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UIWebView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>webView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">webView</string>
<string key="candidateClassName">UIWebView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/GoogleReaderViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">InteractionsModule</string> <string key="className">InteractionsModule</string>
<string key="superclassName">UIView</string> <string key="superclassName">UIView</string>
@ -2370,7 +2262,6 @@
<string>fontSettingsViewController</string> <string>fontSettingsViewController</string>
<string>friendsListViewController</string> <string>friendsListViewController</string>
<string>ftuxNavigationController</string> <string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string> <string>loginViewController</string>
<string>masterContainerViewController</string> <string>masterContainerViewController</string>
<string>moveSiteViewController</string> <string>moveSiteViewController</string>
@ -2397,7 +2288,6 @@
<string>FontSettingsViewController</string> <string>FontSettingsViewController</string>
<string>FriendsListViewController</string> <string>FriendsListViewController</string>
<string>UINavigationController</string> <string>UINavigationController</string>
<string>GoogleReaderViewController</string>
<string>LoginViewController</string> <string>LoginViewController</string>
<string>NBContainerViewController</string> <string>NBContainerViewController</string>
<string>MoveSiteViewController</string> <string>MoveSiteViewController</string>
@ -2427,7 +2317,6 @@
<string>fontSettingsViewController</string> <string>fontSettingsViewController</string>
<string>friendsListViewController</string> <string>friendsListViewController</string>
<string>ftuxNavigationController</string> <string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string> <string>loginViewController</string>
<string>masterContainerViewController</string> <string>masterContainerViewController</string>
<string>moveSiteViewController</string> <string>moveSiteViewController</string>
@ -2496,10 +2385,6 @@
<string key="name">ftuxNavigationController</string> <string key="name">ftuxNavigationController</string>
<string key="candidateClassName">UINavigationController</string> <string key="candidateClassName">UINavigationController</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderViewController</string>
<string key="candidateClassName">GoogleReaderViewController</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">loginViewController</string> <string key="name">loginViewController</string>
<string key="candidateClassName">LoginViewController</string> <string key="candidateClassName">LoginViewController</string>

18
media/ios/reader.css
View file

@ -87,6 +87,7 @@
background-color: #EFEFEF; background-color: #EFEFEF;
border-radius: 8px; border-radius: 8px;
line-height: 17px; line-height: 17px;
padding: 0 8px;
} }
#story_pane .NB-story-comment .NB-story-comment-content { #story_pane .NB-story-comment .NB-story-comment-content {
@ -158,7 +159,7 @@
cursor: default; cursor: default;
} }
#story_pane .NB-story-comments-shares-teaser-wrapper { #story_pane .NB-story-comments-shares-teaser-wrapper {
border-top: 0; border-top: 1px solid #fff;
padding-top: 0; padding-top: 0;
} }
@ -172,11 +173,8 @@
font-size: 10px; font-size: 10px;
padding: 2px 12px; padding: 2px 12px;
overflow: hidden; overflow: hidden;
-webkit-transition: all .12s ease-out;
-moz-transition: all .12s ease-out;
-o-transition: all .12s ease-out;
-ms-transition: all .12s ease-out;
} }
#story_pane .NB-story-comments-public-header { #story_pane .NB-story-comments-public-header {
background-color: whiteSmoke; background-color: whiteSmoke;
color: #404040; color: #404040;
@ -194,7 +192,13 @@
overflow: hidden; overflow: hidden;
min-height: 26px; min-height: 26px;
border-bottom: 1px solid #A6A6A6; border-bottom: 1px solid #A6A6A6;
background-image: whiteSmoke; background-image: url('data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAZCAYAAACM9limAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAYOSURBVFiFtVmxkuUoDGy/WkggwYGdbPL+/7M2sqvGBA+CharxBXvNNpq3t9GRjGeMhdSSWhKzvF6vJwB479Fag/cepRT03uGcG3/vvSOlNPbYn6UUcMUYx3NrDa01xBjHnpQSaq3IOeP79++otaK1BgDovSOEMGSHENB7H7Iov5QynZtSQu/9yxneezjnkHOG937Ipax1XXHfN5ZlwXVdQ+/l8/PzmXNGjHFs1lVrRQgBCp7u895Pz1RYgeF367qitYac85BZa0VK6Yvy9nvvPa7rGs/8nefym5wzUkoAAOfc0H9ZlqE7waIjuHLO4+/Lx8fHUw9Tw0opk6c1EhhVKaXpGx5MT5dShjedc0MRylZZjBSVYxVOKYGOJOAEofc+GW/BDSHgPM+RCQRII5LfPfgBFWyt4TiOEf42MujxGOPwjCpIhZdlGYfzYAVFvea9H2nKMwhSKQUhhCG31joBQKflnP8azUoPfFdrHTqFEFBKQSnlFzA8SIVQcefcUJpeDiFMStkULKXgvm/c9z28SeUZQQSK7/RbRttxHJMzCJhz7suZBC6lhBjjRA0amQqYghFjRM4Zvfdfjv34+HgqmYUQRp7Sw8dxDK9xn0ZUa23kMo2yRA5gAHIcxyBHTR+bnmqQRjZJlUCRm9SpBMXSgHMOy7JM70IIUwEA/uWYlNIgJwVBlSIA5AKNFE05gvouz2ut2LYN53kipfSFzLXK6bLcxH1aeTQN6X1NVTqJzmVEqQ0q4xFjnMhn3/cvnMHF9FLuUHJurU3KlFImBelt5xyO48B938NQCyIBIaCUSUBpvJZsphCAsU+XRjxlxxixriuccyN6Y4x4UChLIT1mQ0u9SkOdc5MXGGkEiIZolFHZfd+Ht7UHstGo5f66LvTekXMGMHMU5TAKCBq5R50LYMjIOeO6rsEvPHf5/Px88hDgd6gy7Lm51op936fwYz+iEaaeYY/CSOGzGmK/tc2gpnRKCed5TiBrqpPflOy1D7PyNBt4Nu1eXq/X03pNBagQ60XbAWve285Yv1NFFEjNezWWwCoYWhw0mq2+2liqTrqs/d57fHtHPgqIHshnNZQg8HAlQ61yFgAarQZratIQBUmrIVOFrYPqq2BpZ8s9lntyzti2bewvpeCbLW8aylqOqbQqqWi/I1FWEy211mMElmfp99rvqFE0pPeOWut/pnkIYZqB3qW5BXBd13lW+j9bbPWiVYpGc6lsO7hauZZnaDydeZ4ntm2biN7SxLu0fChSinatFcdxjLKsTM+99IpGFtOGSmuY0yA2cNrO62KK7fs+6caGTp1ou+/WGu77Hj0XZyvqbQlX2xXd99AOlQaQ1fd9RykF27YhpTSmYBXGHKeXlQBZwoE5HQgEAaJMVdR7P0YKTTOVw3fKWTxLxwgF/0+/l1KmdFx+/vz51BC3QxY/ZppQ4Ls92hkrb7wb8bnYAFquo0xygk7VtijYVHs3uvzthsBW2ocizbzXDpaol1JwnufYp2FMJThx23DnRMy9yic6pPJsViqeH2NErXVUI8qm/HVdJ7At56gTtVCoA+wNw/J6vZ4xRvz48WPcpqlAvVTi3xR9CrX8w3dsmPie70iMTCNGIquNnmEjTtPfnqmAa3Tb9xp1GqUjYkIIOI4D+75PxvFjzhzaqtuKol4lD3AW0UFPjWMIKz8QYJ3I+awOox46amjvo98rd9kIp07Ug3bGGPHQ0knhNjdZ9zWK1FP8SW7Re1oazf06UL7rQLlv27a3s456lVeX6nXb/isVMPos153nOfVArTV84yxBr/MFAbDRQcWIPDCTqr0g4oFMKQuKdrpaUpVo1QkEnd5l2tmxRCufLr0D0p6Nv1P2Y9/3cQ2pJKTdrnrZ/jeAZZyAMYUYaTSY0zRlvBtF3s1XTFG+ZwFQQmeksXSTqGm02mAjQyOMupVS8Liua2zQNNEwVjK0DM/FWYl3NBpZrbXphl+vHqmkyuVPlnJGmjaHOiPZCFQqIHh29NAIekfOC/+vxPVu0owxToZZhP90p0pv2KtSGmKjQ5/tXKajiVYk5TMWC+VDu1SOrUb6/A/IUX/pFmu08AAAAABJRU5ErkJggg=='), -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.10, #EBEBEC),
color-stop(0.84, #F5F5F5)
);
} }
@ -234,7 +238,7 @@
vertical-align: middle; vertical-align: middle;
height: 22px; height: 22px;
width: 22px; width: 22px;
margin: 0 4px 4px 0; margin: 0 4px 6px 0;
cursor: pointer; cursor: pointer;
} }

22
media/ios/storyDetailView.css
View file

@ -2,29 +2,27 @@
* Font Size Style * Font Size Style
*/ */
.NB-story {
line-height: 1.5em;
}
.NB-extra-small .NB-story { .NB-extra-small .NB-story {
line-height: 1.6em; font-size: 11px;
font-size: 12px;
} }
.NB-small .NB-story { .NB-small .NB-story {
line-height: 1.6em; font-size: 12px;
font-size: 14px;
} }
.NB-medium .NB-story{ .NB-medium .NB-story{
line-height: 1.6em; font-size: 14px;
font-size: 16px;
} }
.NB-large .NB-story { .NB-large .NB-story {
line-height: 1.6em; font-size: 16px;
font-size: 18px;
} }
.NB-extra-large .NB-story { .NB-extra-large .NB-story {
line-height: 1.6em; font-size: 18px;
font-size: 22px;
} }
.NB-san-serif { .NB-san-serif {
@ -385,6 +383,10 @@ del {
/* Sharing */ /* Sharing */
.NB-share-wrapper {
margin-top: 36px;
}
a.NB-show-profile { a.NB-show-profile {
display: inline-block; display: inline-block;
} }