vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 04:12:08 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android

Browse source
This commit is contained in:
vanitasvitae 2016-08-02 23:58:51 +02:00
commit a1a2750da8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/values/color.xml
View file

@ -5,9 +5,9 @@
<color name="colorAccent">@color/accent</color> <color name="colorAccent">@color/accent</color>
<!-- Colors from Palette --> <!-- Colors from Palette -->
<color name="primary">#608b6f</color> <color name="primary">#608b6f</color> <!-- #607d8b -->
<color name="primary_dark">#607d8b</color> <color name="primary_dark">#608b6f</color> <!-- #607d8b -->
<color name="accent">#B89D92</color> <color name="accent">#8b685b</color> <!-- #4CAF50 -->
<!-- End colors from Palette --> <!-- End colors from Palette -->
<color name="fab_big">@color/accent</color> <color name="fab_big">@color/accent</color>

2
app/src/main/res/values/strings-preferences.xml
View file

@ -78,7 +78,7 @@
<string name="pref_desc__clear_cache">Clear WebView cache</string> <string name="pref_desc__clear_cache">Clear WebView cache</string>
<string name="pref_desc__intellihide_toolbars" translatable="false">Hide top and bottom toolbars automatically while scrolling</string> <string name="pref_desc__intellihide_toolbars">Hide top and bottom toolbars automatically while scrolling</string>
<string name="pref_title__intellihide_toolbars">Intellihide Toolbars</string> <string name="pref_title__intellihide_toolbars">Intellihide Toolbars</string>
<string name="pref_title__append_shared_via_app">Append shared-by-notice</string> <string name="pref_title__append_shared_via_app">Append shared-by-notice</string>