adding in rotation support

2025-11-01 09:09:51 +00:00 · 2012-06-28 11:12:38 -07:00 · 2012-06-28 11:12:38 -07:00 · 5937a5b3f8
commit 5937a5b3f8
parent c2d3d04c59
13 changed files with 412 additions and 187 deletions
--- a/media/iphone/Classes/NewsBlurAppDelegate.h
+++ b/media/iphone/Classes/NewsBlurAppDelegate.h
@ -14,6 +14,7 @@
 #define FEED_TITLE_GRADIENT_TAG 100003
 #define FEED_DASHBOARD_VIEW_TAG 100004
 #define SHARE_MODAL_HEIGHT 140
+#define DASHBOARD_TITLE @"NewsBlur Dashboard"

@class NewsBlurViewController;
@class FeedDetailViewController;
--- a/media/iphone/Classes/NewsBlurAppDelegate.m
+++ b/media/iphone/Classes/NewsBlurAppDelegate.m
@ -91,7 +91,7 @@
        
        splitStoryDetailNavigationController.viewControllers = [NSArray arrayWithObject:splitStoryDetailViewController];
        splitStoryDetailNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
-        splitStoryDetailViewController.navigationItem.title = @"Dashboard";
+        splitStoryDetailViewController.navigationItem.title = DASHBOARD_TITLE;
        
        splitStoryController.viewControllers = [NSArray arrayWithObjects:navigationController, splitStoryDetailNavigationController, nil];
        
@ -116,9 +116,6 @@
    [window makeKeyAndVisible];
    [feedsViewController fetchFeedList:YES];
    
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad){
-        [splitStoryController toggleMasterView:nil];
-    }
    //[self showFirstTimeUser];
 	return YES;
 }
@ -284,7 +281,7 @@
 }

 - (void)showDashboard {
-    splitStoryDetailViewController.navigationItem.title = @"Dashboard";
+    splitStoryDetailViewController.navigationItem.title = DASHBOARD_TITLE;
    splitStoryDetailViewController.navigationItem.rightBarButtonItems = nil;
    [self hideStoryDetailView];
 }
@ -387,7 +384,7 @@
    if (!self.inStoryDetail) {
        return;
    }
-    
+        
    if (UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {        
        storyDetailViewController.view.frame = CGRectMake(0, 
                                                          0, 
@ -399,6 +396,11 @@
                                                          splitStoryDetailViewController.view.frame.size.width, 
                                                          splitStoryDetailViewController.view.frame.size.height);
    }
+    
+    int contentWidth = splitStoryDetailViewController.view.frame.size.width;
+    // set the styles inside the UIWebView
+    
+    [storyDetailViewController changeWebViewWidth:contentWidth];
 }

 - (void)animateHidingMasterView {
--- a/media/iphone/Classes/NewsBlurViewController.h
+++ b/media/iphone/Classes/NewsBlurViewController.h
@ -44,7 +44,7 @@
 - (void)finishLoadingFeedList:(ASIHTTPRequest *)request;

 - (void)dismissFeedsMenu;
- (IBAction)showMenuButton;
+- (IBAction)showMenuButton:(id)sender;
 - (void)didSelectSectionHeader:(UIButton *)button;
 - (IBAction)selectIntelligence;
 - (void)updateFeedsWithIntelligence:(int)previousLevel newLevel:(int)newLevel;
--- a/media/iphone/Classes/NewsBlurViewController.m
+++ b/media/iphone/Classes/NewsBlurViewController.m
@ -55,19 +55,12 @@
    
    if ([userPreferences integerForKey:@"showAllFeeds"] == 0) {
        self.viewShowingAllFeeds = NO;
-        [self.sitesButton setImage:[UIImage imageNamed:@"16-list.png"]];
+        [self.sitesButton setImage:[UIImage imageNamed:@"16-List.png"]];
    } else {
        self.viewShowingAllFeeds = YES;
        [self.sitesButton setImage:[UIImage imageNamed:@"ellipses.png"]];
    }
    
-    self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] 
-                                               initWithBarButtonSystemItem:UIBarButtonSystemItemAdd
-                                               target:self 
-                                               action:@selector(showMenuButton)] 
-                                             autorelease];
-     
-     [self.navigationItem.rightBarButtonItem setImage:[UIImage imageNamed:@"add_button.png"]];
    [appDelegate showNavigationBar:NO];
    pull = [[PullToRefreshView alloc] initWithScrollView:self.feedTitlesTable];
    [pull setDelegate:self];
@ -318,11 +311,10 @@
    [self.feedTitlesTable reloadData];

    
-    NSLog(@"appDelegate.dictFolders: %@", appDelegate.dictFolders);
-    NSLog(@"appDelegate.dictFoldersArray: %@", appDelegate.dictFoldersArray);
+//    NSLog(@"appDelegate.dictFolders: %@", appDelegate.dictFolders);
+//    NSLog(@"appDelegate.dictFoldersArray: %@", appDelegate.dictFoldersArray);
    
    // test for latest version of app
-    
    NSString *serveriPhoneVersion = [results objectForKey:@"iphone_version"];  
    NSString *currentiPhoneVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
    
@ -349,7 +341,7 @@
    [results release];
 }

