diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-23 20:09:25 +0100 |
| commit | 44b59b984f76da62d409b585047224cb1e958016 (patch) | |
| tree | 1a8d7f85690ce56196855fa969e86b1e53d813f3 /app/src/main/res/values-v21/styles.xml | |
| parent | b3f0c7b3111efc1066423925b02a9edf9e15eaa7 (diff) | |
| parent | d6190becb1c48ee912b11a4206116d0fd4c90772 (diff) | |
Merge branch 'bug/Try-different-ports-to-connect-to-the-openvpn-server-#6560' into 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> |