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

Uhf 9050 button refactor rebased #810

Merged
merged 29 commits into from
Oct 24, 2023
Merged

Uhf 9050 button refactor rebased #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4e87e98
UHF-8489: Added button styles for the ckeditor5.
khalima Sep 11, 2023
8ccbc51
UHF-8489: Modified the svg to sprite tool to fit 'button v2'. Added s…
khalima Sep 15, 2023
8372420
UHF-8489: Move button v2 codes to _button.scss file
Arkkimaagi Sep 27, 2023
122de90
UHF-8489: Fix linter problems
Arkkimaagi Sep 27, 2023
2a9ec4d
UHF-8489: Change CSS comments to SCSS comments
Arkkimaagi Sep 27, 2023
408b610
UHF-8489: Unify new style and old style for easier diffing
Arkkimaagi Sep 27, 2023
9c152c5
UHF-8489: Improve icon margins and add support for data-icon-end
Arkkimaagi Sep 27, 2023
8e9c150
UHF-9050: Remove dead SCSS code
Arkkimaagi Oct 12, 2023
9937323
UHF-9050: Fix accordion button to not be absolutely positioned
Arkkimaagi Oct 12, 2023
5d603f8
UHF-9050: Fix ckeditor include and button colors
Arkkimaagi Oct 12, 2023
53b5054
UHF-9050: Add normalize rules from HDS 3 to unify styles
Arkkimaagi Oct 13, 2023
a73b538
UHF-9050: UHF-9050: Update old HDBT button styles with HDS 3 styles
Arkkimaagi Oct 13, 2023
ea49085
UHF-9050: Prevent class styles fighting classless styles
Arkkimaagi Oct 13, 2023
fba455a
UHF-9050: Sync new button styles with old
Arkkimaagi Oct 13, 2023
5c8d233
UHF-9050: Move properties to proper order
Arkkimaagi Oct 13, 2023
b1c5002
UHF-9050: Fix linter problems
Arkkimaagi Oct 13, 2023
f491ef5
UHF-9050: UHF-9050: Fix linter problems again
Arkkimaagi Oct 13, 2023
b07791b
UHF-9050: Fix supplementary button gap
Arkkimaagi Oct 16, 2023
730e523
UHF-9050: Update syntax to HDS approved one and handle new style in h…
Arkkimaagi Oct 16, 2023
cd12e32
UHF-9050: Add icon support for new HDS syntax
Arkkimaagi Oct 16, 2023
11b75b1
UHF-9050: Remove extra space from helfi links
Arkkimaagi Oct 16, 2023
4f35e13
UHF-9050: Switch new buttons to use paddings instead of inline-flex
Arkkimaagi Oct 19, 2023
e33f0e6
UHF-9050: Add animations to external, tel, mailto and supplementary i…
Arkkimaagi Oct 19, 2023
67df12c
UHF-9050: Update banner to support new button styles.
Arkkimaagi Oct 19, 2023
44d3e3a
UHF-9050: Update liftup-with image to support new buttons
Arkkimaagi Oct 19, 2023
a54dd3b
UHF-9050: Reduce repetition on palette definitions
Arkkimaagi Oct 19, 2023
55baa52
UHF-9050: Removed unused styles
Arkkimaagi Oct 20, 2023
9b5fe0a
UHF-9050: Add new button support to everywhere
Arkkimaagi Oct 20, 2023
096c4c0
UHF-9050: Add dist
Arkkimaagi Oct 24, 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
2 changes: 1 addition & 1 deletion dist/css/ckeditor-icons.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion dist/css/ckeditor.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/hdbt-icons.css
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion dist/css/styles.min.css
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 0 additions & 29 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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