Skip to content

Commit 7d0efc5

Browse files
Merge pull request thunderbird#9528 from rafaeltonholo/chore/9312/adjust-thunderbird-extra-colours
chore(design-system): adjust thunderbird extra colours
2 parents 42d4a8b + 6d57262 commit 7d0efc5

2 files changed

Lines changed: 50 additions & 50 deletions

File tree

  • core/ui/compose/theme2
    • k9mail/src/main/kotlin/app/k9mail/core/ui/compose/theme2/k9mail
    • thunderbird/src/main/kotlin/app/k9mail/core/ui/compose/theme2/thunderbird

core/ui/compose/theme2/k9mail/src/main/kotlin/app/k9mail/core/ui/compose/theme2/k9mail/ThemeColors.kt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ internal val lightThemeColorScheme = ThemeColorScheme(
1919
tertiaryContainer = Color(color = 0xFF685C8E),
2020
onTertiaryContainer = Color(color = 0xFFFFFFFF),
2121

22-
error = Color(color = 0xFFA0000E),
22+
error = Color(color = 0xFF7F1D1D),
2323
onError = Color(color = 0xFFFFFFFF),
24-
errorContainer = Color(color = 0xFFDC2626),
25-
onErrorContainer = Color(color = 0xFFFFFFFF),
24+
errorContainer = Color(color = 0xFFFEF2F2),
25+
onErrorContainer = Color(color = 0xFF7F1D1D),
2626

2727
surfaceDim = Color(color = 0xFFDCD9D9),
2828
surface = Color(color = 0xFFFCF8F8),
@@ -45,20 +45,20 @@ internal val lightThemeColorScheme = ThemeColorScheme(
4545

4646
scrim = Color.Black,
4747

48-
info = Color(color = 0xFFCAA204),
48+
info = Color(color = 0xFF004F9B),
4949
onInfo = Color(color = 0xFFFFFFFF),
50-
infoContainer = Color(color = 0xFFFACC15),
51-
onInfoContainer = Color(color = 0xFFFFFFFF),
50+
infoContainer = Color(color = 0xFFF0F8FF),
51+
onInfoContainer = Color(color = 0xFF004F9B),
5252

5353
success = Color(color = 0xFF194E2C),
5454
onSuccess = Color(color = 0xFFFFFFFF),
55-
successContainer = Color(color = 0xFF1D783B),
56-
onSuccessContainer = Color(color = 0xFFFFFFFF),
55+
successContainer = Color(color = 0xFFF4F9F4),
56+
onSuccessContainer = Color(color = 0xFF194E2C),
5757

58-
warning = Color(color = 0xFFAA6000),
59-
onWarning = Color(color = 0xFFFFFFFF),
60-
warningContainer = Color(color = 0xFFF09D38),
61-
onWarningContainer = Color(color = 0xFFFFFFFF),
58+
warning = Color(color = 0xFF713F12),
59+
onWarning = Color(color = 0xFFFEFAE8),
60+
warningContainer = Color(color = 0xFFFEFAE8),
61+
onWarningContainer = Color(color = 0xFF713F12),
6262
)
6363

6464
internal val darkThemeColorScheme = ThemeColorScheme(
@@ -77,10 +77,10 @@ internal val darkThemeColorScheme = ThemeColorScheme(
7777
tertiaryContainer = Color(color = 0xFFDDAEBC),
7878
onTertiaryContainer = Color(color = 0xFF43242F),
7979

80-
error = Color(color = 0xFFFFB3AD),
81-
onError = Color(color = 0xFF68000A),
82-
errorContainer = Color(color = 0xFFDA3437),
83-
onErrorContainer = Color(color = 0xFFFFFFFF),
80+
error = Color(color = 0xFFFCA5A5),
81+
onError = Color(color = 0xFF450A0A),
82+
errorContainer = Color(color = 0xFF7F1D1D),
83+
onErrorContainer = Color(color = 0xFFFEF2F2),
8484

8585
surfaceDim = Color(color = 0xFF131314),
8686
surface = Color(color = 0xFF131314),
@@ -103,18 +103,18 @@ internal val darkThemeColorScheme = ThemeColorScheme(
103103

104104
scrim = Color.Black,
105105

106-
info = Color(color = 0xFFFDD847),
107-
onInfo = Color(color = 0xFF423606),
108-
infoContainer = Color(color = 0xFFFEE78A),
109-
onInfoContainer = Color(color = 0xFF423606),
106+
info = Color(color = 0xFFBEE6FF),
107+
onInfo = Color(color = 0xFF002E41),
108+
infoContainer = Color(color = 0xFF262C40),
109+
onInfoContainer = Color(color = 0xFFBEE6FF),
110110

111111
success = Color(color = 0xFF8EE7AA),
112112
onSuccess = Color(color = 0xFF082B16),
113-
successContainer = Color(color = 0xFFC0F2CF),
114-
onSuccessContainer = Color(color = 0xFF082B16),
113+
successContainer = Color(color = 0xFF082B16),
114+
onSuccessContainer = Color(color = 0xFF8EE7AA),
115115

116-
warning = Color(color = 0xFFF09D38),
116+
warning = Color(color = 0xFFFEE78A),
117117
onWarning = Color(color = 0xFF411107),
118-
warningContainer = Color(color = 0xFFAA6000),
119-
onWarningContainer = Color(color = 0xFF411107),
118+
warningContainer = Color(color = 0xFF423606),
119+
onWarningContainer = Color(color = 0xFFFEE78A),
120120
)

core/ui/compose/theme2/thunderbird/src/main/kotlin/app/k9mail/core/ui/compose/theme2/thunderbird/ThemeColors.kt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ internal val lightThemeColorScheme = ThemeColorScheme(
1919
tertiaryContainer = Color(color = 0xFF7B35B8),
2020
onTertiaryContainer = Color(color = 0xFFFFFFFF),
2121

22-
error = Color(color = 0xFFA0000E),
22+
error = Color(color = 0xFF7F1D1D),
2323
onError = Color(color = 0xFFFFFFFF),
24-
errorContainer = Color(color = 0xFFDC2626),
25-
onErrorContainer = Color(color = 0xFFFFFFFF),
24+
errorContainer = Color(color = 0xFFFEF2F2),
25+
onErrorContainer = Color(color = 0xFF7F1D1D),
2626

2727
surfaceDim = Color(color = 0xFFDCD9D9),
2828
surface = Color(color = 0xFFFCF8F8),
@@ -45,20 +45,20 @@ internal val lightThemeColorScheme = ThemeColorScheme(
4545

4646
scrim = Color.Black,
4747

48-
info = Color(color = 0xFFCAA204),
48+
info = Color(color = 0xFF004F9B),
4949
onInfo = Color(color = 0xFFFFFFFF),
50-
infoContainer = Color(color = 0xFFFACC15),
51-
onInfoContainer = Color(color = 0xFFFFFFFF),
50+
infoContainer = Color(color = 0xFFF0F8FF),
51+
onInfoContainer = Color(color = 0xFF004F9B),
5252

5353
success = Color(color = 0xFF194E2C),
5454
onSuccess = Color(color = 0xFFFFFFFF),
55-
successContainer = Color(color = 0xFF1D783B),
56-
onSuccessContainer = Color(color = 0xFFFFFFFF),
55+
successContainer = Color(color = 0xFFF4F9F4),
56+
onSuccessContainer = Color(color = 0xFF194E2C),
5757

58-
warning = Color(color = 0xFFAA6000),
59-
onWarning = Color(color = 0xFFFFFFFF),
60-
warningContainer = Color(color = 0xFFF09D38),
61-
onWarningContainer = Color(color = 0xFFFFFFFF),
58+
warning = Color(color = 0xFF713F12),
59+
onWarning = Color(color = 0xFFFEFAE8),
60+
warningContainer = Color(color = 0xFFFEFAE8),
61+
onWarningContainer = Color(color = 0xFF713F12),
6262
)
6363

6464
internal val darkThemeColorScheme = ThemeColorScheme(
@@ -77,10 +77,10 @@ internal val darkThemeColorScheme = ThemeColorScheme(
7777
tertiaryContainer = Color(color = 0xFFDCD0E6),
7878
onTertiaryContainer = Color(color = 0xFF443C4E),
7979

80-
error = Color(color = 0xFFFFB4AB),
81-
onError = Color(color = 0xFF690005),
82-
errorContainer = Color(color = 0xFF93000A),
83-
onErrorContainer = Color(color = 0xFFFFDAD6),
80+
error = Color(color = 0xFFFCA5A5),
81+
onError = Color(color = 0xFF450A0A),
82+
errorContainer = Color(color = 0xFF7F1D1D),
83+
onErrorContainer = Color(color = 0xFFFEF2F2),
8484

8585
surfaceDim = Color(color = 0xFF131314),
8686
surface = Color(color = 0xFF131314),
@@ -103,18 +103,18 @@ internal val darkThemeColorScheme = ThemeColorScheme(
103103

104104
scrim = Color.Black,
105105

106-
info = Color(color = 0xFFFDD847),
107-
onInfo = Color(color = 0xFF423606),
108-
infoContainer = Color(color = 0xFFFEE78A),
109-
onInfoContainer = Color(color = 0xFF423606),
106+
info = Color(color = 0xFFBEE6FF),
107+
onInfo = Color(color = 0xFF002E41),
108+
infoContainer = Color(color = 0xFF262C40),
109+
onInfoContainer = Color(color = 0xFFBEE6FF),
110110

111111
success = Color(color = 0xFF8EE7AA),
112112
onSuccess = Color(color = 0xFF082B16),
113-
successContainer = Color(color = 0xFFC0F2CF),
114-
onSuccessContainer = Color(color = 0xFF082B16),
113+
successContainer = Color(color = 0xFF082B16),
114+
onSuccessContainer = Color(color = 0xFF8EE7AA),
115115

116-
warning = Color(color = 0xFFF09D38),
116+
warning = Color(color = 0xFFFEE78A),
117117
onWarning = Color(color = 0xFF411107),
118-
warningContainer = Color(color = 0xFFAA6000),
119-
onWarningContainer = Color(color = 0xFF411107),
118+
warningContainer = Color(color = 0xFF423606),
119+
onWarningContainer = Color(color = 0xFFFEE78A),
120120
)

0 commit comments

Comments
 (0)