Merge remote-tracking branch 'origin/master'

zuoxiao

9 天以前 f4fc58196bd246272bf755a767660c03f573cbc6

 generallibrary/src/main/res/values/colors.xml

@@ -4,5 +4,9 @@
    <color name="black">#333</color>
    <color name="white">#fff</color>
    <color name="nav_item_color">#555555</color>

    <color name="base_list_bg">@color/base_green_bg</color>
    <color name="green">#32CD32</color>
    <color name="blue">#007BFF</color>
    <color name="grey">#808080</color>
    <color name="light_grey">#E0E0E0</color>
</resources>