From e3d34a6d6ce2db04c3c898ad6a4687a0c59df996 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Fri, 18 Oct 2024 19:07:42 +0200 Subject: Update --- src/scopes/_blockquotes.vars.scss | 14 ++++++------ src/scopes/_code.vars.scss | 26 ++++++++++----------- src/scopes/_headings.scss | 2 +- src/scopes/_implicit.scss | 22 +++++++++--------- src/scopes/_implicit.vars.scss | 8 +++---- src/scopes/_links.vars.scss | 48 +++++++++++++++++++-------------------- src/scopes/_lists.scss | 4 ++-- src/scopes/_lists.vars.scss | 10 ++++---- src/scopes/_tables.vars.scss | 8 +++---- 9 files changed, 71 insertions(+), 71 deletions(-) (limited to 'src/scopes') diff --git a/src/scopes/_blockquotes.vars.scss b/src/scopes/_blockquotes.vars.scss index a3f8d85..108392d 100644 --- a/src/scopes/_blockquotes.vars.scss +++ b/src/scopes/_blockquotes.vars.scss @@ -1,11 +1,11 @@ @use '../props'; -@use '../vars'; -@use './implicit.vars' as implicit-vars; +@use '../core'; +@use './implicit' as implicit; -$indent: props.def(--s-blockquotes--indent, props.get(vars.$list--indent)) !default; -$margin-bs: props.def(--s-blockquotes--margin-bs, props.get(implicit-vars.$paragraph--margin-bs)) !default; -$border-width: props.def(--s-blockquotes--border-width, props.get(vars.$border-width--thick)) !default; +$indent: props.def(--s-blockquotes--indent, props.get(core.$list--indent)) !default; +$margin-bs: props.def(--s-blockquotes--margin-bs, props.get(implicit.$paragraph--margin-bs)) !default; +$border-width: props.def(--s-blockquotes--border-width, props.get(core.$border-width--thick)) !default; -$compact--indent: props.def(--s-blockquotes--compact--indent, props.get(vars.$list--compact-indent)) !default; +$compact--indent: props.def(--s-blockquotes--compact--indent, props.get(core.$list--compact-indent)) !default; -$border-color: props.def(--s-blockquotes--border-width, props.get(vars.$theme, --border)) !default; +$border-color: props.def(--s-blockquotes--border-width, props.get(core.$theme, --border)) !default; diff --git a/src/scopes/_code.vars.scss b/src/scopes/_code.vars.scss index 27d75f7..7f31b8c 100644 --- a/src/scopes/_code.vars.scss +++ b/src/scopes/_code.vars.scss @@ -1,18 +1,18 @@ @use '../props'; -@use '../vars'; -@use './implicit.vars' as implicit-vars; +@use '../core'; +@use './implicit' as implicit; -$inline--pad-i: props.def(--s-code--inline--pad-i, props.get(vars.$size--50)) !default; -$inline--pad-b: props.def(--s-code--inline--pad-b, props.get(vars.$size--10)) !default; -$inline--rounding: props.def(--s-code--inline--rounding, props.get(vars.$rounding)) !default; +$inline--pad-i: props.def(--s-code--inline--pad-i, props.get(core.$size--50)) !default; +$inline--pad-b: props.def(--s-code--inline--pad-b, props.get(core.$size--10)) !default; +$inline--rounding: props.def(--s-code--inline--rounding, props.get(core.$rounding)) !default; -$block--pad-i: props.def(--s-code--block--pad-i, props.get(vars.$size--150)) !default; -$block--pad-b: props.def(--s-code--block--pad-b, props.get(vars.$size--85)) !default; -$block--margin-bs: props.def(--s-code--block--margin-bs, props.get(implicit-vars.$paragraph--margin-bs)) !default; -$block--rounding: props.def(--s-code--block--rounding, props.get(vars.$rounding)) !default; +$block--pad-i: props.def(--s-code--block--pad-i, props.get(core.$size--150)) !default; +$block--pad-b: props.def(--s-code--block--pad-b, props.get(core.$size--85)) !default; +$block--margin-bs: props.def(--s-code--block--margin-bs, props.get(implicit.$paragraph--margin-bs)) !default; +$block--rounding: props.def(--s-code--block--rounding, props.get(core.$rounding)) !default; -$inline--fg: props.def(--s-code--inline--fg, props.get(vars.$theme, --red, --1200)) !default; -$inline--bg: props.def(--s-code--inline--bg, props.get(vars.$theme, --red, --200)) !default; +$inline--fg: props.def(--s-code--inline--fg, props.get(core.$theme, --red, --1200)) !default; +$inline--bg: props.def(--s-code--inline--bg, props.get(core.$theme, --red, --200)) !default; -$block--fg: props.def(--s-code--block--fg, props.get(vars.$theme, --text)) !default; -$block--bg: props.def(--s-code--block--bg, props.get(vars.$theme, --base, --50)) !default; +$block--fg: props.def(--s-code--block--fg, props.get(core.$theme, --text)) !default; +$block--bg: props.def(--s-code--block--bg, props.get(core.$theme, --base, --50)) !default; diff --git a/src/scopes/_headings.scss b/src/scopes/_headings.scss index e97e9f2..002a392 100644 --- a/src/scopes/_headings.scss +++ b/src/scopes/_headings.scss @@ -2,7 +2,7 @@ @use 'iro-sass/src/iro-sass' as iro; @use '../mixins' as mx; @use '../props'; -@use '../vars'; +@use '../core'; @mixin styles { @include iro.bem-scope('headings') { diff --git a/src/scopes/_implicit.scss b/src/scopes/_implicit.scss index 9c17868..d679bdc 100644 --- a/src/scopes/_implicit.scss +++ b/src/scopes/_implicit.scss @@ -2,7 +2,7 @@ @use 'sass:meta'; @use 'iro-sass/src/iro-sass' as iro; @use '../props'; -@use '../vars' as global-vars; +@use '../core'; @forward 'implicit.vars'; @use 'implicit.vars' as vars; @@ -11,8 +11,8 @@ @include props.materialize(meta.module-variables('vars')); html { - accent-color: props.get(global-vars.$theme, --accent, --600); - scrollbar-color: props.get(global-vars.$theme, --text-disabled) transparent; + accent-color: props.get(core.$theme, --accent, --600); + scrollbar-color: props.get(core.$theme, --text-disabled) transparent; } html, @@ -25,8 +25,8 @@ padding: 0; margin: 0; - color: props.get(global-vars.$theme, --text); - background-color: props.get(global-vars.$theme, --bg-base); + color: props.get(core.$theme, --text); + background-color: props.get(core.$theme, --bg-base); } pre, @@ -77,7 +77,7 @@ } small { - font-size: props.get(global-vars.$font-size--75); + font-size: props.get(core.$font-size--75); } ul, @@ -130,23 +130,23 @@ input, textarea { &::placeholder { - color: props.get(global-vars.$theme, --text-mute); + color: props.get(core.$theme, --text-mute); opacity: 1; } &:disabled { - color: props.get(global-vars.$theme, --text-disabled); + color: props.get(core.$theme, --text-disabled); } } textarea { - block-size: calc(1em * props.get(global-vars.$font--standard--line-height)); + block-size: calc(1em * props.get(core.$font--standard--line-height)); } hr { - block-size: props.get(global-vars.$border-width--thin); + block-size: props.get(core.$border-width--thin); margin: 0; - background-color: props.get(global-vars.$theme, --border-color); + background-color: props.get(core.$theme, --border-color); border: 0; } } diff --git a/src/scopes/_implicit.vars.scss b/src/scopes/_implicit.vars.scss index c18ca78..036ace3 100644 --- a/src/scopes/_implicit.vars.scss +++ b/src/scopes/_implicit.vars.scss @@ -1,7 +1,7 @@ @use '../props'; -@use '../vars'; +@use '../core'; -$paragraph--margin-bs: props.def(--s-implicit--paragraph--margin-bs, props.get(vars.$size--300)) !default; +$paragraph--margin-bs: props.def(--s-implicit--paragraph--margin-bs, props.get(core.$size--300)) !default; -$heading--margin-bs: props.def(--s-implicit--heading--margin-bs, props.get(vars.$size--700)) !default; -$heading--margin-bs-sibling: props.def(--s-implicit--heading--margin-bs-sibling, props.get(vars.$size--325)) !default; +$heading--margin-bs: props.def(--s-implicit--heading--margin-bs, props.get(core.$size--700)) !default; +$heading--margin-bs-sibling: props.def(--s-implicit--heading--margin-bs-sibling, props.get(core.$size--325)) !default; diff --git a/src/scopes/_links.vars.scss b/src/scopes/_links.vars.scss index 7880204..b40cae8 100644 --- a/src/scopes/_links.vars.scss +++ b/src/scopes/_links.vars.scss @@ -1,46 +1,46 @@ @use 'sass:map'; @use '../props'; -@use '../vars'; +@use '../core'; -$rounding: props.def(--s-links--rounding, props.get(vars.$rounding)) !default; -$underline-width: props.def(--s-links--underline-width, props.get(vars.$border-width--thin)) !default; -$hover--underline-width: props.def(--s-links--hover--underline-width, props.get(vars.$border-width--medium)) !default; +$rounding: props.def(--s-links--rounding, props.get(core.$rounding)) !default; +$underline-width: props.def(--s-links--underline-width, props.get(core.$border-width--thin)) !default; +$hover--underline-width: props.def(--s-links--hover--underline-width, props.get(core.$border-width--medium)) !default; -$key-focus--border-width: props.def(--s-links--key-focus--border-width, props.get(vars.$key-focus--border-width)) !default; -$key-focus--border-offset: props.def(--s-links--key-focus--border-offset, props.get(vars.$key-focus--border-offset)) !default; -$key-focus--outline-width: props.def(--s-links--key-focus--outline-width, props.get(vars.$key-focus--outline-width)) !default; +$key-focus--border-width: props.def(--s-links--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; +$key-focus--border-offset: props.def(--s-links--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; +$key-focus--outline-width: props.def(--s-links--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default; -$underline-color: props.def(--s-links--underline-color, props.get(vars.$theme, --text-mute-more)) !default; +$underline-color: props.def(--s-links--underline-color, props.get(core.$theme, --text-mute-more)) !default; -$colored--text-color: props.def(--s-links--colored--text-color, props.get(vars.$theme, --accent, --1100)) !default; -$colored--underline-color: props.def(--s-links--colored--underline-color, props.get(vars.$theme, --accent, --600)) !default; -$colored--hover--text-color: props.def(--s-links--colored--hover--text-color, props.get(vars.$theme, --accent, --1300)) !default; +$colored--text-color: props.def(--s-links--colored--text-color, props.get(core.$theme, --accent, --1100)) !default; +$colored--underline-color: props.def(--s-links--colored--underline-color, props.get(core.$theme, --accent, --600)) !default; +$colored--hover--text-color: props.def(--s-links--colored--hover--text-color, props.get(core.$theme, --accent, --1300)) !default; -$colored--visited--text-color: props.def(--s-links--colored--visited--text-color, props.get(vars.$theme, --purple, --1100)) !default; -$colored--visited--underline-color: props.def(--s-links--colored--visited--underline-color, props.get(vars.$theme, --purple, --600)) !default; -$colored--visited--hover--text-color: props.def(--s-links--colored--visited--hover--text-color, props.get(vars.$theme, --purple, --1300)) !default; +$colored--visited--text-color: props.def(--s-links--colored--visited--text-color, props.get(core.$theme, --purple, --1100)) !default; +$colored--visited--underline-color: props.def(--s-links--colored--visited--underline-color, props.get(core.$theme, --purple, --600)) !default; +$colored--visited--hover--text-color: props.def(--s-links--colored--visited--hover--text-color, props.get(core.$theme, --purple, --1300)) !default; -$key-focus--text-color: props.def(--s-links--key-focus--text-color, props.get(vars.$theme, --focus, --text)) !default; -$key-focus--border-color: props.def(--s-links--key-focus--border-color, props.get(vars.$theme, --focus, --border)) !default; -$key-focus--outline-color: props.def(--s-links--key-focus--outline-color, props.get(vars.$theme, --focus, --outline)) !default; +$key-focus--text-color: props.def(--s-links--key-focus--text-color, props.get(core.$theme, --focus, --text)) !default; +$key-focus--border-color: props.def(--s-links--key-focus--border-color, props.get(core.$theme, --focus, --border)) !default; +$key-focus--outline-color: props.def(--s-links--key-focus--outline-color, props.get(core.$theme, --focus, --outline)) !default; $static-themes: props.def(--s-links); -@each $theme in map.keys(props.get(vars.$transparent-colors)) { +@each $theme in map.keys(props.get(core.$transparent-colors)) { $link-theme: #{$theme}-static; $static-themes: props.merge($static-themes, ( $link-theme: ( - --text-color: props.get(vars.$transparent-colors, $theme, --800), - --underline-color: props.get(vars.$transparent-colors, $theme, --500), + --text-color: props.get(core.$transparent-colors, $theme, --800), + --underline-color: props.get(core.$transparent-colors, $theme, --500), --hover: ( - --text-color: props.get(vars.$transparent-colors, $theme, --900), + --text-color: props.get(core.$transparent-colors, $theme, --900), ), --key-focus: ( - --text-color: props.get(vars.$transparent-colors, $theme, --900), - --border-color: props.get(vars.$transparent-colors, $theme, --900), - --outline-color: props.get(vars.$transparent-colors, $theme, --300), + --text-color: props.get(core.$transparent-colors, $theme, --900), + --border-color: props.get(core.$transparent-colors, $theme, --900), + --outline-color: props.get(core.$transparent-colors, $theme, --300), ), ) )); diff --git a/src/scopes/_lists.scss b/src/scopes/_lists.scss index db555a9..d5421ca 100644 --- a/src/scopes/_lists.scss +++ b/src/scopes/_lists.scss @@ -1,7 +1,7 @@ @use 'sass:meta'; @use 'iro-sass/src/iro-sass' as iro; @use '../props'; -@use '../vars' as global-vars; +@use '../core'; @forward 'lists.vars'; @use 'lists.vars' as vars; @@ -37,7 +37,7 @@ dt { font-weight: bold; - color: props.get(global-vars.$theme, --heading); + color: props.get(core.$theme, --heading); } dd { diff --git a/src/scopes/_lists.vars.scss b/src/scopes/_lists.vars.scss index 609cfb5..6dd04ac 100644 --- a/src/scopes/_lists.vars.scss +++ b/src/scopes/_lists.vars.scss @@ -1,8 +1,8 @@ @use '../props'; -@use '../vars'; -@use './implicit.vars' as implicit-vars; +@use '../core'; +@use './implicit' as implicit; -$indent: props.def(--s-lists--indent, calc(props.get(vars.$list--indent) + 1em)) !default; -$margin-bs: props.def(--s-lists--margin-bs, props.get(implicit-vars.$paragraph--margin-bs)) !default; +$indent: props.def(--s-lists--indent, calc(props.get(core.$list--indent) + 1em)) !default; +$margin-bs: props.def(--s-lists--margin-bs, props.get(implicit.$paragraph--margin-bs)) !default; -$compact--indent: props.def(--s-lists--compact--indent, props.get(vars.$list--compact-indent)) !default; +$compact--indent: props.def(--s-lists--compact--indent, props.get(core.$list--compact-indent)) !default; diff --git a/src/scopes/_tables.vars.scss b/src/scopes/_tables.vars.scss index 2c3f255..2d7fed1 100644 --- a/src/scopes/_tables.vars.scss +++ b/src/scopes/_tables.vars.scss @@ -1,10 +1,10 @@ @use '../props'; -@use '../vars'; +@use '../core'; -$indent: props.def(--s-lists--indent, calc(props.get(vars.$list--indent) + 1em)) !default; -$margin-bs: props.def(--s-lists--margin-bs, props.get(vars.$paragraph--margin-bs)) !default; +$indent: props.def(--s-lists--indent, calc(props.get(core.$list--indent) + 1em)) !default; +$margin-bs: props.def(--s-lists--margin-bs, props.get(core.$paragraph--margin-bs)) !default; -$compact--indent: props.def(--s-lists--compact--indent, props.get(vars.$list--compact-indent)) !default; +$compact--indent: props.def(--s-lists--compact--indent, props.get(core.$list--compact-indent)) !default; @include iro.props-store(( --dims: ( -- cgit v1.2.3-70-g09d2