diff options
| author | cyberta <cyberta@riseup.net> | 2019-07-12 07:50:59 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-07-12 07:50:59 -0700 |
| commit | 144244cab15014d495985f396c618729209a8f8a (patch) | |
| tree | f00ca9565e5e7c27f1019b637b82caee026fd049 /app/src/main/res/values-v21 | |
| parent | 7ac4446d834786b0139cb8565b22279ed6955d42 (diff) | |
| parent | ce69a6c81f69801c20ac9e05faa86f5d4db4ba44 (diff) | |
Merge branch 'UI_tweaks' into 'master'
Ui tweaks
See merge request leap/bitmask_android!90
Diffstat (limited to 'app/src/main/res/values-v21')
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/values-v21/themes.xml | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9f36e474..50070e6d 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -26,15 +26,5 @@ <item name="android:colorAccent">@color/accent</item> </style> - <style name="BitmaskButton" parent="android:Widget.Button"> - <item name="android:textAllCaps">true</item> - <item name="android:backgroundTint">@color/colorPrimary</item> - </style> - - <style name="BitmaskButtonBlack" parent="android:Widget.Button"> - <item name="android:textAllCaps">true</item> - <item name="android:backgroundTint">@color/black800</item> - <item name="android:textColor">@color/white</item> - </style> </resources> diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index d6145217..0a426ced 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -17,7 +17,7 @@ <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> <item name="android:colorPrimary">@color/colorPrimary</item> - <item name="android:colorPrimaryDark">@color/colorPrimary</item> + <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item> <item name="android:windowBackground">@drawable/splash_page</item> </style> |