Skip to content

refactor: removed the disabled grey/transparent background "color" #290

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

Merged
merged 7 commits into from
Feb 6, 2023
Merged

refactor: removed the disabled grey/transparent background "color" #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1aa0b1
refactor: removed the disabled grey/transparent background "color"
mfranzke Jan 26, 2023
37daf3f
refactor: adapted the correct alpha values
mfranzke Jan 27, 2023
86164b3
fix: we want to set the alpha value and that for need the long form h…
mfranzke Jan 27, 2023
4151850
Merge branch 'main' into 289-button-adapt-disabled-styling-by-guideli…
mfranzke Jan 27, 2023
628c2d2
Merge branch 'main' into 289-button-adapt-disabled-styling-by-guideli…
mfranzke Jan 30, 2023
d076a16
Merge branch 'main' into 289-button-adapt-disabled-styling-by-guideli…
mfranzke Jan 31, 2023
c67c3dd
Merge branch 'main' into 289-button-adapt-disabled-styling-by-guideli…
mfranzke Feb 2, 2023
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
5 changes: 4 additions & 1 deletion source/_patterns/01-elements/buttons/_button.variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
39 changes: 27 additions & 12 deletions source/_patterns/01-elements/buttons/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -79,18 +89,18 @@
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
background-color: $button-secondaryOutline-hover-backgroundColor;
}
}

&:disabled {
background-color: transparent;
color: $db-color-cool-gray-700;
}

&:active {
background-color: $button-secondaryOutline-active-backgroundColor;
}
Expand All @@ -100,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
Expand All @@ -117,17 +134,17 @@
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
background-color: $button-secondaryOutline-hover-backgroundColor;
}
}

&:disabled {
background-color: transparent; // shame.css
}

&:active {
background-color: $button-secondaryOutline-active-backgroundColor;
}
Expand Down Expand Up @@ -197,8 +214,6 @@
}

&:disabled {
background-color: $db-color-cool-gray-200;
color: $db-color-cool-gray-700;
opacity: 0.5;
color: unquote($button---color + "80");
}
}