diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-05-29 13:12:25 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-05-29 15:14:17 +0200 |
| commit | 193c1b756ee566c173f2c1e35ae97c0577ce566d (patch) | |
| tree | 57a7c7f96dd255ffad7e12807f499f3248135e29 | |
| parent | 0a518ef0870255da5ea17ab9886459f6bf661d13 (diff) | |
| download | mullvadvpn-193c1b756ee566c173f2c1e35ae97c0577ce566d.tar.xz mullvadvpn-193c1b756ee566c173f2c1e35ae97c0577ce566d.zip | |
Fix the header bar margin
| -rw-r--r-- | ios/MullvadVPN/Base.lproj/Main.storyboard | 6 | ||||
| -rw-r--r-- | ios/MullvadVPN/RootContainerViewController.swift | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ios/MullvadVPN/Base.lproj/Main.storyboard b/ios/MullvadVPN/Base.lproj/Main.storyboard index 1d6c995459..6a9a7713d3 100644 --- a/ios/MullvadVPN/Base.lproj/Main.storyboard +++ b/ios/MullvadVPN/Base.lproj/Main.storyboard @@ -29,7 +29,7 @@ <rect key="frame" x="12" y="48.5" width="16" height="16"/> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uXv-Tf-PET"> - <rect key="frame" x="335" y="45.5" width="16" height="22"/> + <rect key="frame" x="343" y="45.5" width="16" height="22"/> <state key="normal" image="IconSettings"/> <connections> <segue destination="Kqv-qu-mfF" kind="presentation" identifier="ShowSettings" id="cxu-NC-VeP"/> @@ -49,11 +49,11 @@ <constraint firstAttribute="bottomMargin" secondItem="dqy-A0-TdV" secondAttribute="bottom" constant="22" id="YTk-xg-wIk"/> <constraint firstItem="uXv-Tf-PET" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dqy-A0-TdV" secondAttribute="trailing" constant="8" symbolic="YES" id="ZEb-xZ-1ga"/> <constraint firstItem="uXv-Tf-PET" firstAttribute="centerY" secondItem="dqy-A0-TdV" secondAttribute="centerY" id="gCl-OS-ONw"/> - <constraint firstItem="cKg-hE-JsS" firstAttribute="leading" secondItem="cw4-px-5hC" secondAttribute="leadingMargin" constant="-12" id="hGJ-yd-hnp"/> + <constraint firstItem="cKg-hE-JsS" firstAttribute="leading" secondItem="cw4-px-5hC" secondAttribute="leadingMargin" id="hGJ-yd-hnp"/> <constraint firstItem="dqy-A0-TdV" firstAttribute="top" secondItem="cw4-px-5hC" secondAttribute="topMargin" constant="22" id="mMF-ha-mRO"/> <constraint firstItem="dqy-A0-TdV" firstAttribute="leading" secondItem="cKg-hE-JsS" secondAttribute="trailing" constant="8" id="q8s-25-ASt"/> </constraints> - <edgeInsets key="layoutMargins" top="20" left="24" bottom="0.0" right="24"/> + <edgeInsets key="layoutMargins" top="20" left="12" bottom="0.0" right="16"/> </view> </subviews> <color key="backgroundColor" red="0.16078431369999999" green="0.30196078430000001" blue="0.45098039220000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> diff --git a/ios/MullvadVPN/RootContainerViewController.swift b/ios/MullvadVPN/RootContainerViewController.swift index 18fbb91302..7d1990e507 100644 --- a/ios/MullvadVPN/RootContainerViewController.swift +++ b/ios/MullvadVPN/RootContainerViewController.swift @@ -273,9 +273,6 @@ class RootContainerViewController: UIViewController { var layoutMargins = headerBarView.layoutMargins layoutMargins.top = offsetTop - layoutMargins.left = view.layoutMargins.left - layoutMargins.right = view.layoutMargins.right - layoutMargins.bottom = 0 if layoutMargins != headerBarView.layoutMargins { headerBarView.layoutMargins = layoutMargins |