2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00

[fenix] For https://github.com/mozilla-mobile/fenix/issues/22675 - Replace collection color icon variables with the icon design color tokens

This commit is contained in:
Gabriel Luong 2021-12-02 23:12:57 -05:00 committed by mergify[bot]
parent 2c78eff1d3
commit b4037b4851
2 changed files with 15 additions and 27 deletions

View File

@ -74,11 +74,11 @@
<!-- Icon button --> <!-- Icon button -->
<color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color> <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
<color name="fx_mobile_icon_color_accent_violet" tools:ignore="UnusedResources">@color/photonViolet20</color> <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet20</color>
<color name="fx_mobile_icon_color_accent_blue" tools:ignore="UnusedResources">@color/photonBlue20</color> <color name="fx_mobile_icon_color_accent_blue">@color/photonBlue20</color>
<color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink20</color> <color name="fx_mobile_icon_color_accent_pink">@color/photonPink20</color>
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen20</color> <color name="fx_mobile_icon_color_accent_green">@color/photonGreen20</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow20</color> <color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow20</color>
<!-- Reader, ETP Shield --> <!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color> <color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color>
<!-- Reader, ETP Shield --> <!-- Reader, ETP Shield -->
@ -166,13 +166,6 @@
<color name="top_site_pin_icon_color">@color/photonLightGrey20</color> <color name="top_site_pin_icon_color">@color/photonLightGrey20</color>
<color name="top_sites_border_color">@color/photonDarkGrey90</color> <color name="top_sites_border_color">@color/photonDarkGrey90</color>
<!-- Collection icons-->
<color name="collection_icon_color_violet">@color/photonViolet40</color>
<color name="collection_icon_color_blue">@color/photonBlue30</color>
<color name="collection_icon_color_pink">@color/photonPink30</color>
<color name="collection_icon_color_green">#88FFD1</color>
<color name="collection_icon_color_yellow">#FFDE67</color>
<!-- Search Widget --> <!-- Search Widget -->
<color name="search_widget_background">@color/inset_normal_theme</color> <color name="search_widget_background">@color/inset_normal_theme</color>
<color name="search_widget_mic_fill_color">@color/photonLightGrey05</color> <color name="search_widget_mic_fill_color">@color/photonLightGrey05</color>

View File

@ -74,11 +74,11 @@
<!-- Icon button --> <!-- Icon button -->
<color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonInk20</color> <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonInk20</color>
<color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color> <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
<color name="fx_mobile_icon_color_accent_violet" tools:ignore="UnusedResources">@color/photonViolet60</color> <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet60</color>
<color name="fx_mobile_icon_color_accent_blue" tools:ignore="UnusedResources">@color/photonBlue60</color> <color name="fx_mobile_icon_color_accent_blue">@color/photonBlue60</color>
<color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink60</color> <color name="fx_mobile_icon_color_accent_pink">@color/photonPink60</color>
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen60</color> <color name="fx_mobile_icon_color_accent_green">@color/photonGreen60</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow60</color> <color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow60</color>
<!-- Reader, ETP Shield --> <!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color> <color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color>
<!-- Reader, ETP Shield --> <!-- Reader, ETP Shield -->
@ -268,17 +268,12 @@
<color name="top_sites_border_color">@color/photonLightGrey30</color> <color name="top_sites_border_color">@color/photonLightGrey30</color>
<!-- Collection icons--> <!-- Collection icons-->
<color name="collection_icon_color_violet">@color/photonViolet60</color>
<color name="collection_icon_color_blue">@color/photonBlue60</color>
<color name="collection_icon_color_pink">@color/photonPink60</color>
<color name="collection_icon_color_green">@color/photonGreen60</color>
<color name="collection_icon_color_yellow">@color/photonYellow60</color>
<array name="collection_icon_colors"> <array name="collection_icon_colors">
<item>@color/collection_icon_color_violet</item> <item>@color/fx_mobile_icon_color_accent_violet</item>
<item>@color/collection_icon_color_blue</item> <item>@color/fx_mobile_icon_color_accent_blue</item>
<item>@color/collection_icon_color_pink</item> <item>@color/fx_mobile_icon_color_accent_pink</item>
<item>@color/collection_icon_color_green</item> <item>@color/fx_mobile_icon_color_accent_green</item>
<item>@color/collection_icon_color_yellow</item> <item>@color/fx_mobile_icon_color_accent_yellow</item>
</array> </array>
<!-- Quick action buttons--> <!-- Quick action buttons-->