# Conflicts:
#	app/src/main/res/layout/view_search.xml
pull/160/head
yangyxd 5 years ago
commit e6ddb8d9ec
  1. 1
      app/src/main/res/values-night/colors.xml
  2. 1
      app/src/main/res/values/colors.xml

@ -10,6 +10,7 @@
<color name="night_mask">#69000000</color> <color name="night_mask">#69000000</color>
<color name="transparent10">#10ffffff</color>
<color name="transparent30">#30ffffff</color> <color name="transparent30">#30ffffff</color>
<color name="transparent10">#10ffffff</color> <color name="transparent10">#10ffffff</color>

@ -18,6 +18,7 @@
<color name="background_menu">@color/md_grey_200</color> <color name="background_menu">@color/md_grey_200</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="transparent10">#10000000</color>
<color name="transparent30">#30000000</color> <color name="transparent30">#30000000</color>
<color name="transparent10">#10000000</color> <color name="transparent10">#10000000</color>

Loading…
Cancel
Save