Преглед изворни кода

Redant Mobile
修复登陆界面找回密码显示不全的问题。

Ray Zhang пре 8 година
родитељ
комит
1ad59a00f1

BIN
RA Image/RA Image.xcodeproj/project.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 5
RedAnt Mobile/RedAnt Mobile/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="J5i-KQ-nTf">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="J5i-KQ-nTf">
     <device id="retina4_7" orientation="portrait">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
         <adaptation id="fullscreen"/>
     </device>
     </device>
     <dependencies>
     <dependencies>
         <deployment identifier="iOS"/>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
@@ -220,7 +220,7 @@
                                 <nil key="highlightedColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sfr-OB-A5y">
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sfr-OB-A5y">
-                                <rect key="frame" x="227" y="539" width="128" height="30"/>
+                                <rect key="frame" x="229" y="539" width="126" height="30"/>
                                 <state key="normal" title="Retrieve Password"/>
                                 <state key="normal" title="Retrieve Password"/>
                             </button>
                             </button>
                         </subviews>
                         </subviews>
@@ -232,6 +232,7 @@
                             <constraint firstItem="enM-qf-Iwt" firstAttribute="top" secondItem="3rO-M6-J99" secondAttribute="bottom" constant="40" id="AiN-Tc-vlT"/>
                             <constraint firstItem="enM-qf-Iwt" firstAttribute="top" secondItem="3rO-M6-J99" secondAttribute="bottom" constant="40" id="AiN-Tc-vlT"/>
                             <constraint firstItem="Sfr-OB-A5y" firstAttribute="top" secondItem="NDF-jH-CA9" secondAttribute="bottom" constant="25" id="DiM-Ok-EtU"/>
                             <constraint firstItem="Sfr-OB-A5y" firstAttribute="top" secondItem="NDF-jH-CA9" secondAttribute="bottom" constant="25" id="DiM-Ok-EtU"/>
                             <constraint firstAttribute="trailing" secondItem="3rO-M6-J99" secondAttribute="trailing" id="L7q-W8-eQ0"/>
                             <constraint firstAttribute="trailing" secondItem="3rO-M6-J99" secondAttribute="trailing" id="L7q-W8-eQ0"/>
+                            <constraint firstAttribute="trailing" secondItem="Sfr-OB-A5y" secondAttribute="trailing" constant="20" id="M2x-WB-5PT"/>
                             <constraint firstItem="NDF-jH-CA9" firstAttribute="top" secondItem="enM-qf-Iwt" secondAttribute="bottom" constant="30" id="P31-RN-gyW"/>
                             <constraint firstItem="NDF-jH-CA9" firstAttribute="top" secondItem="enM-qf-Iwt" secondAttribute="bottom" constant="30" id="P31-RN-gyW"/>
                             <constraint firstItem="3rO-M6-J99" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" id="ZrJ-Zc-Bh5"/>
                             <constraint firstItem="3rO-M6-J99" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" id="ZrJ-Zc-Bh5"/>
                             <constraint firstItem="9dT-Bs-qIE" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" constant="10" id="dzu-oH-8Sg"/>
                             <constraint firstItem="9dT-Bs-qIE" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" constant="10" id="dzu-oH-8Sg"/>
@@ -240,7 +241,6 @@
                             <constraint firstAttribute="trailing" secondItem="NDF-jH-CA9" secondAttribute="trailing" constant="20" id="gax-j3-RJl"/>
                             <constraint firstAttribute="trailing" secondItem="NDF-jH-CA9" secondAttribute="trailing" constant="20" id="gax-j3-RJl"/>
                             <constraint firstItem="pqa-JO-nsA" firstAttribute="bottom" secondItem="9dT-Bs-qIE" secondAttribute="bottom" id="u9I-FB-QTh"/>
                             <constraint firstItem="pqa-JO-nsA" firstAttribute="bottom" secondItem="9dT-Bs-qIE" secondAttribute="bottom" id="u9I-FB-QTh"/>
                             <constraint firstAttribute="trailing" secondItem="enM-qf-Iwt" secondAttribute="trailing" id="vEE-LN-y0U"/>
                             <constraint firstAttribute="trailing" secondItem="enM-qf-Iwt" secondAttribute="trailing" id="vEE-LN-y0U"/>
-                            <constraint firstItem="Sfr-OB-A5y" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leadingMargin" constant="211" id="w00-4m-80H"/>
                             <constraint firstItem="enM-qf-Iwt" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" id="y1G-Yd-lgw"/>
                             <constraint firstItem="enM-qf-Iwt" firstAttribute="leading" secondItem="82J-L4-G3a" secondAttribute="leading" id="y1G-Yd-lgw"/>
                             <constraint firstItem="3rO-M6-J99" firstAttribute="top" secondItem="3qW-uN-D4Q" secondAttribute="bottom" constant="80" id="y1k-fy-nvZ"/>
                             <constraint firstItem="3rO-M6-J99" firstAttribute="top" secondItem="3qW-uN-D4Q" secondAttribute="bottom" constant="80" id="y1k-fy-nvZ"/>
                         </constraints>
                         </constraints>
@@ -330,7 +330,8 @@
                         <constraints>
                         <constraints>
                             <constraint firstItem="JkQ-Sd-805" firstAttribute="centerX" secondItem="yjr-j3-Yaf" secondAttribute="centerX" id="0W2-hL-zSy"/>
                             <constraint firstItem="JkQ-Sd-805" firstAttribute="centerX" secondItem="yjr-j3-Yaf" secondAttribute="centerX" id="0W2-hL-zSy"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="leading" secondItem="JkQ-Sd-805" secondAttribute="leading" id="0pQ-Dd-RXb"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="leading" secondItem="JkQ-Sd-805" secondAttribute="leading" id="0pQ-Dd-RXb"/>
-                            <constraint firstItem="OZs-Wi-1F2" firstAttribute="leading" secondItem="yjr-j3-Yaf" secondAttribute="leadingMargin" constant="10" id="3LL-Ce-S29"/>
+                            <constraint firstItem="OZs-Wi-1F2" firstAttribute="leading" secondItem="yjr-j3-Yaf" secondAttribute="leading" constant="26" id="2Vt-B9-5ds"/>
+                            <constraint firstItem="OZs-Wi-1F2" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="yjr-j3-Yaf" secondAttribute="leadingMargin" id="3LL-Ce-S29"/>
                             <constraint firstItem="vD8-kq-Tbx" firstAttribute="top" secondItem="JkQ-Sd-805" secondAttribute="bottom" constant="10" id="85j-EY-MjI"/>
                             <constraint firstItem="vD8-kq-Tbx" firstAttribute="top" secondItem="JkQ-Sd-805" secondAttribute="bottom" constant="10" id="85j-EY-MjI"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="top" secondItem="vD8-kq-Tbx" secondAttribute="bottom" constant="10.5" id="92l-qc-Ta6"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="top" secondItem="vD8-kq-Tbx" secondAttribute="bottom" constant="10.5" id="92l-qc-Ta6"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="trailing" secondItem="JkQ-Sd-805" secondAttribute="trailing" id="HZA-Av-uG1"/>
                             <constraint firstItem="J0x-c0-REl" firstAttribute="trailing" secondItem="JkQ-Sd-805" secondAttribute="trailing" id="HZA-Av-uG1"/>