diff options
| author | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
| commit | ac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch) | |
| tree | 044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/main/res/values-v21/styles.xml | |
| parent | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff) | |
| parent | 59985587c758f93844df7600f18c0837c672f259 (diff) | |
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/main/res/values-v21/styles.xml')
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 4379dd6d..fa27ebe8 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,17 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <resources> - <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar" /> + <!-- http://www.google.de/design/spec/style/color.html#color-color-palette --> + <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item> + </style> + <style name="blinkt.dialog" parent="android:Theme.Material.Light.Dialog"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item> + </style> - <!-- http://www.google.de/design/spec/style/color.html#color-color-palette --> - <style name="blinkt" parent="blinkt.common"> + <style name="blinkt.alertDialog" parent="android:Theme.Material.Light.Dialog.Alert"> <item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorAccent">@color/accent</item> </style> + </resources> |