- (IBAction)showMenuButton {
+- (IBAction)showMenuButton:(id)sender {
    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
        if (popoverController == nil) {
            popoverController = [[UIPopoverController alloc]
@ -359,8 +351,7 @@
        }
        
        [popoverController setPopoverContentSize:CGSizeMake(200, 130)];
-        [popoverController presentPopoverFromBarButtonItem:self.navigationItem.rightBarButtonItem
-                                  permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];  
+        [popoverController presentPopoverFromBarButtonItem:sender                                  permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];  
    } else {
        [appDelegate showFeedsMenu]; 
    }
@ -386,7 +377,7 @@
        [self.sitesButton setImage:[UIImage imageNamed:@"ellipses.png"]];
        [userPreferences setInteger:1 forKey:@"showAllFeeds"];
    } else {
-        [self.sitesButton setImage:[UIImage imageNamed:@"16-list.png"]];
+        [self.sitesButton setImage:[UIImage imageNamed:@"16-List.png"]];
        [userPreferences setInteger:0 forKey:@"showAllFeeds"];
    }
        
--- a/media/iphone/Classes/StoryDetailViewController.m
+++ b/media/iphone/Classes/StoryDetailViewController.m
@ -166,8 +166,8 @@

 - (NSString *)getComments {
    NSString *comments = @"";
-    NSLog(@"the comment string is %@", [appDelegate.activeStory objectForKey:@"share_count"]);
-    NSLog(@"appDelegate.activeStory is %@", appDelegate.activeStory);
+//    NSLog(@"the comment string is %@", [appDelegate.activeStory objectForKey:@"share_count"]);
+//    NSLog(@"appDelegate.activeStory is %@", appDelegate.activeStory);
    if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null] && [[appDelegate.activeStory objectForKey:@"share_count"] intValue] > 0) {
        NSArray *comments_array = [appDelegate.activeStory objectForKey:@"comments"];            
        comments = [comments stringByAppendingString:[NSString stringWithFormat:@
@ -281,6 +281,16 @@
    }
    
    int contentWidth = self.view.frame.size.width;
+    NSString *contentWidthClass;
+    
+    if (contentWidth > 700) {
+        contentWidthClass = @"NB-ipad-wide";
+    } else if (contentWidth > 420) {
+        contentWidthClass = @"NB-ipad-narrow";
+    } else {
+        contentWidthClass = @"NB-iphone";
+    }
+    
    
    // set up layout values based on iPad/iPhone    
    headerString = [NSString stringWithFormat:@
@ -331,21 +341,24 @@
                             story_author,
                             story_tags];
    NSString *htmlString = [NSString stringWithFormat:@
-                            "<html><head>%@</head>"
-                            "<body id=\"story_pane\">"
-                            "<div class=\"%@\" id=\"NB-font-size\">"
-                            "<div class=\"%@\" id=\"NB-font-style\">"
-                            "%@"
-                            "<div class=\"NB-story\">%@ </div>"
-                            "<div id=\"NB-comments-wrapper\">%@</div>" // comments
-                            "%@" // share
-                            "</div>" // font-style
-                            "</div>" // font-size
-                            "</body></html>",
+                            "<html>"
+                            "<head>%@</head>" // header string
+                            "<body id=\"story_pane\" class=\"%@\">"
+                            "   <div class=\"%@\" id=\"NB-font-style\">"
+                            "   %@" // storyHeader
+                            "   <div class=\"%@\" id=\"NB-font-size\">"
+                            "       <div class=\"NB-story\">%@ </div>"
+                            "   </div>" // font-size
+                            "   <div id=\"NB-comments-wrapper\">%@</div>" // comments
+                            "       %@" // share
+                            "   </div>" // font-style
+                            "</body>"
+                            "</html>",
                            headerString,
-                            fontSizeClass,
+                            contentWidthClass,
                            fontStyleClass,
                            storyHeader, 
+                            fontSizeClass,
                            [appDelegate.activeStory objectForKey:@"story_content"],
                            commentsString,
                            sharingHtmlString
@ -600,9 +613,24 @@ shouldStartLoadWithRequest:(NSURLRequest *)request

 - (void)changeWebViewWidth:(int)width {
    
-    NSString *jsString = [[NSString alloc] initWithFormat:@"document.querySelector('meta[name=viewport]').setAttribute('content', 'width=%d;', false); ", 
+    int contentWidth = self.view.frame.size.width;
+    NSString *contentWidthClass;
+    
+    if (contentWidth > 700) {
+        contentWidthClass = @"NB-ipad-wide";
+    } else if (contentWidth > 420) {
+        contentWidthClass = @"NB-ipad-narrow";
+    } else {
+        contentWidthClass = @"NB-iphone";
+    }
+    
+    NSString *jsString = [[NSString alloc] initWithFormat:@
+                          "document.getElementsByTagName('body')[0].setAttribute('class', '%@');"
+                          "document.querySelector('meta[name=viewport]').setAttribute('content', 'width=%d;', false); ", 
+                          contentWidthClass,
                          width];
    [self.webView stringByEvaluatingJavaScriptFromString:jsString];
+    [contentWidthClass release];
    [jsString release];

 }
--- a/media/iphone/MGSplitViewController.h
+++ b/media/iphone/MGSplitViewController.h
@ -14,11 +14,9 @@ typedef enum _MGSplitViewDividerStyle {
 	MGSplitViewDividerStylePaneSplitter	= 1  // Thick divider, drawn with a grey gradient and a grab-strip.
 } MGSplitViewDividerStyle;

-@class NewsBlurAppDelegate;
@class MGSplitDividerView;
@protocol MGSplitViewControllerDelegate;
@interface MGSplitViewController : UIViewController <UIPopoverControllerDelegate> {
-    NewsBlurAppDelegate *appDelegate;
 	BOOL _showsMasterInPortrait;
 	BOOL _showsMasterInLandscape;
 	float _splitWidth;
@ -35,7 +33,6 @@ typedef enum _MGSplitViewDividerStyle {
 	MGSplitViewDividerStyle _dividerStyle; // Meta-setting which configures several aspects of appearance and behaviour.
 }

-@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate;
@property (nonatomic, assign) IBOutlet id <MGSplitViewControllerDelegate> delegate;
@property (nonatomic, assign) BOOL showsMasterInPortrait; // applies to both portrait orientations (default NO)
@property (nonatomic, assign) BOOL showsMasterInLandscape; // applies to both landscape orientations (default YES)
--- a/media/iphone/MGSplitViewController.m
+++ b/media/iphone/MGSplitViewController.m
@ -123,7 +123,7 @@
 	// Configure default behaviour.
 	_viewControllers = [[NSMutableArray alloc] initWithObjects:[NSNull null], [NSNull null], nil];
 	_splitWidth = MG_DEFAULT_SPLIT_WIDTH;
-	_showsMasterInPortrait = NO;
+	_showsMasterInPortrait = YES;
 	_showsMasterInLandscape = YES;
 	_reconfigurePopup = NO;
 	_vertical = YES;
--- a/media/iphone/NewsBlur.xcodeproj/FeedTableCell.m
+++ b/media/iphone/NewsBlur.xcodeproj/FeedTableCell.m
@ -187,7 +187,7 @@ static CGFloat *psColors = nil;

    if (isSocial) {
        self.feedFavicon = [self roundCorneredImage:self.feedFavicon radius:6];
-        [self.feedFavicon drawInRect:CGRectMake(4.0, 4.0, 32.0, 32.0)];
+        [self.feedFavicon drawInRect:CGRectMake(5.0, 3.0, 32.0, 32.0)];
        [feedTitle 
         drawInRect:CGRectMake(36 + 6.0, 11.0, rect.size.width - psWidth - psPadding - ntWidth - ntPadding - ngWidth - 10 - 6, 20.0) 
         withFont:font
--- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj
+++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
@ -100,7 +100,6 @@
 		437AA8CB159394E2005463F5 /* ShareViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8C9159394E2005463F5 /* ShareViewController.xib */; };
 		4389E9E9159B931900BEA604 /* Screen Shot 2012-06-27 at 12.14.10 PM.png in Resources */ = {isa = PBXBuildFile; fileRef = 4389E9E8159B931900BEA604 /* Screen Shot 2012-06-27 at 12.14.10 PM.png */; };
 		438F525D159B65E200211B65 /* 16-List.png in Resources */ = {isa = PBXBuildFile; fileRef = 438F525B159B65E200211B65 /* 16-List.png */; };
-		438F525E159B65E200211B65 /* 16-List@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 438F525C159B65E200211B65 /* 16-List@2x.png */; };
 		438F5262159B6F8C00211B65 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 438F5261159B6F0400211B65 /* MBProgressHUD.m */; };
 		439DAB201590DA350019B0EB /* FeedsMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 439DAB1E1590DA350019B0EB /* FeedsMenuViewController.m */; };
 		439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 439DAB1F1590DA350019B0EB /* FeedsMenuViewController.xib */; };
@ -129,6 +128,7 @@
 		43CF31B51593BC1500296407 /* 208-facebook-green.png in Resources */ = {isa = PBXBuildFile; fileRef = 43CF31B31593BC1500296407 /* 208-facebook-green.png */; };
 		43CF31B61593BC1500296407 /* 208-facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 43CF31B41593BC1500296407 /* 208-facebook.png */; };
 		43E8856015951F930032022E /* reader.css in Resources */ = {isa = PBXBuildFile; fileRef = 43E8855F15951F930032022E /* reader.css */; };
+		43F44B05159C175C00F48F8A /* 16-List@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43F44B04159C175C00F48F8A /* 16-List@2x.png */; };
 		78095E34128EF30C00230C8E /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 78095E25128EF30C00230C8E /* ASIAuthenticationDialog.m */; };
 		78095E35128EF30D00230C8E /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 78095E28128EF30C00230C8E /* ASIDownloadCache.m */; };
 		78095E36128EF30D00230C8E /* ASIFormDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 78095E2A128EF30C00230C8E /* ASIFormDataRequest.m */; };
