master:合并dev，完成屏幕适配，下面将移植到Apple Watch

RainesGit · Nov 23, 2015 · 6e6aed6 · 6e6aed6
2 parents 2f9f164 + 9c86269
commit 6e6aed6
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 149 deletions.
diff --git a/Oncenote/Base.lproj/LaunchScreen.storyboard b/Oncenote/Base.lproj/LaunchScreen.storyboard
@@ -14,7 +14,7 @@
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LoginAppIcon" id="8gd-Xh-rHH">
                                 <rect key="frame" x="106" y="171" width="108" height="92"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <animations/>
                             </imageView>
                         </subviews>