From 1601f183fd9e84dd3665b4b8dfef57eb9b1423ac Mon Sep 17 00:00:00 2001 From: Volpeon Date: Wed, 20 Nov 2024 20:46:29 +0100 Subject: Implicit style fixes --- src/scopes/_blockquotes.scss | 2 +- src/scopes/_blockquotes.vars.scss | 4 ++-- src/scopes/_body.scss | 8 ++++++++ src/scopes/_code.vars.scss | 4 ++-- src/scopes/_lists.vars.scss | 4 ++-- src/scopes/_tables.vars.scss | 4 ++-- src_demo/index.scss | 1 + 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/scopes/_blockquotes.scss b/src/scopes/_blockquotes.scss index d488860..91a7785 100644 --- a/src/scopes/_blockquotes.scss +++ b/src/scopes/_blockquotes.scss @@ -12,7 +12,7 @@ @include bem.scope('blockquotes') { blockquote { padding-inline-start: calc(props.get(vars.$indent) - props.get(vars.$border-width)); - margin-block: props.get(vars.$margin-bs); + margin-block: props.get(vars.$margin-bs) 0; margin-inline: 1px 0; border-inline-start: props.get(vars.$border-width) solid props.get(vars.$border-color); } diff --git a/src/scopes/_blockquotes.vars.scss b/src/scopes/_blockquotes.vars.scss index 5a34957..6aae242 100644 --- a/src/scopes/_blockquotes.vars.scss +++ b/src/scopes/_blockquotes.vars.scss @@ -1,9 +1,9 @@ @use 'iro-sass/src/props'; @use '../core.vars' as core; -@use './body' as body; +@use './implicit.vars' as implicit; $indent: props.def(--s-blockquotes--indent, props.get(core.$list--indent)) !default; -$margin-bs: props.def(--s-blockquotes--margin-bs, props.get(body.$paragraph--margin-bs)) !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(core.$list--compact-indent)) !default; diff --git a/src/scopes/_body.scss b/src/scopes/_body.scss index a6a5cd7..6742a2a 100644 --- a/src/scopes/_body.scss +++ b/src/scopes/_body.scss @@ -32,5 +32,13 @@ margin-block: 0; } } + + ul, + ol, + table, + pre, + blockquote { + margin-block: props.get(vars.$block--margin-b); + } } } diff --git a/src/scopes/_code.vars.scss b/src/scopes/_code.vars.scss index a80cc51..e06971b 100644 --- a/src/scopes/_code.vars.scss +++ b/src/scopes/_code.vars.scss @@ -1,6 +1,6 @@ @use 'iro-sass/src/props'; @use '../core.vars' as core; -@use './body' as body; +@use './implicit.vars' as implicit; $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; @@ -8,7 +8,7 @@ $inline--rounding: props.def(--s-code--inline--rounding, props.get(core.$roundin $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(body.$paragraph--margin-bs)) !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(core.$theme, --red, --1200), 'color') !default; diff --git a/src/scopes/_lists.vars.scss b/src/scopes/_lists.vars.scss index f2511d8..8c46bc3 100644 --- a/src/scopes/_lists.vars.scss +++ b/src/scopes/_lists.vars.scss @@ -1,8 +1,8 @@ @use 'iro-sass/src/props'; @use '../core.vars' as core; -@use './body' as body; +@use './implicit.vars' as implicit; $indent: props.def(--s-lists--indent, calc(props.get(core.$list--indent) + 1em)) !default; -$margin-bs: props.def(--s-lists--margin-bs, props.get(body.$paragraph--margin-bs)) !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(core.$list--compact-indent)) !default; diff --git a/src/scopes/_tables.vars.scss b/src/scopes/_tables.vars.scss index ded6b80..362b70f 100644 --- a/src/scopes/_tables.vars.scss +++ b/src/scopes/_tables.vars.scss @@ -1,4 +1,4 @@ @use 'iro-sass/src/props'; -@use 'body.vars' as body; +@use 'implicit.vars' as implicit; -$margin-bs: props.def(--s-tables--margin-bs, props.get(body.$paragraph--margin-bs)) !default; +$margin-bs: props.def(--s-tables--margin-bs, props.get(implicit.$paragraph--margin-bs)) !default; diff --git a/src_demo/index.scss b/src_demo/index.scss index d9994e4..a04624a 100644 --- a/src_demo/index.scss +++ b/src_demo/index.scss @@ -3,6 +3,7 @@ @include iro.core--styles; @include iro.s-implicit--styles; +@include iro.s-body--styles; @include iro.s-blockquotes--styles; @include iro.s-code--styles; @include iro.s-headings--styles; -- cgit v1.2.3-70-g09d2