diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-02-26 13:40:23 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-02-26 13:40:23 +0100 |
| commit | 0df440574a3e2a7d357bda800e47491f2a872b76 (patch) | |
| tree | ff9d13fcb1cb44d93a3d9d838a4ba9e5c0f6db6b | |
| parent | ca34b00a94888259c076348f469ef03215c27f8d (diff) | |
| parent | f1c36d669ebc61c8a8c3d385cd201889647c9d5e (diff) | |
| download | mullvadvpn-0df440574a3e2a7d357bda800e47491f2a872b76.tar.xz mullvadvpn-0df440574a3e2a7d357bda800e47491f2a872b76.zip | |
Merge branch 'fix-invalid-unsecured-label-color'
| -rw-r--r-- | ios/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ios/MullvadVPN/ConnectViewController.xib | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index 1525217344..de2ecdd39e 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -26,6 +26,7 @@ Line wrap the file at 100 chars. Th ### Changed - Migrate to WireGuardKit framework. - Fix crash when pasting empty string into account input field. +- Fix invalid initial text color of "unsecured connection" label on iOS 12. ## [2020.5] - 2020-11-04 ### Fixed diff --git a/ios/MullvadVPN/ConnectViewController.xib b/ios/MullvadVPN/ConnectViewController.xib index 2cf50c7cef..ff2f253c22 100644 --- a/ios/MullvadVPN/ConnectViewController.xib +++ b/ios/MullvadVPN/ConnectViewController.xib @@ -31,7 +31,7 @@ <rect key="frame" x="0.0" y="0.0" width="366" height="24"/> <accessibility key="accessibilityConfiguration" identifier="SecureConnectionLabel"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/> - <color key="textColor" name="Success"/> + <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> </label> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="daZ-9L-RFn"> @@ -109,8 +109,5 @@ <namedColor name="Primary"> <color red="0.16078431372549021" green="0.30196078431372547" blue="0.45098039215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </namedColor> - <namedColor name="Success"> - <color red="0.26666666666666666" green="0.67843137254901964" blue="0.30196078431372547" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - </namedColor> </resources> </document> |