Merge remote-tracking branch 'origin/development_of_the_nord_theme' into development_of_the_nord_theme
# Conflicts: # mastodon/src/main/res/values/colors.xml
This commit is contained in:
commit
29b8cedc7c
|
@ -305,7 +305,7 @@
|
|||
<color name="nord_primary_800">#3b4252</color>
|
||||
<color name="nord_primary_900">#2e3440</color>
|
||||
|
||||
<color name="nord_gray_900">#282F3A</color>
|
||||
<color name="nord_gray_900">#3B4252</color>
|
||||
<color name="nord_gray_800t">#cc2D343F</color>
|
||||
<color name="nord_gray_800">#2D343F</color>
|
||||
<color name="nord_gray_700">#3A4250</color>
|
||||
|
|
Loading…
Reference in New Issue