Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed map expansion since we added the scroll view

  • Loading branch information...
commit 850382da5b010180c1372f1016c964e01e38af86 1 parent 9fbc15e
Anthony Kinsey akinsey authored
2  HI Capacity/AboutViewController.m
View
@@ -69,6 +69,8 @@ - (void)enlargeMap
UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStylePlain target:self action:@selector(shrinkMap)];
if(self.navigationItem.rightBarButtonItem == nil)
[self.navigationItem setRightBarButtonItem: closeButton animated:YES];
+
+ [self.scrollView setContentOffset:CGPointZero animated:YES];
[UIView beginAnimations:nil context:NULL];
[UIView setAnimationDuration:0.85];
[self.mapView setFrame:(CGRectMake(mapView.frame.origin.x, mapView.frame.origin.y, mapView.frame.size.width, 370))];
7 HI Capacity/en.lproj/MainStoryboard_iPhone.storyboard
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E53" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="QZU-Qr-WJA">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E2620" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="QZU-Qr-WJA">
<dependencies>
<deployment defaultVersion="1296" identifier="iOS"/>
<development defaultVersion="4200" identifier="xcode"/>
@@ -39,9 +39,10 @@
<rect key="frame" x="0.0" y="146" width="320" height="368"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <mutableString key="text">HI Capacity started in January of 2011 when a handful of people had a desire to make Honolulu's first makerspace a reality. HI Capacity met at coffee shops on Saturdays and held public events. As more members joined there was a need for a permanent home. In October of 2011 the dream of having a dedicated space became one step closer. The Box Jelly graciously allowed HI Capacity to share their space and finally have a location.
+ <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="3"/>
+ <string key="text">HI Capacity started in January of 2011 when a handful of people had a desire to make Honolulu's first makerspace a reality. HI Capacity met at coffee shops on Saturdays and held public events. As more members joined there was a need for a permanent home. In October of 2011 the dream of having a dedicated space became one step closer. The Box Jelly graciously allowed HI Capacity to share their space and finally have a location.
-With HI Capacity continuing to grow, the shared space was quickly outgrown. Partnering with The Box Jelly once again HI Capacity re-opened its doors in mid-2012 in its own dedicated space adjoining The Box Jelly. With this exciting development HI Capacity will continue to grow. Even though people will come and go, the original goals from the founders will not change. Check back to see where HI Capacity ends up!</mutableString>
+With HI Capacity continuing to grow, the shared space was quickly outgrown. Partnering with The Box Jelly once again HI Capacity re-opened its doors in mid-2012 in its own dedicated space adjoining The Box Jelly. With this exciting development HI Capacity will continue to grow. Even though people will come and go, the original goals from the founders will not change. Check back to see where HI Capacity ends up!</string>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
Please sign in to comment.
Something went wrong with that request. Please try again.