diff options
| author | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
| commit | 3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch) | |
| tree | 28738dd90fc41b4ab71897f38d324828778ad2e3 /src/main/res/values/colors.xml | |
| parent | 72114d732427266024cdd6e27cd8d1aa60afae2f (diff) | |
| parent | f28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/values/colors.xml')
| -rw-r--r-- | src/main/res/values/colors.xml | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 9cef1b0a..2d744395 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -9,17 +9,22 @@ <color name="online">@color/green500</color> <color name="notification">@color/green500</color> - <color name="green500">#ff259b24</color> + <color name="primary">@color/green500</color> + <color name="primary_dark">@color/green700</color> + <color name="accent">#ff0091ea</color> + <color name="black87">#de000000</color> + <color name="black54">#8a000000</color> + <color name="black26">#42000000</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="grey500">#ff9e9e9e</color> + <color name="grey800">#ff424242</color> + <color name="red500">#fff44336</color> + <color name="red800">#ffc62828</color> + <color name="orange500">#ffff9800</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 |