@ -331,7 +331,6 @@
 		437AA8C9159394E2005463F5 /* ShareViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ShareViewController.xib; path = Classes/ShareViewController.xib; sourceTree = "<group>"; };
 		4389E9E8159B931900BEA604 /* Screen Shot 2012-06-27 at 12.14.10 PM.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Screen Shot 2012-06-27 at 12.14.10 PM.png"; sourceTree = "<group>"; };
 		438F525B159B65E200211B65 /* 16-List.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-List.png"; sourceTree = "<group>"; };
-		438F525C159B65E200211B65 /* 16-List@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-List@2x.png"; sourceTree = "<group>"; };
 		438F5260159B6F0400211B65 /* MBProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
 		438F5261159B6F0400211B65 /* MBProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
 		439DAB1D1590DA350019B0EB /* FeedsMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedsMenuViewController.h; sourceTree = "<group>"; };
@ -374,6 +373,7 @@
 		43D045271565BC150085F811 /* AddSiteAutocompleteCell~ipad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "AddSiteAutocompleteCell~ipad.xib"; path = "Resources-iPad/Classes/AddSiteAutocompleteCell~ipad.xib"; sourceTree = "<group>"; };
 		43D045281565BC150085F811 /* MoveSiteViewController~ipad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MoveSiteViewController~ipad.xib"; path = "Resources-iPad/Classes/MoveSiteViewController~ipad.xib"; sourceTree = "<group>"; };
 		43E8855F15951F930032022E /* reader.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = reader.css; sourceTree = "<group>"; };
+		43F44B04159C175C00F48F8A /* 16-List@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-List@2x.png"; sourceTree = "<group>"; };
 		78095E24128EF30C00230C8E /* ASIAuthenticationDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIAuthenticationDialog.h; sourceTree = "<group>"; };
 		78095E25128EF30C00230C8E /* ASIAuthenticationDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIAuthenticationDialog.m; sourceTree = "<group>"; };
 		78095E26128EF30C00230C8E /* ASICacheDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASICacheDelegate.h; sourceTree = "<group>"; };
@ -742,7 +742,7 @@
 			children = (
 				4389E9E8159B931900BEA604 /* Screen Shot 2012-06-27 at 12.14.10 PM.png */,
 				438F525B159B65E200211B65 /* 16-List.png */,
