From c346bc64f24f01ae40b75a8a4ae03747d014266f Mon Sep 17 00:00:00 2001 From: Volpeon Date: Mon, 30 Jan 2023 07:20:47 +0100 Subject: Update --- src/_declare-vars.scss | 3 ++- src/objects/_bubble.scss | 17 +++-------------- src/objects/_emoji.scss | 2 -- src/scopes/_blockquotes.scss | 10 ++++++++++ src/scopes/_lists.scss | 15 +++++++++++++++ tpl/objects/bubble.pug | 6 +++--- 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/_declare-vars.scss b/src/_declare-vars.scss index a36b17a..f7b3031 100644 --- a/src/_declare-vars.scss +++ b/src/_declare-vars.scss @@ -120,7 +120,8 @@ ), --list: ( - --indent: fn.dim(--size --400, null), + --indent: fn.dim(--size --400, null), + --compact-indent: fn.dim(--size --200, null), ), ), ), 'dims'); diff --git a/src/objects/_bubble.scss b/src/objects/_bubble.scss index 5c9ce04..f1d053f 100644 --- a/src/objects/_bubble.scss +++ b/src/objects/_bubble.scss @@ -2,12 +2,6 @@ @use '../functions' as fn; @include iro.props-namespace('bubble') { - @include iro.props-store(( - --colors: ( - --image-bg: fn.global-color(--obj), - ), - ), 'colors'); - @include iro.props-store(( --dims: ( --pad-x: fn.global-dim(--size --200), @@ -15,7 +9,7 @@ --rounding: 3px, --arrow-size: fn.global-dim(--size --100), - --compact: ( + --75: ( --pad-x: fn.global-dim(--size --150), --pad-y: fn.global-dim(--size --85), ), @@ -46,13 +40,8 @@ transform: translate(.2em, .2em); } - @include iro.bem-elem('divider') { - margin-right: calc(-1 * fn.dim(--pad-x)); - margin-left: calc(-1 * fn.dim(--pad-x)); - } - - @include iro.bem-modifier('compact') { - padding: fn.dim(--compact --pad-y) fn.dim(--compact --pad-x); + @include iro.bem-modifier('75') { + padding: fn.dim(--75 --pad-y) fn.dim(--75 --pad-x); } } } diff --git a/src/objects/_emoji.scss b/src/objects/_emoji.scss index 027d0e4..f7715e1 100644 --- a/src/objects/_emoji.scss +++ b/src/objects/_emoji.scss @@ -23,14 +23,12 @@ @include iro.bem-object(iro.props-namespace()) { display: inline-block; - width: fn.dim(--size); height: fn.dim(--size); margin: calc(-.5 * fn.dim(--size)) calc(-1 * fn.dim(--pad)); padding: fn.dim(--pad); vertical-align: .1em; @include iro.bem-modifier('125') { - width: fn.dim(--125 --size); height: fn.dim(--125 --size); margin-top: calc(-.5 * fn.dim(--125 --size)); margin-bottom: calc(-.5 * fn.dim(--125 --size)); diff --git a/src/scopes/_blockquotes.scss b/src/scopes/_blockquotes.scss index 3525cc3..5383bd7 100644 --- a/src/scopes/_blockquotes.scss +++ b/src/scopes/_blockquotes.scss @@ -6,6 +6,10 @@ --dims: ( --indent: fn.global-dim(--list --indent), --margin-top: fn.global-dim(--paragraph --margin-top), + + --compact: ( + --indent: fn.global-dim(--list --compact-indent), + ), ) ), 'dims'); @@ -21,5 +25,11 @@ padding-left: calc(fn.dim(--indent) - 3px); border-left: 3px solid fn.color(--border); } + + @include iro.bem-modifier('compact') { + blockquote { + padding-left: calc(fn.dim(--compact --indent) - 3px); + } + } } } diff --git a/src/scopes/_lists.scss b/src/scopes/_lists.scss index dd47b93..1322f2d 100644 --- a/src/scopes/_lists.scss +++ b/src/scopes/_lists.scss @@ -6,6 +6,10 @@ --dims: ( --indent: calc(fn.global-dim(--list --indent) + 1em), --margin-top: fn.global-dim(--paragraph --margin-top), + + --compact: ( + --indent: fn.global-dim(--list --compact-indent), + ), ) ), 'dims'); @@ -48,5 +52,16 @@ dd { margin: 0 0 0 fn.dim(--indent); } + + @include iro.bem-modifier('compact') { + ul, + ol { + padding-left: calc(fn.dim(--compact --indent) - 3px); + } + + dd { + margin-left: calc(fn.dim(--compact --indent) - 3px); + } + } } } diff --git a/tpl/objects/bubble.pug b/tpl/objects/bubble.pug index d04f06b..03fb10d 100644 --- a/tpl/objects/bubble.pug +++ b/tpl/objects/bubble.pug @@ -8,9 +8,9 @@ mixin bubble(user) block ? block() : undefined let classes = { - 'o-bubble': true, - 'o-bubble--compact': attributes.compact, - 't-raised': !attributes.theme + 'o-bubble': true, + 'o-bubble--75': attributes.compact, + 't-raised': !attributes.theme } if (attributes.class) { classes[attributes.class] = true -- cgit v1.2.3-70-g09d2