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/themes.xml | |
| 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/themes.xml')
| -rw-r--r-- | app/src/main/res/values/themes.xml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f3c55f41..51a8ea0e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,7 +2,7 @@ <resources> <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="textColorError">@color/colorError</item> @@ -11,18 +11,13 @@ <!-- button and controls --> <item name="android:buttonStyle">@style/BitmaskButton</item> - <item name="colorButtonNormal">@color/colorPrimaryDark</item> - <item name="colorControlHighlight">@color/colorPrimaryDark</item> + <item name="buttonStyle">@style/BitmaskButton</item> </style> <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="android:windowBackground">@drawable/splash_page</item> </style> - <style name="foo"> - <item name="textColorError">@color/colorPrimary</item> - </style> - </resources> |