Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23086 - Rename design token name from Border Default to Border Form Default

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-06 19:30:18 -05:00 committed by mergify[bot]
parent 96ce53ae8f
commit f97de9afe4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
View File

@ -81,7 +81,7 @@ private val darkColorPalette = FirefoxColors(
iconAccentYellow = PhotonColors.Yellow20,
iconGradientStart = PhotonColors.Violet20,
iconGradientEnd = PhotonColors.Blue20,
borderDefault = PhotonColors.LightGrey05,
borderFormDefault = PhotonColors.LightGrey05,
borderSelected = PhotonColors.Violet40,
borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red40,
@ -129,7 +129,7 @@ private val lightColorPalette = FirefoxColors(
iconAccentYellow = PhotonColors.Yellow60,
iconGradientStart = PhotonColors.Violet50,
iconGradientEnd = PhotonColors.Blue60,
borderDefault = PhotonColors.DarkGrey90,
borderFormDefault = PhotonColors.DarkGrey90,
borderSelected = PhotonColors.Ink20,
borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red80,
@ -182,7 +182,7 @@ class FirefoxColors(
iconAccentYellow: Color,
iconGradientStart: Color,
iconGradientEnd: Color,
borderDefault: Color,
borderFormDefault: Color,
borderSelected: Color,
borderDisabled: Color,
borderWarning: Color,
@ -314,7 +314,7 @@ class FirefoxColors(
// Border
// Form parts
var borderDefault by mutableStateOf(borderDefault)
var borderFormDefault by mutableStateOf(borderFormDefault)
private set
// Selected tab
var borderSelected by mutableStateOf(borderSelected)
@ -369,7 +369,7 @@ class FirefoxColors(
iconAccentYellow = other.iconAccentYellow
iconGradientStart = other.iconGradientStart
iconGradientEnd = other.iconGradientEnd
borderDefault = other.borderDefault
borderFormDefault = other.borderFormDefault
borderSelected = other.borderSelected
borderDisabled = other.borderDisabled
borderWarning = other.borderWarning
@ -417,7 +417,7 @@ class FirefoxColors(
iconAccentYellow = iconAccentYellow,
iconGradientStart = iconGradientStart,
iconGradientEnd = iconGradientEnd,
borderDefault = borderDefault,
borderFormDefault = borderFormDefault,
borderSelected = borderSelected,
borderDisabled = borderDisabled,
borderWarning = borderWarning,

2
app/src/main/res/values-night/colors.xml
View File

@ -86,7 +86,7 @@
<!-- Border -->
<!-- Form parts -->
<color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Selected tab -->
<color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
<!-- Form parts -->

2
app/src/main/res/values/colors.xml
View File

@ -86,7 +86,7 @@
<!-- Border -->
<!-- Form parts -->
<color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Selected tab -->
<color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonInk20</color>
<!-- Form parts -->