diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-04 16:35:40 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-04 16:35:40 +0100 |
| commit | ca0d68224ec804cac739ed955390aa7f6a585856 (patch) | |
| tree | e0e8cb976fbac953e49be6f391b053502d5a9fc6 /src/main/res/values | |
| parent | 274a689dce6b903674cc738159bb112dcad17800 (diff) | |
| parent | 96e6604d9eed10d08534ddb6c7a33b7ec9dfc68e (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/colors.xml | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 2c3b9f78..9cef1b0a 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -2,17 +2,24 @@ <resources> <color name="primaryBackground">@color/grey50</color> <color name="secondaryBackground">@color/grey200</color> - <color name="green500">#ff259b24</color> - <color name="green700">#ff0a7e07</color> - <color name="accent">#ff0091ea</color> - <color name="black87">#de000000</color> - <color name="black54">#8a000000</color> - <color name="black12">#1f000000</color> - <color name="white">#ffffffff</color> - <color name="white70">#b2ffffff</color> - <color name="grey50">#fffafafa</color> - <color name="grey200">#ffeeeeee</color> - <color name="grey800">#ff424242</color> - <color name="red500">#fff44336</color> - <color name="orange500">#ffff9800</color> + <color name="primaryText">@color/black87</color> + <color name="secondaryText">@color/black54</color> + <color name="warning">@color/red500</color> + <color name="error">@color/red500</color> + <color name="online">@color/green500</color> + <color name="notification">@color/green500</color> + + <color name="green500">#ff259b24</color> + <color name="green700">#ff0a7e07</color> + <color name="accent">#ff0091ea</color> + <color name="black87">#de000000</color> + <color name="black54">#8a000000</color> + <color name="black12">#1f000000</color> + <color name="white">#ffffffff</color> + <color name="white70">#b2ffffff</color> + <color name="grey50">#fffafafa</color> + <color name="grey200">#ffeeeeee</color> + <color name="grey800">#ff424242</color> + <color name="red500">#fff44336</color> + <color name="orange500">#ffff9800</color> </resources>
\ No newline at end of file |