Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-04-04 09:30:02 +02:00
commit ca01f5e363
2 changed files with 2 additions and 1 deletions

View file

@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/download_pressed_light"/> <item android:state_selected="true" android:drawable="@color/download_pressed_light"/>
<item android:state_pressed="true" android:drawable="@color/download_pressed_light"/> <item android:state_pressed="true" android:drawable="@color/download_pressed_light"/>
<item android:drawable="@color/tool_bar_color_light"/> <item android:drawable="@color/tool_bar_orange_color_light"/>
</selector> </selector>

View file

@ -94,6 +94,7 @@
<color name="tool_bar_color_dark">#CC080B0D</color> <color name="tool_bar_color_dark">#CC080B0D</color>
<color name="actionbar_light_color">#ff8f00</color> <color name="actionbar_light_color">#ff8f00</color>
<color name="tool_bar_color_light">#CC080B0D</color> <color name="tool_bar_color_light">#CC080B0D</color>
<color name="tool_bar_orange_color_light">#b4ff8f00</color>
<color name="download_pressed_light">#8cff8f00</color> <color name="download_pressed_light">#8cff8f00</color>
<color name="download_pressed_dark">#be39464d</color> <color name="download_pressed_dark">#be39464d</color>