For #22842 - Use gradient color tokens for Reader mode gradient

upstream-sync
Gabriel Luong 3 years ago committed by mergify[bot]
parent 0a5061d3c0
commit 59a17894f2

@ -17,8 +17,8 @@
android:startY="0"
android:endX="0"
android:endY="24"
android:startColor="?readerModeStartGradient"
android:endColor="?readerModeEndGradient"/>
android:startColor="@color/fx_mobile_icon_color_gradient_start"
android:endColor="@color/fx_mobile_icon_color_gradient_end"/>
</aapt:attr>
</path>
<path
@ -30,8 +30,8 @@
android:startY="0"
android:endX="0"
android:endY="24"
android:startColor="?readerModeStartGradient"
android:endColor="?readerModeEndGradient"/>
android:startColor="@color/fx_mobile_icon_color_gradient_start"
android:endColor="@color/fx_mobile_icon_color_gradient_end"/>
</aapt:attr>
</path>
</vector>

@ -76,9 +76,9 @@
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen20</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow20</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet20</color>
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_end" tools:ignore="UnusedResources">@color/photonBlue20</color>
<color name="fx_mobile_icon_color_gradient_end">@color/photonBlue20</color>
<!-- Border -->
<!-- Form parts -->
@ -126,8 +126,6 @@
<color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/accent_normal_theme</color>
<color name="add_on_private_browsing_interior_icon_background_normal_theme">@color/photonWhite</color>
<color name="prompt_login_edit_text_cursor_color_normal_theme">@color/photonViolet50</color>
<color name="readermode_start_gradient_normal_theme">@color/photonViolet30</color>
<color name="readermode_end_gradient_normal_theme">@color/photonBlue30</color>
<color name="search_suggestion_indicator_icon_color_normal_theme">@color/photonGreen60</color>
<color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/photonBlue40</color>
<color name="select_login_header_normal_theme">@color/accent_high_contrast_dark_theme</color>

@ -51,8 +51,6 @@
<attr name="onboardingDeselected" format="reference"/>
<attr name="addOnPrivateBrowsingExteriorCircleBackground" format="reference"/>
<attr name="addOnPrivateBrowsingInteriorIconBackground" format="reference"/>
<attr name="readerModeStartGradient" format="reference"/>
<attr name="readerModeEndGradient" format="reference"/>
<attr name="awesomeBarIndicatorColor" format="reference|color"/>
<attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/>

@ -76,9 +76,9 @@
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen60</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow60</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet50</color>
<color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_end" tools:ignore="UnusedResources">@color/photonBlue60</color>
<color name="fx_mobile_icon_color_gradient_end">@color/photonBlue60</color>
<!-- Border -->
<!-- Form parts -->
@ -136,8 +136,6 @@
<color name="accent_bright_light_theme">@color/photonViolet70</color>
<color name="dark_grey_90_gradient_start">@color/photonDarkGrey90</color>
<color name="dark_grey_90_gradient_end">#0015141A</color>
<color name="readermode_start_gradient_normal_theme">@color/photonViolet50</color>
<color name="readermode_end_gradient_normal_theme">@color/photonBlue60</color>
<color name="preference_section_header_normal_theme">@color/accent_bright_light_theme</color>
<color name="mozac_widget_favicon_background_light_theme">@color/photonWhite</color>

@ -73,8 +73,6 @@
<item name="addOnPrivateBrowsingExteriorCircleBackground">@color/add_on_private_browsing_exterior_circle_background_normal_theme</item>
<item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_normal_theme</item>
<item name="mozacPromptLoginEditTextCursorColor">@color/prompt_login_edit_text_cursor_color_normal_theme</item>
<item name="readerModeStartGradient">@color/readermode_start_gradient_normal_theme</item>
<item name="readerModeEndGradient">@color/readermode_end_gradient_normal_theme</item>
<item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_normal_theme</item>
<item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_normal_theme</item>
<item name="selectLoginHeaderTextColor">@color/select_login_header_normal_theme</item>

Loading…
Cancel
Save