diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-09 10:17:45 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-09 10:17:45 +0200 |
| commit | 998a616eff0c90019028f84bcbe90b90d7e57235 (patch) | |
| tree | cc770462adcf4353167c1df617e7e3b362ad4167 | |
| parent | 2a478d7674c8754477d02dc8d221d7466e95702b (diff) | |
| parent | 63a1045f04e2959a66daa68937fdc770688370a4 (diff) | |
| download | mullvadvpn-998a616eff0c90019028f84bcbe90b90d7e57235.tar.xz mullvadvpn-998a616eff0c90019028f84bcbe90b90d7e57235.zip | |
Merge branch 'fix-header-alpha-mobile'
| -rw-r--r-- | android/src/main/res/drawable/icon_settings.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/Base.lproj/Main.storyboard | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/res/drawable/icon_settings.xml b/android/src/main/res/drawable/icon_settings.xml index 8c88a6d2b9..5bda5b640f 100644 --- a/android/src/main/res/drawable/icon_settings.xml +++ b/android/src/main/res/drawable/icon_settings.xml @@ -7,7 +7,7 @@ android:pathData="M21.2552,12C21.2552,12.408 21.2182,12.792 21.1688,13.176L23.7719,15.156C24.0063,15.336 24.068,15.66 23.9199,15.924L21.4526,20.076C21.3045,20.34 20.9838,20.448 20.7001,20.34L17.6282,19.14C16.9867,19.608 16.2959,20.016 15.5433,20.316L15.0745,23.496C15.0375,23.784 14.7785,24 14.4701,24L9.5354,24C9.227,24 8.9679,23.784 8.9309,23.496L8.4621,20.316C7.7096,20.016 7.0187,19.62 6.3772,19.14L3.3054,20.34C3.034,20.436 2.7009,20.34 2.5529,20.076L0.0855,15.924C-0.0625,15.66 -0.0008,15.336 0.2336,15.156L2.8366,13.176C2.7873,12.792 2.7502,12.396 2.7502,12C2.7502,11.604 2.7873,11.208 2.8366,10.824L0.2336,8.844C-0.0008,8.664 -0.0748,8.34 0.0855,8.076L2.5529,3.924C2.7009,3.66 3.0217,3.552 3.3054,3.66L6.3772,4.86C7.0187,4.392 7.7096,3.984 8.4621,3.684L8.9309,0.504C8.9679,0.216 9.227,0 9.5354,0L14.4701,0C14.7785,0 15.0375,0.216 15.0745,0.504L15.5433,3.684C16.2959,3.984 16.9867,4.38 17.6282,4.86L20.7001,3.66C20.9715,3.564 21.3046,3.66 21.4526,3.924L23.9199,8.076C24.068,8.34 24.0063,8.664 23.7719,8.844L21.1688,10.824C21.2182,11.208 21.2552,11.592 21.2552,12ZM12,17C14.7571,17 17,14.7571 17,12C17,9.2429 14.7571,7 12,7C9.2429,7 7,9.2429 7,12C7,14.7571 9.2429,17 12,17Z" android:strokeWidth="1" android:fillColor="#FFFFFF" - android:fillAlpha="0.6" + android:fillAlpha="0.8" android:fillType="evenOdd" android:strokeColor="#00000000"/> </vector> diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 5c7849c23e..8b0629db43 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="8dp" android:layout_marginVertical="12dp" - android:textColor="@color/white60" + android:textColor="@color/white80" android:textSize="24sp" android:textStyle="bold" android:text="@string/app_name" diff --git a/ios/MullvadVPN/Base.lproj/Main.storyboard b/ios/MullvadVPN/Base.lproj/Main.storyboard index 6a9a7713d3..911e1634a6 100644 --- a/ios/MullvadVPN/Base.lproj/Main.storyboard +++ b/ios/MullvadVPN/Base.lproj/Main.storyboard @@ -38,7 +38,7 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MULLVAD VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dqy-A0-TdV"> <rect key="frame" x="36" y="42" width="168" height="29"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/> - <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + <color key="textColor" white="1" alpha="0.80" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> </label> </subviews> |