Skip to content

Commit

Permalink
fix(themes): fix purple light theme bottom bar pills being slightly off
Browse files Browse the repository at this point in the history
  • Loading branch information
@LucasGGamerM
LucasGGamerM committed Sep 17, 2023
1 parent de1a3fb commit f0b2a25
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
48 changes: 24 additions & 24 deletions mastodon/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@
<color name="gray_50">#f5f5f9</color>
<color name="gray_25">#f7f8fa</color>

<color name="primary_25">#fffafd</color>
<color name="primary_50">#fbeaf6</color>
<color name="primary_100">#f7d4ee</color>
<color name="primary_200">#f4bfe7</color>
<color name="primary_300">#f0aade</color>
<color name="primary_400">#ec94d6</color>
<color name="primary_500">#e780cd</color>
<color name="primary_600">#e055bd</color>
<color name="primary_700">#d92aad</color>
<color name="primary_800">#ae218a</color>
<color name="primary_900">#6d1556</color>
<color name="primary_25">#fafaff</color>
<color name="primary_50">#f4f3ff</color>
<color name="primary_100">#d7d7ff</color>
<color name="primary_200">#c7c7ff</color>
<color name="primary_300">#c2c2ff</color>
<color name="primary_400">#9999ff</color>
<color name="primary_500">#6364ff</color>
<color name="primary_600">#562cfc</color>
<color name="primary_700">#431cbb</color>
<color name="primary_800">#2f0c7a</color>
<color name="primary_900">#17063b</color>


<color name="error_25">#FFFBFA</color>
<color name="error_50">#FEF3F2</color>
Expand Down Expand Up @@ -96,7 +97,7 @@
<color name="bookmark_selected">@color/success_500</color>

<color name="shortcut_icon_background">@color/gray_25</color>
<color name="shortcut_icon_foreground">@color/purple_primary_400</color>
<color name="shortcut_icon_foreground">@color/primary_400</color>

<!-- M3 dynamic colors -->
<color name="m3_navigation_bar_bg">@color/gray_50</color>
Expand Down Expand Up @@ -211,18 +212,17 @@


<!-- PALETTE COLORS -->

<color name="purple_primary_25">#fafaff</color>
<color name="purple_primary_50">#f4f3ff</color>
<color name="purple_primary_100">#ebebff</color>
<color name="purple_primary_200">#d7d7ff</color>
<color name="purple_primary_300">#c2c2ff</color>
<color name="purple_primary_400">#9999ff</color>
<color name="purple_primary_500">#6364ff</color>
<color name="purple_primary_600">#562cfc</color>
<color name="purple_primary_700">#431cbb</color>
<color name="purple_primary_800">#2f0c7a</color>
<color name="purple_primary_900">#17063b</color>
<color name="pink_primary_25">#fffafd</color>
<color name="pink_primary_50">#fbeaf6</color>
<color name="pink_primary_100">#f7d4ee</color>
<color name="pink_primary_200">#f4bfe7</color>
<color name="pink_primary_300">#f0aade</color>
<color name="pink_primary_400">#ec94d6</color>
<color name="pink_primary_500">#e780cd</color>
<color name="pink_primary_600">#e055bd</color>
<color name="pink_primary_700">#d92aad</color>
<color name="pink_primary_800">#ae218a</color>
<color name="pink_primary_900">#6d1556</color>

<color name="green_primary_25">#fafaff</color>
<color name="green_primary_50">#d1feaf</color>
Expand Down
28 changes: 14 additions & 14 deletions mastodon/src/main/res/values/palettes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,20 @@
</style>

<style name="ColorPalette.Pink">
<item name="colorPrimary25">@color/pink_primary_25</item>
<item name="colorPrimary50">@color/pink_primary_50</item>
<item name="colorPrimary100">@color/pink_primary_100</item>
<item name="colorPrimary200">@color/pink_primary_200</item>
<item name="colorPrimary300">@color/pink_primary_300</item>
<item name="colorPrimary400">@color/pink_primary_400</item>
<item name="colorPrimary500">@color/pink_primary_500</item>
<item name="colorPrimary600">@color/pink_primary_600</item>
<item name="colorPrimary700">@color/pink_primary_700</item>
<item name="colorPrimary800">@color/pink_primary_800</item>
<item name="colorPrimary900">@color/pink_primary_900</item>
</style>

<style name="ColorPalette.Purple">
<item name="colorPrimary25">@color/primary_25</item>
<item name="colorPrimary50">@color/primary_50</item>
<item name="colorPrimary100">@color/primary_100</item>
Expand All @@ -300,20 +314,6 @@
<item name="colorPrimary900">@color/primary_900</item>
</style>

<style name="ColorPalette.Purple">
<item name="colorPrimary25">@color/purple_primary_25</item>
<item name="colorPrimary50">@color/purple_primary_50</item>
<item name="colorPrimary100">@color/purple_primary_100</item>
<item name="colorPrimary200">@color/purple_primary_200</item>
<item name="colorPrimary300">@color/purple_primary_300</item>
<item name="colorPrimary400">@color/purple_primary_400</item>
<item name="colorPrimary500">@color/purple_primary_500</item>
<item name="colorPrimary600">@color/purple_primary_600</item>
<item name="colorPrimary700">@color/purple_primary_700</item>
<item name="colorPrimary800">@color/purple_primary_800</item>
<item name="colorPrimary900">@color/purple_primary_900</item>
</style>

<style name="ColorPalette.Green">
<item name="colorPrimary25">@color/green_primary_25</item>
<item name="colorPrimary50">@color/green_primary_50</item>
Expand Down

0 comments on commit f0b2a25

Please sign in to comment.