From a1aa0b16c5a4671668f570fb882de3f7960fb5fc Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 26 Jan 2023 19:50:31 +0100 Subject: [PATCH 1/3] refactor: removed the disabled grey/transparent background "color" --- source/_patterns/01-elements/buttons/button.scss | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/source/_patterns/01-elements/buttons/button.scss b/source/_patterns/01-elements/buttons/button.scss index 1631f15cae..1a62163c9d 100644 --- a/source/_patterns/01-elements/buttons/button.scss +++ b/source/_patterns/01-elements/buttons/button.scss @@ -86,11 +86,6 @@ } } - &:disabled { - background-color: transparent; - color: $db-color-cool-gray-700; - } - &:active { background-color: $button-secondaryOutline-active-backgroundColor; } @@ -124,10 +119,6 @@ } } - &:disabled { - background-color: transparent; // shame.css - } - &:active { background-color: $button-secondaryOutline-active-backgroundColor; } @@ -197,8 +188,6 @@ } &:disabled { - background-color: $db-color-cool-gray-200; - color: $db-color-cool-gray-700; opacity: 0.5; } } From 37daf3f22c1cb40925d2edb81e5fad912dfd8507 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Fri, 27 Jan 2023 10:18:12 +0100 Subject: [PATCH 2/3] refactor: adapted the correct alpha values --- .../_patterns/01-elements/buttons/button.scss | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/source/_patterns/01-elements/buttons/button.scss b/source/_patterns/01-elements/buttons/button.scss index 1a62163c9d..3ff15c4de8 100644 --- a/source/_patterns/01-elements/buttons/button.scss +++ b/source/_patterns/01-elements/buttons/button.scss @@ -45,6 +45,12 @@ &%variant-brand-primary { background-color: $button-brand-primary--backgroundColor; + &:disabled { + background-color: unquote( + $button-brand-primary--backgroundColor + "40" + ); + } + &:not(:disabled) { &:hover { // TODO: This could probably get simplified later on e.g. via CSS variables @@ -60,6 +66,10 @@ &%variant-primary { background-color: $button-primary--backgroundColor; + &:disabled { + background-color: unquote($button-primary--backgroundColor + "40"); + } + &:not(:disabled) { &:hover { // TODO: This could probably get simplified later on e.g. via CSS variables @@ -79,6 +89,11 @@ border-color: $db-color-cool-gray-700; color: $db-color-cool-gray-700; + &:disabled { + color: unquote($db-color-cool-gray-700 + "80"); + border-color: unquote($db-color-cool-gray-700 + "40"); + } + &:not(:disabled) { &:hover { // TODO: This could probably get simplified later on e.g. via CSS variables @@ -95,6 +110,13 @@ background-color: $button-secondarySolid--backgroundColor; color: $db-color-cool-gray-700; + &:disabled { + color: unquote($db-color-cool-gray-700 + "80"); + background-color: unquote( + $button-secondarySolid--backgroundColor + "40" + ); + } + &:not(:disabled) { &:hover { // TODO: This could probably get simplified later on e.g. via CSS variables @@ -112,6 +134,10 @@ border: 2px solid transparent; color: $db-color-cool-gray-700; + &:disabled { + color: unquote($db-color-cool-gray-700 + "80"); + } + &:not(:disabled) { &:hover { // TODO: This could probably get simplified later on e.g. via CSS variables @@ -188,6 +214,6 @@ } &:disabled { - opacity: 0.5; + color: unquote($button---color + "80"); } } From 86164b397a7e35fd52cce04f64bc06dc92d9dfa7 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Fri, 27 Jan 2023 10:23:20 +0100 Subject: [PATCH 3/3] fix: we want to set the alpha value and that for need the long form hex code --- source/_patterns/01-elements/buttons/_button.variables.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/_patterns/01-elements/buttons/_button.variables.scss b/source/_patterns/01-elements/buttons/_button.variables.scss index d73b322a57..b59d43f710 100644 --- a/source/_patterns/01-elements/buttons/_button.variables.scss +++ b/source/_patterns/01-elements/buttons/_button.variables.scss @@ -2,7 +2,10 @@ @import "../../00-base/icons/icons.variables"; @import "../../00-base/icons/icons.helpers"; -$button---color: #fff !default; +// We want to set the alpha value and that for need the long form hex code +// stylelint-disable color-hex-length +$button---color: #ffffff !default; +// stylelint-enable color-hex-length $button---minHeight: to-rem( $pxValue: 44