Skip to content

Commit

Permalink
Merge branch 'buttons-scss-mixin' into cards-buttons-mixin
Browse files Browse the repository at this point in the history
  • Loading branch information
gselderslaghs committed Jan 2, 2025
2 parents d0276c2 + ff267a4 commit abeb249
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion sass/components/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
.btn, .btn-floating, .btn-large, .btn-small, .btn-flat {
:root {
--btn-height: 40px;
--btn-font-size-icon: 16px;
--btn-padding: 24px;
--btn-padding-icon: 16px;
--btn-gap-icon: 8px;
--btn-border-radius: 4px;
--btn-font-size: 14px;
}

.btn, .btn-floating, .btn-large, .btn-small, .btn-flat {
@include btn(
var(--btn-height),
var(--btn-border-radius),
Expand Down
2 changes: 1 addition & 1 deletion sass/materialize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

// components
@import "components/global";
@import "components/buttons";
@import "components/collection";
@import "components/badges";
@import "components/icons-material-design";
Expand All @@ -29,7 +30,6 @@
@import "components/toast";
@import "components/tabs";
@import "components/tooltip";
@import "components/buttons";
@import "components/dropdown";

@import "components/modal";
Expand Down

0 comments on commit abeb249

Please sign in to comment.