diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:18:54 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:18:54 +0100 |
| commit | 32998b046977da5d272a948ad0668bf653d598f4 (patch) | |
| tree | a8f68d5b09d7293ceb35211d2f26f48d4312fcf3 /app/src/main/res/values/colours.xml | |
| parent | 1d37f94a7980d1181a49863cb3880bc7938cc6d1 (diff) | |
| parent | 6ed3fde3ea171700390552dd1040e10e8cc1ca32 (diff) | |
Merge branch 'bug/Release-ConfigurationWizard-differs-from-debug's-#6633' into bug/ButterKnife-doesn't-find-provider_list_view-#6581
Diffstat (limited to 'app/src/main/res/values/colours.xml')
| -rw-r--r-- | app/src/main/res/values/colours.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/src/main/res/values/colours.xml b/app/src/main/res/values/colours.xml index 89fb41dd..f27167f3 100644 --- a/app/src/main/res/values/colours.xml +++ b/app/src/main/res/values/colours.xml @@ -1,13 +1,21 @@ <?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> <!-- Indigo --> <!-- OpenVPN colours #203155, #C66D0D --> - <color name="primary">#3F51B5</color> - <color name="primary_dark">#303F9F</color> - <color name="accent">#FFA726</color> + <color name="primary">#3F51B5</color> <!--500--> + <color name="primary_dark">#303F9F</color> <!--700--> + <color name="accent">#FFA726</color> <!-- Orange 400 --> + <color name="gelb">#ffff00</color> + <color name="rot">#ff0000</color> + + <color name="switchbar">@android:color/darker_gray</color> + + + <color name="background_tab_pressed">#1AFFFFFF</color> + </resources>
\ No newline at end of file |