Merge branch 'master' into new-bottom-bar
This commit is contained in:
commit
70a6491f32
6 changed files with 21 additions and 688 deletions
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<color name="pink_A200">#ff4081</color>
|
||||
<color name="indigo_500">#3f51b5</color>
|
||||
<color name="pink_A400">#F50057</color>
|
||||
<color name="indigo_500">#3F51B5</color>
|
||||
|
||||
<color name="grey_700">#616161</color>
|
||||
<color name="grey_900">#212121</color>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue