For #24141 - Replace @color/grey_button_color with @color/fx_mobile_action_color_secondary

upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent ef0db6fd12
commit 76c2f1e210

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="@color/grey_button_color" />
<solid android:color="@color/fx_mobile_action_color_secondary" />
</shape>

@ -3,6 +3,6 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/grey_button_color" />
<solid android:color="@color/fx_mobile_action_color_secondary" />
<corners android:radius="@dimen/tab_corner_radius"/>
</shape>

@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:background="@color/grey_button_color">
tools:background="?scrim">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/closeButton"

@ -28,7 +28,7 @@
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_action_color_primary">@color/photonViolet60</color>
<!-- Secondary button -->
<color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_action_color_secondary">@color/photonLightGrey05</color>
<!-- Filter -->
<color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color>
<!-- Chip -->

@ -28,7 +28,7 @@
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_action_color_primary">@color/photonInk20</color>
<!-- Secondary button -->
<color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<color name="fx_mobile_action_color_secondary">@color/photonLightGrey30</color>
<!-- Filter -->
<color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<!-- Chip -->
@ -315,7 +315,6 @@
<color name="ic_launcher_background">#FDFDFD</color>
<!-- Button Colors -->
<color name="grey_button_color">@color/photonLightGrey30</color>
<color name="button_text_color">@color/photonInk20</color>
<!-- Private Browsing Mode Persistent Notification -->

@ -336,7 +336,7 @@
<item name="android:layout_height">48dp</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@color/grey_button_color</item>
<item name="backgroundTint">@color/fx_mobile_action_color_secondary</item>
<item name="android:textColor">@color/button_text_color</item>
<item name="rippleColor">?secondaryText</item>
<item name="android:letterSpacing">0</item>

Loading…
Cancel
Save