Skip to content

Commit c35f428

Browse files
[DDW-932] Update color of secondary text action in redeem rewards dialogs (#2861)
Co-authored-by: Daniel Main <[email protected]>
1 parent 8abd7b3 commit c35f428

File tree

11 files changed

+27
-12
lines changed

11 files changed

+27
-12
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
### Fixes
1313

1414
- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
15+
- Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))
1516
- Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))
16-
17+
1718
### Chores
1819

1920
- Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))

source/renderer/app/components/widgets/DialogFullSizeOverride.scss

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,13 @@
9494
.SimpleInput_input,
9595
.SimpleInput_input::placeholder,
9696
.SimpleInput_input:focus,
97-
.SimpleInput_input:hover,
98-
.SimpleLink_root {
97+
.SimpleInput_input:hover {
9998
color: var(--theme-dialog-fullsize-text-color);
10099
}
101100

102101
// Text color highlight
103102
.SimpleAutocomplete_autocompleteContent input,
104-
.SimpleOptions_option,
105-
.SimpleLink_root {
103+
.SimpleOptions_option {
106104
color: var(--theme-dialog-fullsize-text-highlight-color);
107105
}
108106

@@ -113,24 +111,31 @@
113111
.SimpleInput_customValueWrapper .SimpleInput_input,
114112
.SimpleInput_input:focus:not(.SimpleInput_errored),
115113
.SimpleInput_input:hover:not(.SimpleInput_errored),
116-
.SimpleLink_root,
117114
.SimpleOptions_option:after {
118115
background-color: transparent !important;
119116
border-color: var(--theme-dialog-fullsize-text-color) !important;
120117
}
121118

122119
.SimpleLink_root {
123-
color: var(--theme-dialog-fullsize-text-highlight-color);
124-
opacity: 0.8;
120+
--opacity: 0.8;
121+
--main-color: rgba(
122+
var(--theme-dialog-fullsize-secondary-text-action-color),
123+
1
124+
);
125+
126+
border-color: rgba(
127+
var(--theme-dialog-fullsize-secondary-text-action-color),
128+
0.75
129+
);
130+
color: var(--main-color);
131+
opacity: var(--opacity);
125132

126133
&:hover {
127-
opacity: 1;
134+
--opacity: 1;
128135
}
129136

130137
&:after {
131-
background-color: var(
132-
--theme-dialog-fullsize-text-highlight-color
133-
) !important;
138+
background-color: var(--main-color);
134139
}
135140
}
136141

source/renderer/app/themes/daedalus/cardano.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ export const CARDANO_THEME_OUTPUT = {
294294
'--theme-dialog-fullsize-text-color': 'rgba(255, 255, 255, 0.7)',
295295
'--theme-dialog-fullsize-text-highlight-color': '#ffffff',
296296
'--theme-dialog-fullsize-title-text-color': '#ffffff',
297+
'--theme-dialog-fullsize-secondary-text-action-color': '255, 255, 255',
297298
},
298299
errors: {
299300
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/dark-blue.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ export const DARK_BLUE_THEME_OUTPUT = {
295295
'--theme-dialog-fullsize-text-color': 'rgba(255, 255, 255, 0.7)',
296296
'--theme-dialog-fullsize-text-highlight-color': '#ffffff',
297297
'--theme-dialog-fullsize-title-text-color': '#ffffff',
298+
'--theme-dialog-fullsize-secondary-text-action-color': '233, 244, 254',
298299
},
299300
errors: {
300301
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/dark-cardano.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ export const DARK_CARDANO_THEME_OUTPUT = {
279279
'--theme-dialog-fullsize-title-text-color': '#ffffff',
280280
'--theme-dialog-fullsize-button-label-color': '#000000',
281281
'--theme-dialog-fullsize-button-label-color-hover': '#000000',
282+
'--theme-dialog-fullsize-secondary-text-action-color': '255, 255, 255',
282283
},
283284
errors: {
284285
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/flight-candidate.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ export const FLIGHT_CANDIDATE_THEME_OUTPUT = {
279279
'--theme-dialog-fullsize-text-color': 'rgba(255, 255, 255, 0.7)',
280280
'--theme-dialog-fullsize-text-highlight-color': '#ffffff',
281281
'--theme-dialog-fullsize-title-text-color': '#ffffff',
282+
'--theme-dialog-fullsize-secondary-text-action-color': '255, 255, 255',
282283
},
283284
errors: {
284285
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/incentivized-testnet.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ export const INCENTIVIZED_TESTNET_THEME_OUTPUT = {
280280
'--theme-dialog-fullsize-text-color': 'rgba(255, 255, 255, 0.7)',
281281
'--theme-dialog-fullsize-text-highlight-color': '#ffffff',
282282
'--theme-dialog-fullsize-title-text-color': '#ffffff',
283+
'--theme-dialog-fullsize-secondary-text-action-color': '255, 255, 255',
283284
},
284285
errors: {
285286
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/light-blue.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
292292
'--theme-dialog-fullsize-text-color': 'rgba(255, 255, 255, 0.7)',
293293
'--theme-dialog-fullsize-text-highlight-color': '#ffffff',
294294
'--theme-dialog-fullsize-title-text-color': '#ffffff',
295+
'--theme-dialog-fullsize-secondary-text-action-color': '250, 251, 252',
295296
},
296297
errors: {
297298
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/shelley-testnet.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ export const SHELLEY_TESTNET_THEME_OUTPUT = {
279279
'--theme-dialog-fullsize-title-text-color': '#ffffff',
280280
'--theme-dialog-fullsize-field-background-color':
281281
'rgba(255, 255, 255, 0.07)',
282+
'--theme-dialog-fullsize-secondary-text-action-color': '255, 255, 255',
282283
},
283284
errors: {
284285
'--theme-color-error': '#ea4c5b',

source/renderer/app/themes/daedalus/white.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ export const WHITE_THEME_OUTPUT = {
280280
'--theme-dialog-fullsize-button-label-color': '#29b595',
281281
'--theme-dialog-fullsize-button-label-color-hover': '#fff',
282282
'--theme-dialog-fullsize-field-background-color': 'rgba(45, 45, 45, 0.07)',
283+
'--theme-dialog-fullsize-secondary-text-action-color': '45, 45, 45',
283284
},
284285
errors: {
285286
'--theme-color-error': '#ea4c5b',

0 commit comments

Comments
 (0)