Skip to content

Commit

Permalink
Merge pull request #810 from City-of-Helsinki/UHF-9050_button_refacto…
Browse files Browse the repository at this point in the history
…r_rebased

Uhf 9050 button refactor rebased
  • Loading branch information
khalima authored Oct 24, 2023
2 parents 20c7be1 + 096c4c0 commit b3f1318
Show file tree
Hide file tree
Showing 22 changed files with 846 additions and 482 deletions.
2 changes: 1 addition & 1 deletion dist/css/ckeditor-icons.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion dist/css/ckeditor.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/hdbt-icons.css

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion dist/css/styles.min.css

Large diffs are not rendered by default.

29 changes: 0 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 71 additions & 0 deletions src/scss/02_mixins/_color_helpers.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
@mixin button-palettes($theme: 'primary') {
@if $theme == 'on-light-bg' {
$theme: 'secondary';
}

@if $theme != 'primary' and $theme != 'secondary' {
$theme: 'primary';
}

[data-hds-component='button']:not([class*='hds-button'],[data-hds-variant]), // When variant is not defined, we fallback to primary styles
[data-hds-component='button']:not([class*='hds-button'])[data-hds-variant='primary'],
.hds-button--primary {
--background-color: var(--hdbt-color-palette-button--#{$theme});
--background-color-hover: transparent;
--background-color-focus: var(--hdbt-color-palette-button--#{$theme});
--background-color-hover-focus: transparent;
--background-color-disabled: var(--color-black-20);
--border-color: var(--hdbt-color-palette-button--#{$theme});
--border-color-hover: var(--hdbt-color-palette-button--#{$theme});
--border-color-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-disabled: var(--color-black-20);
--color: var(--hdbt-color-palette-button-contrast--#{$theme});
--color-hover: var(--hdbt-color-palette-button--#{$theme});
--color-focus: var(--hdbt-color-palette-button-contrast--#{$theme});
--color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--color-disabled: var(--color-black);
--focus-outline-color: var(--hdbt-color-palette-button--#{$theme});
--submit-input-focus-gutter-color: var(--hdbt-color-palette-button-contrast--#{$theme});
}

[data-hds-component='button']:not([class*='hds-button'])[data-hds-variant='secondary'],
.hds-button--secondary {
--background-color: transparent;
--background-color-hover: var(--hdbt-color-palette-button--#{$theme});
--background-color-focus: transparent;
--background-color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--background-color-disabled: transparent;
--border-color: var(--hdbt-color-palette-button--#{$theme});
--border-color-hover: var(--hdbt-color-palette-button--#{$theme});
--border-color-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-disabled: var(--hdbt-color-palette-button--#{$theme});
--color: var(--hdbt-color-palette-button--#{$theme});
--color-hover: var(--hdbt-color-palette-button-contrast--#{$theme});
--color-focus: var(--hdbt-color-palette-button--#{$theme});
--color-hover-focus: var(--hdbt-color-palette-button-contrast--#{$theme});
--focus-outline-color: var(--hdbt-color-palette-button--#{$theme});
}

[data-hds-component='button']:not([class*='hds-button'])[data-hds-variant='supplementary'],
.hds-button--supplementary {
--background-color: transparent;
--background-color-hover: transparent;
--background-color-focus: transparent;
--background-color-hover-focus: transparent;
--background-color-disabled: transparent;
--border-color: transparent;
--border-color-hover: transparent;
--border-color-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--border-color-disabled: transparent;
--color: var(--hdbt-color-palette-button--#{$theme});
--color-hover: var(--hdbt-color-palette-button--#{$theme});
--color-focus: var(--hdbt-color-palette-button--#{$theme});
--color-hover-focus: var(--hdbt-color-palette-button--#{$theme});
--color-disabled: var(--hdbt-color-palette-button--#{$theme});
--focus-outline-color: transparent;
--submit-input-focus-gutter-color: transparent;
}
}
Loading

0 comments on commit b3f1318

Please sign in to comment.