diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
| commit | 1e748855652780d225fd113320ffe1bceca5ba8e (patch) | |
| tree | a0b257591ef9f3b4c662165c20ffad120fcdeba1 /app/src/main/res/values-v21/styles.xml | |
| parent | fab7a89f44d59f3c7ea7505ae05a3c8b4c67c0b8 (diff) | |
| parent | 45cf8b1cc3085a575c5a460eb7d8191ee6033da4 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/src/main/res/values-v21/styles.xml')
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 892b6cb0..4379dd6d 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ 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="appstyle" parent="android:Theme.Material.Light.DarkActionBar"> + <style name="blinkt" parent="blinkt.common"> <item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorAccent">@color/accent</item> |