Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-970] Fix disabled red button color #1707

Merged
merged 1 commit into from
Nov 20, 2019
Merged

[DDW-970] Fix disabled red button color #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Changelog

### Fixes

- Fixed disabled button background color on all of the themes ([PR 1707](https://github.com/input-output-hk/daedalus/pull/1707))
- Fixed select language e2e tests ([PR 1702](https://github.com/input-output-hk/daedalus/pull/1702))
- Fixed yellow frame around the "Diagnostics" dialog ([PR 1699](https://github.com/input-output-hk/daedalus/pull/1699))
- Fixed the Japanese translation for `timeAgo` in "Wallet settings" stories ([PR 1701](https://github.com/input-output-hk/daedalus/pull/1701))
Expand Down
6 changes: 2 additions & 4 deletions source/renderer/app/themes/daedalus/cardano.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ export const CARDANO_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ec5d6b',
'--theme-button-attention-background-color-active': '#d34452',
'--theme-button-attention-background-color-disabled':
'rgba(234, 76, 91, 1)',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color-disabled': '#ffffff',
'--theme-button-attention-text-color': '#ffffff',
'--theme-button-attention-outline-color': '#ff707e',
Expand Down Expand Up @@ -170,8 +169,7 @@ export const CARDANO_THEME_OUTPUT = {
'rgba(94, 96, 102, 0.8)',
'--theme-delegation-steps-choose-wallet-description-highlighted-color':
'#5e6066',
'--theme-delegation-steps-choose-wallet-error-message-color':
'rgba(234, 76, 91, 1)',
'--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b',
'--theme-delegation-steps-choose-wallet-error-message-light-color':
'rgba(234, 76, 91, 0.7)',
'--theme-delegation-steps-choose-wallet-error-select-options-color':
Expand Down
6 changes: 2 additions & 4 deletions source/renderer/app/themes/daedalus/dark-blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ export const DARK_BLUE_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ec5d6b',
'--theme-button-attention-background-color-active': '#d34452',
'--theme-button-attention-background-color-disabled':
'rgba(234, 76, 91, 1)',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color-disabled': '#fafbfc',
'--theme-button-attention-text-color': '#fafbfc',
'--theme-button-attention-outline-color': '#ff707e',
Expand Down Expand Up @@ -171,8 +170,7 @@ export const DARK_BLUE_THEME_OUTPUT = {
'rgba(233, 244, 254, 0.8)',
'--theme-delegation-steps-choose-wallet-description-highlighted-color':
'#e9f4fe',
'--theme-delegation-steps-choose-wallet-error-message-color':
'rgba(234, 76, 91, 1)',
'--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b',
'--theme-delegation-steps-choose-wallet-error-message-light-color':
'rgba(234, 76, 91, 0.7)',
'--theme-delegation-steps-choose-wallet-error-select-options-color':
Expand Down
3 changes: 1 addition & 2 deletions source/renderer/app/themes/daedalus/dark-cardano.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ export const DARK_CARDANO_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ee707c',
'--theme-button-attention-background-color-active': '#a43540',
'--theme-button-attention-background-color-disabled':
'rgba(234, 76, 91, 1)',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color': '#ffffff',
'--theme-button-attention-text-color-disabled': '#ffffff',
'--theme-button-attention-outline-color': '#f2949d',
Expand Down
6 changes: 2 additions & 4 deletions source/renderer/app/themes/daedalus/light-blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ec5d6b',
'--theme-button-attention-background-color-active': '#d34452',
'--theme-button-attention-background-color-disabled':
'rgba(234, 76, 91, 1)',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color-disabled': '#fafbfc',
'--theme-button-attention-text-color': '#fafbfc',
'--theme-button-attention-outline-color': '#ff707e',
Expand Down Expand Up @@ -168,8 +167,7 @@ export const LIGHT_BLUE_THEME_OUTPUT = {
'rgba(94, 96, 102, 0.8)',
'--theme-delegation-steps-choose-wallet-description-highlighted-color':
'#5e6066',
'--theme-delegation-steps-choose-wallet-error-message-color':
'rgba(234, 76, 91, 1)',
'--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b',
'--theme-delegation-steps-choose-wallet-error-message-light-color':
'rgba(234, 76, 91, 0.7)',
'--theme-delegation-steps-choose-wallet-error-select-options-color':
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/white.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const WHITE_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ee707c',
'--theme-button-attention-background-color-active': '#a43540',
'--theme-button-attention-background-color-disabled': '#fbdbde',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color': '#fafbfc',
'--theme-button-attention-text-color-disabled': '#fafbfc',
'--theme-button-attention-outline-color': '#f2949d',
Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/themes/daedalus/yellow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const YELLOW_THEME_OUTPUT = {
'--theme-button-attention-background-color': '#ea4c5b',
'--theme-button-attention-background-color-hover': '#ee707c',
'--theme-button-attention-background-color-active': '#a43540',
'--theme-button-attention-background-color-disabled': '#fbdbde',
'--theme-button-attention-background-color-disabled': '#ea4c5b',
'--theme-button-attention-text-color': '#fafbfc',
'--theme-button-attention-text-color-disabled': '#fafbfc',
'--theme-button-attention-outline-color': '#f2949d',
Expand Down
5 changes: 1 addition & 4 deletions source/renderer/app/themes/utils/createTheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,7 @@ export const createDaedalusComponentsTheme = (
'--theme-button-attention-background-color': `${error.regular}`,
'--theme-button-attention-background-color-hover': `${error.light}`,
'--theme-button-attention-background-color-active': `${error.darkest}`,
'--theme-button-attention-background-color-disabled': `${
error.ultralight
}`,

'--theme-button-attention-background-color-disabled': `${error.regular}`,
'--theme-button-attention-text-color': `${text.secondary}`,
'--theme-button-attention-text-color-disabled': `${text.secondary}`,
'--theme-button-attention-outline-color': `${error.lighter}`,
Expand Down