Permalink
Browse files

Erred in the side of the storyboard files on the head rather than my …

…local branch
  • Loading branch information...
2 parents 1f7e36a + ed28b3e commit 2de06011b6757eaf1748f3de5b05e80ad001e2fb @xirianlight xirianlight committed Mar 25, 2013
@@ -67,7 +67,8 @@ - (void)viewDidLoad
//Add bookmarks button to viewController
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemBookmarks target:self action:@selector(bookmarkButtonPressed)];
-
+ NSDate *future = [NSDate dateWithTimeIntervalSinceNow: 2 ];
+ [NSThread sleepUntilDate:future];
//Created method "bookmarkButtonPressed, currently has no action - End edit
// Core Data
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C60" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="mW4-IJ-E2e">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12D78" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="mW4-IJ-E2e">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
@@ -18,7 +18,7 @@
<outlet property="delegate" destination="2" id="43E-w0-dI6"/>
</connections>
</mapView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="RGB-yg-ZJ4">
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" id="RGB-yg-ZJ4">
<rect key="frame" x="0.0" y="309" width="320" height="195"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
@@ -57,15 +57,15 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="loadingPage.png" id="D5k-eU-WtS">
- <rect key="frame" x="0.0" y="51.5" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="52" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="BDR-6h-3HL">
<rect key="frame" x="144" y="362" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Experience your surroundings. Tap something interesting and we'll show you where you can get online" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
- <rect key="frame" x="20" y="429" width="285" height="91"/>
+ <rect key="frame" x="20" y="407" width="285" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -108,15 +108,15 @@
</connections>
</webView>
<view contentMode="scaleToFill" id="JIq-gF-FaR">
- <rect key="frame" x="0.0" y="462" width="320" height="47"/>
+ <rect key="frame" x="0.0" y="462" width="320" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="webviewpopout_shelf@2x.png" id="07p-dX-8kh">
- <rect key="frame" x="0.0" y="0.0" width="320" height="47"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Swipe to go forward or back" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="emB-3U-nsG">
- <rect key="frame" x="20" y="13" width="280" height="21"/>
+ <rect key="frame" x="20" y="38" width="280" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

0 comments on commit 2de0601

Please sign in to comment.