Merge remote-tracking branch 'origin/master'

c4fa9ba3 · 王海 · 99df8c62 · 7123fa39 · c4fa9ba3
Commit c4fa9ba3 authored Dec 21, 2017 by 王海
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/src/main/res/values/colors.xml app/src/main/res/values/colors.xml +1 -0

No files found.
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
    <color name="black_transparent">#88000000</color>
    <color name="borderYello">#ffa002</color>
    <color name="red900">#B71c1c</color>
+    <color name="bg">#f5f7f9</color>
    <!--提示颜色-->
    <color name="succ">#2484e8</color>
    <color name="error">#fb3b3b</color>