Skip to content

Commit

Permalink
Merge branch 'main' into dkilgore-eightfold/default-table-loading-fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkilgore-eightfold
dkilgore-eightfold committed May 31, 2023
2 parents 928a5ea + 71c490b commit b675c6b
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 53 deletions.
50 changes: 23 additions & 27 deletions src/components/Button/button.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@
--button-counter-active-background-color: var(--accent-background1-color);

color: var(--button-primary-text-color);
background-color: var(--button-primary-background-color);
background: var(--button-primary-background-color);
border-width: var(--button-primary-border-width);
border-style: var(--button-primary-border-style);
border-color: var(--button-primary-border-color);
Expand All @@ -512,15 +512,15 @@

&:hover:not([disabled]) {
color: var(--button-primary-hover-text-color);
background-color: var(--button-primary-hover-background-color);
background: var(--button-primary-hover-background-color);
border-width: var(--button-primary-hover-border-width);
border-style: var(--button-primary-hover-border-style);
border-color: var(--button-primary-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-primary-active-text-color);
background-color: var(--button-primary-active-background-color);
background: var(--button-primary-active-background-color);
border-width: var(--button-primary-active-border-width);
border-style: var(--button-primary-active-border-style);
border-color: var(--button-primary-active-border-color);
Expand All @@ -535,22 +535,22 @@
--button-counter-active-background-color: var(--primary-background1-color);

color: var(--button-secondary-text-color);
background-color: var(--button-secondary-background-color);
background: var(--button-secondary-background-color);
border-width: var(--button-secondary-border-width);
border-style: var(--button-secondary-border-style);
border-color: var(--button-secondary-border-color);

&:hover:not([disabled]) {
color: var(--button-secondary-hover-text-color);
background-color: var(--button-secondary-hover-background-color);
background: var(--button-secondary-hover-background-color);
border-width: var(--button-secondary-hover-border-width);
border-style: var(--button-secondary-hover-border-style);
border-color: var(--button-secondary-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-secondary-active-text-color);
background-color: var(--button-secondary-active-background-color);
background: var(--button-secondary-active-background-color);
border-width: var(--button-secondary-active-border-width);
border-style: var(--button-secondary-active-border-style);
border-color: var(--button-secondary-active-border-color);
Expand Down Expand Up @@ -618,22 +618,22 @@
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-primary-disruptive-text-color);
background-color: var(--button-primary-disruptive-background-color);
background: var(--button-primary-disruptive-background-color);
border-width: var(--button-primary-disruptive-border-width);
border-style: var(--button-primary-disruptive-border-style);
border-color: var(--button-primary-disruptive-border-color);

&:hover:not([disabled]) {
color: var(--button-primary-disruptive-hover-text-color);
background-color: var(--button-primary-disruptive-hover-background-color);
background: var(--button-primary-disruptive-hover-background-color);
border-width: var(--button-primary-disruptive-hover-border-width);
border-style: var(--button-primary-disruptive-hover-border-style);
border-color: var(--button-primary-disruptive-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-primary-disruptive-active-text-color);
background-color: var(--button-primary-disruptive-active-background-color);
background: var(--button-primary-disruptive-active-background-color);
border-width: var(--button-primary-disruptive-active-border-width);
border-style: var(--button-primary-disruptive-active-border-style);
border-color: var(--button-primary-disruptive-active-border-color);
Expand All @@ -653,24 +653,22 @@
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-secondary-disruptive-text-color);
background-color: var(--button-secondary-disruptive-background-color);
background: var(--button-secondary-disruptive-background-color);
border-width: var(--button-secondary-disruptive-border-width);
border-style: var(--button-secondary-disruptive-border-style);
border-color: var(--button-secondary-disruptive-border-color);

&:hover:not([disabled]) {
color: var(--button-secondary-disruptive-hover-text-color);
background-color: var(--button-secondary-disruptive-hover-background-color);
background: var(--button-secondary-disruptive-hover-background-color);
border-width: var(--button-secondary-disruptive-hover-border-width);
border-style: var(--button-secondary-disruptive-hover-border-style);
border-color: var(--button-secondary-disruptive-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-secondary-disruptive-active-text-color);
background-color: var(
--button-secondary-disruptive-active-background-color
);
background: var(--button-secondary-disruptive-active-background-color);
border-width: var(--button-secondary-disruptive-active-border-width);
border-style: var(--button-secondary-disruptive-active-border-style);
border-color: var(--button-secondary-disruptive-active-border-color);
Expand All @@ -685,7 +683,7 @@
--button-counter-active-background-color: var(--primary-background1-color);

color: var(--button-default-text-color);
background-color: var(--button-default-background-color);
background: var(--button-default-background-color);
border-width: var(--button-default-border-width);
border-style: var(--button-default-border-style);
border-color: var(--button-default-border-color);
Expand All @@ -706,15 +704,15 @@

&:hover:not([disabled]) {
color: var(--button-default-hover-text-color);
background-color: var(--button-default-hover-background-color);
background: var(--button-default-hover-background-color);
border-width: var(--button-default-hover-border-width);
border-style: var(--button-default-hover-border-style);
border-color: var(--button-default-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-default-active-text-color);
background-color: var(--button-default-active-background-color);
background: var(--button-default-active-background-color);
border-width: var(--button-default-active-border-width);
border-style: var(--button-default-active-border-style);
border-color: var(--button-default-active-border-color);
Expand All @@ -734,22 +732,22 @@
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-default-disruptive-text-color);
background-color: var(--button-default-disruptive-background-color);
background: var(--button-default-disruptive-background-color);
border-width: var(--button-default-disruptive-border-width);
border-style: var(--button-default-disruptive-border-style);
border-color: var(--button-default-disruptive-border-color);

&:hover:not([disabled]) {
color: var(--button-default-disruptive-hover-text-color);
background-color: var(--button-default-disruptive-hover-background-color);
background: var(--button-default-disruptive-hover-background-color);
border-width: var(--button-default-disruptive-hover-border-width);
border-style: var(--button-default-disruptive-hover-border-style);
border-color: var(--button-default-disruptive-hover-border-color);
}

&:active:not([disabled]) {
color: var(--button-default-disruptive-active-text-color);
background-color: var(--button-default-disruptive-active-background-color);
background: var(--button-default-disruptive-active-background-color);
border-width: var(--button-default-disruptive-active-border-width);
border-style: var(--button-default-disruptive-active-border-style);
border-color: var(--button-default-disruptive-active-border-color);
Expand All @@ -764,7 +762,7 @@
--bg: var(--button-neutral-background-color);
--color: var(--button-neutral-text-color);
color: var(--color);
background-color: var(--bg);
background: var(--bg);

&:hover:not([disabled]) {
--bg: var(--button-neutral-hover-background-color);
Expand Down Expand Up @@ -811,7 +809,7 @@
}

&:not(.transparent) {
background-color: var(--bg);
background: var(--bg);
}

&:not(.transparent):not([disabled]):hover {
Expand Down Expand Up @@ -1308,15 +1306,15 @@
&.button-disruptive {
&.focus-visible,
&:focus-visible {
background-color: var(--disruptive-background1-color);
background: var(--disruptive-background1-color);
color: var(--disruptive-color);
}
}

&.button-neutral {
&.focus-visible,
&:focus-visible {
background-color: var(--button-neutral-focus-visible-background-color);
background: var(--button-neutral-focus-visible-background-color);

&.drop-shadow {
box-shadow: var(--focus-visible-box-shadow), $shadow-object-s;
Expand All @@ -1327,9 +1325,7 @@
&.button-system-ui {
&.focus-visible,
&:focus-visible {
background-color: var(
--button-system-ui-focus-visible-background-color
);
background: var(--button-system-ui-focus-visible-background-color);

&.drop-shadow {
box-shadow: var(--focus-visible-box-shadow), $shadow-object-s;
Expand Down

0 comments on commit b675c6b

Please sign in to comment.