Skip to content

Commit

Permalink
Merge pull request #621 from 64characters/autolayout
Browse files Browse the repository at this point in the history 
Last instead of first baseline
  • Loading branch information
@eofster
eofster authored Sep 2, 2020
2 parents aa52c6c + 9410c4d commit 4ee7c62
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 49 deletions.
32 changes: 16 additions & 16 deletions Telephone/Base.lproj/AccountPreferencesView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -223,12 +223,12 @@
<constraints>
<constraint firstItem="530" firstAttribute="trailing" secondItem="102" secondAttribute="trailing" id="0zA-ra-Hpb"/>
<constraint firstItem="534" firstAttribute="top" secondItem="93" secondAttribute="bottom" constant="42" id="1C0-TX-VdZ"/>
<constraint firstItem="104" firstAttribute="firstBaseline" secondItem="103" secondAttribute="firstBaseline" id="44B-8S-6lE"/>
<constraint firstItem="104" firstAttribute="baseline" secondItem="103" secondAttribute="baseline" id="44B-8S-6lE"/>
<constraint firstItem="102" firstAttribute="trailing" secondItem="103" secondAttribute="trailing" id="83K-yj-YHs"/>
<constraint firstItem="93" firstAttribute="leading" secondItem="413" secondAttribute="leading" constant="17" id="8in-eP-WoJ"/>
<constraint firstItem="99" firstAttribute="trailing" secondItem="530" secondAttribute="trailing" id="9Uv-NW-B53"/>
<constraint firstItem="536" firstAttribute="firstBaseline" secondItem="534" secondAttribute="firstBaseline" id="EDF-kG-izV"/>
<constraint firstItem="98" firstAttribute="firstBaseline" secondItem="102" secondAttribute="firstBaseline" id="F03-ck-yje"/>
<constraint firstItem="536" firstAttribute="baseline" secondItem="534" secondAttribute="baseline" id="EDF-kG-izV"/>
<constraint firstItem="98" firstAttribute="baseline" secondItem="102" secondAttribute="baseline" id="F03-ck-yje"/>
<constraint firstItem="528" firstAttribute="leading" secondItem="98" secondAttribute="leading" id="GtG-ZP-Jdj"/>
<constraint firstItem="536" firstAttribute="trailing" secondItem="99" secondAttribute="trailing" id="KRK-Ac-tk7"/>
<constraint firstItem="536" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="413" secondAttribute="leading" constant="20" symbolic="YES" id="Lkb-YC-DQ2"/>
Expand All @@ -240,15 +240,15 @@
<constraint firstAttribute="trailing" secondItem="534" secondAttribute="trailing" constant="32" id="WAf-X4-LdX"/>
<constraint firstItem="534" firstAttribute="leading" secondItem="536" secondAttribute="trailing" constant="7" id="ajg-yi-dBJ"/>
<constraint firstItem="98" firstAttribute="leading" secondItem="104" secondAttribute="leading" id="av8-w1-KMb"/>
<constraint firstItem="95" firstAttribute="firstBaseline" secondItem="99" secondAttribute="firstBaseline" id="cDS-9v-SZG"/>
<constraint firstItem="95" firstAttribute="baseline" secondItem="99" secondAttribute="baseline" id="cDS-9v-SZG"/>
<constraint firstItem="528" firstAttribute="trailing" secondItem="98" secondAttribute="trailing" id="dHa-J4-8XH"/>
<constraint firstItem="534" firstAttribute="trailing" secondItem="95" secondAttribute="trailing" id="ePv-sQ-PmP"/>
<constraint firstItem="534" firstAttribute="leading" secondItem="95" secondAttribute="leading" id="fWo-cu-0xd"/>
<constraint firstItem="102" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="413" secondAttribute="leading" constant="20" symbolic="YES" id="hJR-zT-mUc"/>
<constraint firstItem="530" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="413" secondAttribute="leading" constant="20" symbolic="YES" id="hoG-Aa-SnS"/>
<constraint firstItem="95" firstAttribute="trailing" secondItem="528" secondAttribute="trailing" id="kmb-5M-JuA"/>
<constraint firstItem="95" firstAttribute="top" secondItem="534" secondAttribute="bottom" constant="20" id="lQa-aA-v6D"/>
<constraint firstItem="528" firstAttribute="firstBaseline" secondItem="530" secondAttribute="firstBaseline" id="lVJ-cB-X5V"/>
<constraint firstItem="528" firstAttribute="baseline" secondItem="530" secondAttribute="baseline" id="lVJ-cB-X5V"/>
<constraint firstItem="98" firstAttribute="top" secondItem="528" secondAttribute="bottom" constant="10" id="qOe-cA-aI0"/>
<constraint firstItem="93" firstAttribute="top" secondItem="413" secondAttribute="top" constant="36" id="rvX-9Z-2g6"/>
<constraint firstItem="104" firstAttribute="top" secondItem="98" secondAttribute="bottom" constant="10" id="scl-ka-DzA"/>
Expand Down Expand Up @@ -414,7 +414,7 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xf9-ce-jif" secondAttribute="trailing" constant="20" symbolic="YES" id="6Gv-7k-BhO"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4L8-E6-lKd" secondAttribute="trailing" constant="20" symbolic="YES" id="8h4-mc-M2g"/>
<constraint firstItem="gHr-pY-4ah" firstAttribute="leading" secondItem="Ify-XP-VVA" secondAttribute="leading" id="9tf-dO-we4"/>
<constraint firstItem="pfR-7Z-E7H" firstAttribute="firstBaseline" secondItem="dli-GZ-E5f" secondAttribute="firstBaseline" id="9w1-dt-zjD"/>
<constraint firstItem="pfR-7Z-E7H" firstAttribute="baseline" secondItem="dli-GZ-E5f" secondAttribute="baseline" id="9w1-dt-zjD"/>
<constraint firstItem="4L8-E6-lKd" firstAttribute="top" secondItem="INe-5P-bRu" secondAttribute="bottom" constant="20" id="AX1-Bk-a9B"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ngD-ji-goI" secondAttribute="trailing" constant="20" symbolic="YES" id="AXU-bM-Vye"/>
<constraint firstAttribute="trailing" secondItem="1UL-lr-59v" secondAttribute="trailing" constant="18" id="B7v-MJ-Nrl"/>
Expand All @@ -427,11 +427,11 @@
<constraint firstAttribute="trailing" secondItem="dli-GZ-E5f" secondAttribute="trailing" priority="750" constant="160" id="JmM-eT-UxV"/>
<constraint firstItem="Ify-XP-VVA" firstAttribute="leading" secondItem="iBU-Gy-PuJ" secondAttribute="leading" id="K8R-zS-jfP"/>
<constraint firstItem="ngD-ji-goI" firstAttribute="leading" secondItem="XxC-OI-tYb" secondAttribute="leading" constant="35" id="KO2-VX-VyP"/>
<constraint firstItem="iBU-Gy-PuJ" firstAttribute="firstBaseline" secondItem="2I5-wK-O3x" secondAttribute="firstBaseline" id="Kdn-kJ-rrd"/>
<constraint firstItem="iBU-Gy-PuJ" firstAttribute="baseline" secondItem="2I5-wK-O3x" secondAttribute="baseline" id="Kdn-kJ-rrd"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="iBU-Gy-PuJ" secondAttribute="trailing" constant="20" symbolic="YES" id="P6y-3d-Eab"/>
<constraint firstItem="1UL-lr-59v" firstAttribute="top" secondItem="ngD-ji-goI" secondAttribute="bottom" constant="8" id="Pon-nf-7Fc"/>
<constraint firstItem="1UL-lr-59v" firstAttribute="leading" secondItem="XxC-OI-tYb" secondAttribute="leading" constant="115" id="QGj-cE-1wk"/>
<constraint firstItem="ho6-cH-aLd" firstAttribute="firstBaseline" secondItem="1UL-lr-59v" secondAttribute="firstBaseline" id="RVD-q2-LV8"/>
<constraint firstItem="ho6-cH-aLd" firstAttribute="baseline" secondItem="1UL-lr-59v" secondAttribute="baseline" id="RVD-q2-LV8"/>
<constraint firstItem="uyP-rU-EtH" firstAttribute="top" secondItem="4L8-E6-lKd" secondAttribute="bottom" constant="8" id="UnR-2l-9xZ"/>
<constraint firstItem="2I5-wK-O3x" firstAttribute="trailing" secondItem="pfR-7Z-E7H" secondAttribute="trailing" id="VQe-X1-tH6"/>
<constraint firstItem="iBU-Gy-PuJ" firstAttribute="top" secondItem="dli-GZ-E5f" secondAttribute="bottom" constant="20" id="WMg-2O-h76"/>
Expand All @@ -447,7 +447,7 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="uyP-rU-EtH" secondAttribute="trailing" constant="20" symbolic="YES" id="pvl-ms-1JM"/>
<constraint firstItem="iBU-Gy-PuJ" firstAttribute="leading" secondItem="dli-GZ-E5f" secondAttribute="leading" id="rC2-2X-nui"/>
<constraint firstItem="INe-5P-bRu" firstAttribute="leading" secondItem="xf9-ce-jif" secondAttribute="leading" id="urg-AP-1t2"/>
<constraint firstItem="xf9-ce-jif" firstAttribute="firstBaseline" secondItem="Miv-Fk-KKm" secondAttribute="firstBaseline" id="w0h-rF-uHU"/>
<constraint firstItem="xf9-ce-jif" firstAttribute="baseline" secondItem="Miv-Fk-KKm" secondAttribute="baseline" id="w0h-rF-uHU"/>
<constraint firstItem="INe-5P-bRu" firstAttribute="leading" secondItem="xf9-ce-jif" secondAttribute="leading" id="w1d-ZW-uta"/>
<constraint firstItem="Miv-Fk-KKm" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="XxC-OI-tYb" secondAttribute="leading" constant="20" symbolic="YES" id="wGv-bh-Fi5"/>
<constraint firstItem="Ify-XP-VVA" firstAttribute="top" secondItem="iBU-Gy-PuJ" secondAttribute="bottom" constant="8" id="wSe-Bb-U8x"/>
Expand Down Expand Up @@ -573,28 +573,28 @@
</textField>
</subviews>
<constraints>
<constraint firstItem="100" firstAttribute="firstBaseline" secondItem="96" secondAttribute="firstBaseline" id="05d-gK-lgS"/>
<constraint firstItem="100" firstAttribute="baseline" secondItem="96" secondAttribute="baseline" id="05d-gK-lgS"/>
<constraint firstItem="499" firstAttribute="top" secondItem="418" secondAttribute="bottom" constant="10" id="0Pl-Zw-7Ev"/>
<constraint firstItem="418" firstAttribute="leading" secondItem="416" secondAttribute="trailing" id="4Tg-Wa-cia"/>
<constraint firstItem="100" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="412" secondAttribute="leading" constant="20" symbolic="YES" id="4mW-34-Ub8"/>
<constraint firstItem="ERB-3b-3jA" firstAttribute="firstBaseline" secondItem="418" secondAttribute="firstBaseline" id="Bws-00-BCL"/>
<constraint firstItem="ERB-3b-3jA" firstAttribute="baseline" secondItem="418" secondAttribute="baseline" id="Bws-00-BCL"/>
<constraint firstAttribute="trailing" secondItem="96" secondAttribute="trailing" constant="18" id="CbD-vu-2pv"/>
<constraint firstItem="96" firstAttribute="leading" secondItem="97" secondAttribute="leading" id="DKL-g2-ELY"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="501" secondAttribute="trailing" constant="20" symbolic="YES" id="H6r-la-wDh"/>
<constraint firstItem="100" firstAttribute="trailing" secondItem="101" secondAttribute="trailing" id="I0z-8G-6f0"/>
<constraint firstItem="497" firstAttribute="firstBaseline" secondItem="499" secondAttribute="firstBaseline" id="J73-ry-Wam"/>
<constraint firstItem="497" firstAttribute="baseline" secondItem="499" secondAttribute="baseline" id="J73-ry-Wam"/>
<constraint firstItem="96" firstAttribute="top" secondItem="499" secondAttribute="bottom" constant="10" id="KjC-p2-9ji"/>
<constraint firstItem="499" firstAttribute="leading" secondItem="497" secondAttribute="trailing" constant="7" id="NE6-BV-leQ"/>
<constraint firstItem="497" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="412" secondAttribute="leading" constant="19" id="NVO-ft-eEw"/>
<constraint firstItem="499" firstAttribute="leading" secondItem="96" secondAttribute="leading" id="P9e-Xc-JBy"/>
<constraint firstItem="499" firstAttribute="leading" secondItem="412" secondAttribute="leading" constant="115" id="Qcx-L6-KTr"/>
<constraint firstItem="97" firstAttribute="top" secondItem="96" secondAttribute="bottom" constant="10" id="SaI-ao-4Gp"/>
<constraint firstItem="418" firstAttribute="leading" secondItem="499" secondAttribute="leading" id="Ut6-J2-loF"/>
<constraint firstItem="101" firstAttribute="firstBaseline" secondItem="97" secondAttribute="firstBaseline" id="ZEV-Of-3eP"/>
<constraint firstItem="101" firstAttribute="baseline" secondItem="97" secondAttribute="baseline" id="ZEV-Of-3eP"/>
<constraint firstItem="497" firstAttribute="baseline" secondItem="501" secondAttribute="baseline" id="b95-3g-uOj"/>
<constraint firstItem="418" firstAttribute="top" secondItem="412" secondAttribute="top" constant="14" id="beP-Nm-QTW"/>
<constraint firstItem="416" firstAttribute="leading" secondItem="412" secondAttribute="leading" constant="35" id="dVU-rd-5Bp"/>
<constraint firstItem="418" firstAttribute="firstBaseline" secondItem="416" secondAttribute="firstBaseline" id="e1f-0e-Vv3"/>
<constraint firstItem="418" firstAttribute="baseline" secondItem="416" secondAttribute="baseline" id="e1f-0e-Vv3"/>
<constraint firstItem="501" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="499" secondAttribute="trailing" constant="3" id="hGQ-If-5fh"/>
<constraint firstItem="ERB-3b-3jA" firstAttribute="leading" secondItem="418" secondAttribute="trailing" id="hNh-Ab-Dl7"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ERB-3b-3jA" secondAttribute="trailing" constant="20" symbolic="YES" id="hTE-qI-LXB"/>
Expand Down
Loading

0 comments on commit 4ee7c62

Please sign in to comment.