-				438F525C159B65E200211B65 /* 16-List@2x.png */,
+				43F44B04159C175C00F48F8A /* 16-List@2x.png */,
 				43CF31B31593BC1500296407 /* 208-facebook-green.png */,
 				43CF31B41593BC1500296407 /* 208-facebook.png */,
 				43CF31B11593BA4800296407 /* 32-Twitter-Green.png */,
@ -1437,8 +1437,8 @@
 				43CF31B61593BC1500296407 /* 208-facebook.png in Resources */,
 				43E8856015951F930032022E /* reader.css in Resources */,
 				438F525D159B65E200211B65 /* 16-List.png in Resources */,
-				438F525E159B65E200211B65 /* 16-List@2x.png in Resources */,
 				4389E9E9159B931900BEA604 /* Screen Shot 2012-06-27 at 12.14.10 PM.png in Resources */,
+				43F44B05159C175C00F48F8A /* 16-List@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/media/iphone/Resources-iPad/MainWindow~ipad.xib
+++ b/media/iphone/Resources-iPad/MainWindow~ipad.xib
@ -191,7 +191,6 @@
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -360,14 +359,6 @@
 					</object>
 					<int key="connectionID">153</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">splitStoryDetailViewController</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="1023379780"/>
-					</object>
-					<int key="connectionID">154</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">googleReaderViewController</string>
@ -432,6 +423,14 @@
 					</object>
 					<int key="connectionID">186</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">splitStoryDetailViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="1023379780"/>
+					</object>
+					<int key="connectionID">154</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@ -544,13 +543,21 @@
 					</object>
 					<int key="connectionID">170</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">masterViewController</string>
+						<reference key="source" ref="402833749"/>
+						<reference key="destination" ref="396985587"/>
+					</object>
+					<int key="connectionID">189</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="402833749"/>
-						<reference key="destination" ref="862039655"/>
+						<reference key="destination" ref="1023379780"/>
 					</object>
-					<int key="connectionID">187</int>
+					<int key="connectionID">191</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
@ -558,15 +565,7 @@
 						<reference key="source" ref="402833749"/>
 						<reference key="destination" ref="862039655"/>
 					</object>
-					<int key="connectionID">188</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">masterViewController</string>
-						<reference key="source" ref="402833749"/>
-						<reference key="destination" ref="396985587"/>
-					</object>
-					<int key="connectionID">189</int>
+					<int key="connectionID">193</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@ -871,7 +870,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">189</int>
+			<int key="maxID">193</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2177,7 +2176,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton</string>
+							<string>showMenuButton:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@ -2198,7 +2197,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton</string>
+							<string>showMenuButton:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@ -2223,7 +2222,7 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">showMenuButton</string>
+								<string key="name">showMenuButton:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 						</object>
@ -2560,14 +2559,35 @@
 					<string key="className">SplitStoryDetailViewController</string>
 					<string key="superclassName">UIViewController</string>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">appDelegate</string>
-						<string key="NS.object.0">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>splitController</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>MGSplitViewController</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">appDelegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">appDelegate</string>
-							<string key="candidateClassName">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>splitController</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">splitController</string>
+								<string key="candidateClassName">MGSplitViewController</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
--- a/media/iphone/Resources-iPad/NewsBlurViewController~ipad.xib
+++ b/media/iphone/Resources-iPad/NewsBlurViewController~ipad.xib
@ -154,6 +154,15 @@
 								<reference key="IBUIToolbar" ref="895374018"/>
 								<int key="IBUISystemItemIdentifier">5</int>
 							</object>
+							<object class="IBUIBarButtonItem" id="550003902">
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">settings_icon.png</string>
+								</object>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<int key="IBUIStyle">1</int>
+								<reference key="IBUIToolbar" ref="895374018"/>
+							</object>
 						</object>
 						<reference key="IBUITintColor" ref="131787584"/>
 					</object>
@ -245,6 +254,14 @@
 					</object>
 					<int key="connectionID">70</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">showMenuButton:</string>
+						<reference key="source" ref="550003902"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">90</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -296,6 +313,7 @@
 							<reference ref="537490750"/>
 							<reference ref="240724681"/>
 							<reference ref="607206668"/>
+							<reference ref="550003902"/>
 						</object>
 						<reference key="parent" ref="774585933"/>
 					</object>
@ -328,6 +346,11 @@
 						<reference key="object" ref="607206668"/>
 						<reference key="parent" ref="895374018"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">88</int>
+						<reference key="object" ref="550003902"/>
+						<reference key="parent" ref="895374018"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@ -347,6 +370,7 @@
 					<string>63.IBPluginDependency</string>
 					<string>79.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
+					<string>88.IBPluginDependency</string>
 				</object>
 				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@ -366,6 +390,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -380,7 +405,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">87</int>
+			<int key="maxID">90</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1280,6 +1305,106 @@
 						<string key="minorKey">./Classes/LoginViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MGSplitViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>showMasterPopover:</string>
+							<string>toggleMasterBeforeDetail:</string>
+							<string>toggleMasterView:</string>
+							<string>toggleSplitOrientation:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>showMasterPopover:</string>
+							<string>toggleMasterBeforeDetail:</string>
+							<string>toggleMasterView:</string>
+							<string>toggleSplitOrientation:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">showMasterPopover:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleMasterBeforeDetail:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleMasterView:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleSplitOrientation:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</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>delegate</string>
+							<string>detailViewController</string>
+							<string>masterViewController</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>id</string>
+							<string>UIViewController</string>
+							<string>UIViewController</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>delegate</string>
+							<string>detailViewController</string>
+							<string>masterViewController</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">delegate</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">detailViewController</string>
+								<string key="candidateClassName">UIViewController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">masterViewController</string>
+								<string key="candidateClassName">UIViewController</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MGSplitViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">MoveSiteViewController</string>
 					<string key="superclassName">UIViewController</string>
@ -1470,7 +1595,7 @@
 							<string>UINavigationController</string>
 							<string>OriginalStoryViewController</string>
 							<string>ShareViewController</string>
-							<string>UISplitViewController</string>
+							<string>MGSplitViewController</string>
 							<string>UINavigationController</string>
 							<string>SplitStoryDetailViewController</string>
 							<string>StoryDetailViewController</string>
@ -1556,7 +1681,7 @@
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">splitStoryController</string>
-								<string key="candidateClassName">UISplitViewController</string>
+								<string key="candidateClassName">MGSplitViewController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">splitStoryDetailNavigationController</string>
@ -1593,7 +1718,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton</string>
+							<string>showMenuButton:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@ -1614,7 +1739,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton</string>
+							<string>showMenuButton:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@ -1639,7 +1764,7 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">showMenuButton</string>
+								<string key="name">showMenuButton:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 						</object>
@ -1914,8 +2039,6 @@
 							<string>appDelegate</string>
 							<string>commentField</string>
 							<string>facebookButton</string>
-							<string>siteFavicon</string>
-							<string>siteInformation</string>
 							<string>submitButton</string>
 							<string>toolbarTitle</string>
 							<string>twitterButton</string>
@ -1925,8 +2048,6 @@
 							<string>NewsBlurAppDelegate</string>
 							<string>UITextView</string>
 							<string>UIButton</string>
-							<string>UIImageView</string>
-							<string>UILabel</string>
 							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
 							<string>UIButton</string>
@ -1939,8 +2060,6 @@
 							<string>appDelegate</string>
 							<string>commentField</string>
 							<string>facebookButton</string>
-							<string>siteFavicon</string>
-							<string>siteInformation</string>
 							<string>submitButton</string>
 							<string>toolbarTitle</string>
 							<string>twitterButton</string>
@ -1959,14 +2078,6 @@
 								<string key="name">facebookButton</string>
 								<string key="candidateClassName">UIButton</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">siteFavicon</string>
-								<string key="candidateClassName">UIImageView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">siteInformation</string>
-								<string key="candidateClassName">UILabel</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">submitButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
@ -1990,14 +2101,35 @@
 					<string key="className">SplitStoryDetailViewController</string>
 					<string key="superclassName">UIViewController</string>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">appDelegate</string>
-						<string key="NS.object.0">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>splitController</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>MGSplitViewController</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">appDelegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">appDelegate</string>
-							<string key="candidateClassName">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>splitController</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">splitController</string>
+								<string key="candidateClassName">MGSplitViewController</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -2155,8 +2287,17 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">16-List.png</string>
-			<string key="NS.object.0">{16, 16}</string>
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>16-List.png</string>
+				<string>settings_icon.png</string>
+			</object>
+			<object class="NSArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{16, 16}</string>
+				<string>{19, 20}</string>
+			</object>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">1181</string>
 	</data>
--- a/media/iphone/SplitStoryDetailViewController.m
+++ b/media/iphone/SplitStoryDetailViewController.m
@ -53,13 +53,18 @@
    // Release any retained subviews of the main view.
 }

+#pragma mark -
+#pragma mark Rotation support
+
+
+// Ensure that the view controller supports rotation and that the split view can therefore show in both portrait and landscape.
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-	return YES;
+    return YES;
 }

- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation 
-                                         duration:(NSTimeInterval)duration {
-    [appDelegate adjustStoryDetailWebView:NO shouldCheckLayout:YES]; 
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	[appDelegate adjustStoryDetailWebView:NO shouldCheckLayout:YES]; 
 }


--- a/media/iphone/storyDetailView.css
+++ b/media/iphone/storyDetailView.css
@ -1,40 +1,6 @@
-body {
-    text-rendering: optimizeLegibility;
-    margin: 0;
-    background: #f6f6f6;
-    -webkit-text-size-adjust: none; 
-}
-
-.NB-story-author {
-    color: #969696;
-    text-transform: uppercase;
-    margin: 4px 8px 0px 0;
-    text-shadow: 0 1px 0 #F9F9F9;
-    float: left;
-}
-
-.NB-story-tags {
-    overflow: hidden;
-    padding: 5px 0 0 0;
-    text-transform: uppercase;
-}
-
-.NB-story-tag {
-    float: left;
-    font-weight: normal;
-    padding: 0px 4px 0px;
-    margin: 0px 4px 4px 0;
-    background-color: #C6CBC3;
-    color: #505050;
-    text-shadow: 0 1px 0 #E7E7E7;
-    -webkit-border-radius: 4px;
-}
-
-.NB-story-date {
-    color: #454D6C;
-}
-
-/* FONT RENDERING */
+/**
+ * Font Size Style
+ */

 .NB-extra-small {
    line-height: 1.6em;
@ -69,6 +35,121 @@ body {
    font-family: georgia;
 }

+/**
+ * iPad Wide Style
+ */
+
+.NB-ipad-wide .NB-header {
+    padding: 15px 90px;
+}
+
+.NB-ipad-wide .NB-feed-story-comments {
+    margin: 30px 90px !important;
+}
+
+.NB-ipad-wide .NB-story {
+    margin: 30px 90px;
+}
+
+.NB-ipad-wide .NB-share-inner-wrapper {
+    margin: 0 90px;
+}
+
+.NB-ipad-wide .NB-story img {
+    max-width: 540px !important;
+}
+
+/**
+ * iPad Narrow Style
+ */
+
+.NB-ipad-narrow .NB-header {
+    padding: 15px 30px;
+}
+
+.NB-ipad-narrow .NB-story {
+    margin: 25px 30px;
+}
+
+.NB-ipad-narrow .NB-feed-story-comments {
+    margin: 30px 30px !important;
+}
+
+.NB-ipad-narrow .NB-share-inner-wrapper {
+    margin: 0 30px;
+}
+
+.NB-ipad-narrow .NB-story img {
+    max-width: 400px !important;
+}
+
+/**
+ * iPhone Style
+ */
+
+.NB-iphone .NB-header {
+    padding: 12px 12px;
+}
+
+.NB-iphone .NB-story {
+    margin: 12px 12px;
+}
+
+.NB-iphone .NB-feed-story-comments {
+    margin: 30px 12px !important;
+}
+
+.NB-iphone .NB-share-inner-wrapper {
+    margin: 0 12px;
+}
+
+.NB-iphone .NB-story img {
+    max-width: 300px !important;
+}
+
+
+/**
+ * Universal Style
+ */
+
+body {
+    text-rendering: optimizeLegibility;
+    margin: 0;
+    background: #f6f6f6;
+    -webkit-text-size-adjust: none; 
+    font-size: 14px;
+    line-height: 120%;
+    overflow: hidden;
+}
+
+.NB-story-author {
+    color: #969696;
+    text-transform: uppercase;
+    margin: 4px 8px 0px 0;
+    text-shadow: 0 1px 0 #F9F9F9;
+    float: left;
+}
+
+.NB-story-tags {
+    overflow: hidden;
+    padding: 5px 0 0 0;
+    text-transform: uppercase;
+}
+
+.NB-story-tag {
+    float: left;
+    font-weight: normal;
+    padding: 0px 4px 0px;
+    margin: 0px 4px 4px 0;
+    background-color: #C6CBC3;
+    color: #505050;
+    text-shadow: 0 1px 0 #E7E7E7;
+    -webkit-border-radius: 4px;
+}
+
+.NB-story-date {
+    color: #454D6C;
+}

 .NB-story-author {
    font-size: 10px;
@ -88,8 +169,6 @@ body {
    line-height: 13px;
 }

-/* END: FONT RENDERING */
-
 h1, h2, h3, h4, h5, h6, div, table, span, pre, code {
    overflow: auto;
 }
@ -128,14 +207,13 @@ small {
    font-weight: 600;
    background-color: #E0E0E0;
    border-bottom: 1px solid #A0A0A0;
-    padding: 15px 90px;
    text-shadow: 1px 1px 0 #EFEFEF;
    overflow: hidden;
    max-width: none;
 }

 .NB-story {
-    margin: 30px 90px;
+    overflow: hidden;
 }

 .NB-story a.NB-contains-image { 
@ -143,7 +221,6 @@ small {
 }

 .NB-story img {
-    max-width: 572px !important;
    margin: 0 auto;
 }

@ -159,7 +236,6 @@ small {
 }

 .NB-story img.NB-small-image {
-    max-width: 572px !important;
    margin: 0 20px 10px 0  !important;
    padding: 5px;
    display: block !important;
@ -173,7 +249,6 @@ small {

 .NB-feed-story-comments {
    clear: both;
-    margin: 30px 90px !important;
 }

 .NB-story-title {
@ -194,7 +269,6 @@ del {
 /* Disable certain interactions on touch devices */
 #story_pane .NB-story-comment { 
    -webkit-touch-callout: none; 
-
    -webkit-user-select: none; 
    -webkit-highlight: none; 
    -webkit-tap-highlight-color: rgba(0,0,0,0); 
@ -249,39 +323,5 @@ del {
  	background:-moz-linear-gradient( center top, #dfdfdf 5%, #ffffff 100% );
  	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#ffffff');
  	background-color:#dfdfdf;
-  }
-
-/*
-.NB-share-icon,
-.NB-save-icon {
-    display: inline-block;
-    width: 32px;
-    background: black;
-    height: 32px;
-    margin-right: 10px;
-    vertical-align: bottom;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-color: transparent;
 }

-*/
-
-.NB-save-icon {
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowNjExRUIzOTA4MjA2ODExOTM3NUNBMjMzRTI3QkY3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5MTRDQ0QwNzJFRTgxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MTRDQ0QwNjJFRTgxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjBGMTFFQjM5MDgyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjA2MTFFQjM5MDgyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T58Z9QAABXNJREFUeNrEV01oHVUUvjNz5/fNy3s+CAQKRSHSVVxJJCWiKEKLolSEFLfuioIoSMCFm4orxZ0rQQSlQrC0KBQXpYGiq64KhUIhkFUgEIh5P/N3Z/y+OzPJe+X1pRmDTri8N3lnzjn3O9/5zh1j9fV3xP95ySYPGYYhTNPUn7yKohB5nuvP/yQBBrdtm+tX3Pppml7EEkqp00+g3KQhLMvUgU3TQmBHeL4vfN9/jb+OhkMxGg1FkiQVErn+LNE5JgEaPyE0gjGwJaTEbh3nPcd23sb3Fcd1F4OgxQS05dAbFO7QexRF0SOVZXeBxu00Tf4iIlyM8aTySFFM3zYDI6jjud77fhCs+35wjrt2HBfLEUhCICFtHrRCEUWjxTiOF9MkvhDHEe6jh3EU/YDv3yGh/SzLdCKPxzNWXn1rAm4Df9KWwnX9hVYY3gjbc8shAvjYMYNKKfWyUAqWhJfKlcjSTGQKK0tFilIgITEcDMRgMNgZDvsfR6PRL0AFiEyiIcHfcdCFheBeECzNtTu/dbrds0hABH6gd24hcM3+ugP0c1WpnMJB7UvYgZrQZQr6CwcH7rWDv/fXBoP+ZaCSqLGOkXV8OrSkJXzPP9tpd+90n+n15jpd1DnQjD9su6Jsu2JK7YieZSJJA7yxpLDJHZTJsV1+v4T/XxOFcRnoJEyUfmSOutR9jV1arbD901y322t3Osje1zuDX5FPqd+x7YpnXc/TCHEh6Uvw8yNKRiQ0JySzYAJkOsnWbs+ttlBzF/U2DFNn2aS/J5hO30CSfsCVNXBhI0vTDd5LNqqF3SNgrxWE661WSwcH4KJgrU5JcomkBzTCMBRxNLqaRBGTQAK69iCe568DgdAG2UzsPCdJ/uXOpyXhuB5ELDhnu/1VMxrdlRX8Pnr+AxoQllE02sX/52tuUP0mdB82+Zi4lHbWlPmgJmYEf9PE0+S0LyBemQDI8iZ+d6I4/hSC8TNsdkg89PqStO1lCM9XliXn6QR9vgVh+QLOb8HZLpkPz2ekZa3B9nNoRI91g912kiZfwvY6ktB2CPgc4n2iVPYhUF4xkLBkvtjRMoTiBQjIVimfmW4qOLvvut59EOgmROgOWLwH9l5MkrjPncEJGCz2i7zowvk3sNmA/Z+w24fdy5gPtNeoEhjsfAud9hGe2cBGvwaMQvLHJI6/x+cWnSoomaoGCdWO6gd+7IKYV7AxOuwzQSCiSUVwGYRwI8A22u4KcN6GFO+VAyrWZTA0B6SWcXBuEwT/jBNUUjph8JABaVjWrajGriGo62At5NneZDTKKcvmUaAcW2sDg9BGt5xt36ztOB2Z7JE/E/6kJiN83GZsySEBupM2pcKN6TSByKHdtKl1nwlS3Vyv0DpRP8dgdEgyUiX5XK129VVUG6ylnInJ/JhWywulM1ET7ZSXzqpna8ccSIaRjZ0DJlVEC7gqRftQpPKnOkYVjyVVHjhqeS5Ll59ArounOZDMeLwKRpg13JUmNPEla4Kc5OIzumNyJY7Im4smvpohUJcgHytBUwREg6z1kOJS+eF92TINEJg174zqtHPEWuyS8Ou6V7XXpKzuRZP3glmwoc85GaFcN3C3ALV8SRWZ7rHypFuRj1zQHdCEhDOStnjWw+SCHL8B4fAxK3oIuFdhM0/S4b6vSalRaPCSU6vftFWCYFJe73GOY11FMvMY3Wcgp98yD3TCLTU2dk+6jGefX5pxgNAHFeG3wlcwxf4A2ZxMZdUxi2cZc5TE0YvDQf8BZ4aqfjsRArNluJwDeNnYhM6fByGuYw70sXaAze+YZucxiB7Qpn4VO9V3QzKeAyaOeaIV9xD4XaKiX0ZUpl9A8DakX0iavBnz+keAAQD5JMFqtjq6lgAAAABJRU5ErkJggg==');
-}
-
-.NB-share-icon {    
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0NDI5RjhBQTA3MjA2ODExOTM3NUNBMjMzRTI3QkY3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2MjMwMjFGQzJFRTcxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2MjMwMjFGQjJFRTcxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjA2ODAxMTc0MDcyMDY4MTE5MTA5QjRBMERBMDUwNjdFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjQ0MjlGOEFBMDcyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+0lilNwAABZFJREFUeNrEV11oHFUUvjP3zszO/qbRaEttoBgpffDFimBbECIUQUWEPgUsSqW4UCjoa8E3FYSqIBUf+mIpKAYEQSoKgk+CIAgFQeiTGJTSRjfZ3Zm583P9zrkz243ZZGMqZOAy7J3Ze875zvedc8Yxxoi9vJyTT7+wpw6o/y0SxxEuLekK15X8mxZdhHJRFCLPc75jR1TAq3s3LGDQFVIq4fn+rO/75z3lLUqlDsKBBbyiizy/kWXZzUQnH6Ra/5BlKTtDTjgnFp+/p6illDAcyDCsv91oNLphvdGsBTWhPI8dowvGhU5iEUVDMej3vxoMB2eSOF7N8wwI7JaDZeS+H4hmq/1xZ2bf2VarLer1OjnEjlFK6HggIFI4EcOBoNZ7Vv6trq0J8VwcRbkqdqkCl6P3YLBxYQbG983eJxqNpvADa9xx3DEOFCLICzjrc6rg1TNApZul6Ycu6CF2sxyKPvBFo9Xqtjod0Wg2EV2tNO6URCt4scOS0ILDjToQa9H9tIffShQ7g3vDZQgBV4BsohaEhynnHtAA74UpDJne8iDlKk5b4NfmFf6DFBTbS8u1skIEB7G1CgNRUeRWZi7L7jf8WCBckOypsfB7WEBwhZEhjW61yAjYLJHna61W5/d2u3Or2Wx9UgvrLymlmkQf5PFqmqbMdJLWtEUSpPchxy8yqMB5/PipySRDdAQVctttd2Yu18M65x0GIadIaB3/AoyOw6EICrjearcX6f1KehOjRxHSSSLW1nrf3bl969Tqndu5PHDosE3qvxbBTqRC1O/BwDxJLITEArDc83xi+VwOfSHyb0G0z+k30nFs3Fi1qsgT1IJ+f3251/vrDJwYDiFLRaSZmH8F+JXy4cSTtVoIwzVGwHhWSpQiQLk0HPYvghMR/nHRlfJcEBjmLJz7FWcfAce0KYobaZb+jOLz0WDQ/wnGUZDWGY2JJHRK2sNgCGOSDVtB8z62qOySg7MUYRLjIDU8TU7mxIWiuJTq5I2q9lPF01rjPVsNaYED5CTJcDMCxjEb1Eco2SYiRs2FPGK94w4DZ3F4F/B+CQ5c0jr5HlWOYR+lAY4x+agP8L7hgCbL0JCe+Y9RlUNa4w6Q93iWl4dfiU10xUacI9cJ137bcMyoG9KyxaksJtQNJw8kpiROptNU/5hm+gmZyVFppYOsnPTXWCKOo5Fsc3qWpgw7Rzml2ahxaMcvciC1eXtT15LrRLxKYvQM+zkMv0vMpogrhKooBWdpep+RD+w/tH0llPImjOMmn6IGVGo5HwzWX+mvrX0TDQYgWFJGnJfGp0c+cuD+Bx+aUAVKolmmUYP5QynvPLzgSON4uA7jSyCdiJNoNFxMPGfKUmaLXkAHIpWsVYJbh5qHDNrXie4A+g4i72VpJowpdj3UuAVLbPMasdcwe08S6ys1WCabboXyXab/9yVn5w6MAWIHDZ7xFGY8zzuCdvtaENbfQpHxeZi4q5ATyHkI0xqbK8bYSXOUuh0u55Gjx7ji2NYryfAc+vzrgPtlNJf91A8w76Ev1KnyWRXQeAXp0YhFHIBaeigyV7NUvwPHViwZzY546Dx89DHufHaqDZYQ6WWsDnU2LrfIu6d8Lr80hLDUqBCB9VlZ2TKSqyauRH1w41WU4c/u1oEp3wUOdz6eUi5gon2fovXLqZYHSxpGSP+U42p8Mob3vPKdHJMRjVceZgTsf4rnOSrpMkrSqH9s82FiZ/ogCLth2BAYNvhgMsCVjyZbYzY0o/GPAn6PpyaXB1Eu03n+IlKxLKg0T3UANhCFD7gXLOSKR61RLdjh1Ez/IeIqm7ZHaQgdNa5tHbAvzOIuaX5H9d88hO7w4q5JJdmYeVE1nCk1QpWQ/QkSOYbQAJl2aZ9tcpOiXl9Wx6nI7fXn+T8CDADKuC2qH+Qv3QAAAABJRU5ErkJggg==');
-}
-.NB-share-wrapper {
-    max-width: 100% !important;
-    width: 100% !important;
-    background-repeat: repeat;
-    }
-
-.NB-share-inner-wrapper {
-    margin: 0 90px;
-}
-
-