Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/scss/_variables.scss
#	src/scss/ui/_buttons.scss
#	src/scss/ui/_cards.scss
  • Loading branch information
codecalm committed Sep 18, 2022
2 parents f82e0ca + 0b849b9 commit b7db449
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions src/scss/layout/_core.scss
@@ -1,4 +1,27 @@
// stylelint-disable property-no-vendor-prefix

:root {
font-size: 16px;
height: 100%;

@each $name, $color in $theme-colors {
--#{$prefix}#{$name}: #{$color};
--#{$prefix}#{$name}-darken: #{theme-color-darker($color)};
--#{$prefix}#{$name}-light: #{theme-color-lighter($color)};
//--#{$prefix}#{$name}-rgb: #{to-rgb($color)};
}

--#{$prefix}card-bg: #{$card-bg};
--#{$prefix}card-bg-hover: #{$card-bg-hover};
--#{$prefix}card-color: #{$card-color};

--#{$prefix}border-color: #{$border-color};
--#{$prefix}border-color-light: #{$border-color-light};

--#{$prefix}icon-color: #{$icon-color};
--#{$prefix}disabled-bg: #{$disabled-bg};
}

body {
overflow-y: scroll;
letter-spacing: $body-letter-spacing;
Expand Down

0 comments on commit b7db449

Please sign in to comment.