diff options
-rw-r--r-- | src/objects/_divider.scss | 30 | ||||
-rw-r--r-- | src/objects/_divider.vars.scss | 8 | ||||
-rw-r--r-- | src/objects/_figure.vars.scss | 2 | ||||
-rw-r--r-- | src/scopes/_figures.scss | 15 | ||||
-rw-r--r-- | src/scopes/_figures.vars.scss | 10 | ||||
-rw-r--r-- | tpl/objects/divider.pug | 2 | ||||
-rw-r--r-- | tpl/views/divider.pug | 10 |
7 files changed, 52 insertions, 25 deletions
diff --git a/src/objects/_divider.scss b/src/objects/_divider.scss index 65f1718..4ed8092 100644 --- a/src/objects/_divider.scss +++ b/src/objects/_divider.scss | |||
@@ -46,10 +46,24 @@ | |||
46 | 46 | ||
47 | @include bem.modifier('vertical') { | 47 | @include bem.modifier('vertical') { |
48 | align-self: stretch; | 48 | align-self: stretch; |
49 | inline-size: 1px; | 49 | inline-size: props.get(vars.$vertical--border-width); |
50 | block-size: auto; | 50 | block-size: auto; |
51 | margin-block: 0; | 51 | margin-block: 0; |
52 | background-color: props.get(vars.$faint--bg-color); | 52 | background-color: props.get(vars.$strong--bg-color); |
53 | |||
54 | &::before, | ||
55 | &::after { | ||
56 | display: none; | ||
57 | } | ||
58 | } | ||
59 | |||
60 | @include bem.modifier('dot') { | ||
61 | align-self: center; | ||
62 | inline-size: props.get(vars.$dot--size); | ||
63 | block-size: props.get(vars.$dot--size); | ||
64 | margin-block: 0; | ||
65 | background-color: props.get(vars.$strong--bg-color); | ||
66 | border-radius: props.get(vars.$dot--size); | ||
53 | 67 | ||
54 | &::before, | 68 | &::before, |
55 | &::after { | 69 | &::after { |
@@ -67,6 +81,14 @@ | |||
67 | block-size: props.get(vars.$medium--border-width); | 81 | block-size: props.get(vars.$medium--border-width); |
68 | background-color: props.get(vars.$medium--bg-color); | 82 | background-color: props.get(vars.$medium--bg-color); |
69 | } | 83 | } |
84 | |||
85 | @include bem.modifier('vertical') { | ||
86 | background-color: props.get(vars.$medium--bg-color); | ||
87 | } | ||
88 | |||
89 | @include bem.modifier('dot') { | ||
90 | background-color: props.get(vars.$medium--bg-color); | ||
91 | } | ||
70 | } | 92 | } |
71 | 93 | ||
72 | @include bem.modifier('faint') { | 94 | @include bem.modifier('faint') { |
@@ -83,6 +105,10 @@ | |||
83 | @include bem.modifier('vertical') { | 105 | @include bem.modifier('vertical') { |
84 | background-color: props.get(vars.$vertical--faint--bg-color); | 106 | background-color: props.get(vars.$vertical--faint--bg-color); |
85 | } | 107 | } |
108 | |||
109 | @include bem.modifier('dot') { | ||
110 | background-color: props.get(vars.$dot--faint--bg-color); | ||
111 | } | ||
86 | } | 112 | } |
87 | 113 | ||
88 | @include bem.modifier('labelled') { | 114 | @include bem.modifier('labelled') { |
diff --git a/src/objects/_divider.vars.scss b/src/objects/_divider.vars.scss index 1117fd5..5cd68c1 100644 --- a/src/objects/_divider.vars.scss +++ b/src/objects/_divider.vars.scss | |||
@@ -3,7 +3,9 @@ | |||
3 | @use 'iro-sass/src/props'; | 3 | @use 'iro-sass/src/props'; |
4 | @use '../core.vars' as core; | 4 | @use '../core.vars' as core; |
5 | 5 | ||
6 | $margin-b: props.def(--o-divider--size, props.get(core.$size--85)) !default; | 6 | $margin-b: props.def(--o-divider--size, props.get(core.$size--85)) !default; |
7 | $vertical--border-width: props.def(--o-divider--vertical--width, props.get(core.$border-width--thin)) !default; | ||
8 | $dot--size: props.def(--o-divider--dot--size, props.get(core.$size--50)) !default; | ||
7 | 9 | ||
8 | $strong--border-width: props.def(--o-divider--strong--border-width, props.get(core.$border-width--thick)) !default; | 10 | $strong--border-width: props.def(--o-divider--strong--border-width, props.get(core.$border-width--thick)) !default; |
9 | $strong--label-font-size: props.def(--o-divider--strong--label-font-size, props.get(core.$font-size--100)) !default; | 11 | $strong--label-font-size: props.def(--o-divider--strong--label-font-size, props.get(core.$font-size--100)) !default; |
@@ -23,7 +25,9 @@ $medium--label-color: props.def(--o-divider--medium--label-color, props.get(core | |||
23 | $faint--bg-color: props.def(--o-divider--faint--bg-color, props.get(core.$theme, --border), 'color') !default; | 25 | $faint--bg-color: props.def(--o-divider--faint--bg-color, props.get(core.$theme, --border), 'color') !default; |
24 | $faint--label-color: props.def(--o-divider--faint--label-color, props.get(core.$theme, --text-mute-more), 'color') !default; | 26 | $faint--label-color: props.def(--o-divider--faint--label-color, props.get(core.$theme, --text-mute-more), 'color') !default; |
25 | 27 | ||
26 | $vertical--faint--bg-color: props.def(--o-divider--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default; | 28 | $vertical--faint--bg-color: props.def(--o-divider--vertical--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default; |
29 | |||
30 | $dot--faint--bg-color: props.def(--o-divider--dot--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default; | ||
27 | 31 | ||
28 | $static-themes: props.def(--o-divider, (), 'color'); | 32 | $static-themes: props.def(--o-divider, (), 'color'); |
29 | 33 | ||
diff --git a/src/objects/_figure.vars.scss b/src/objects/_figure.vars.scss index 357c9dd..f86938d 100644 --- a/src/objects/_figure.vars.scss +++ b/src/objects/_figure.vars.scss | |||
@@ -6,4 +6,4 @@ $border-width: props.def(--s-figures--border-width, props.get(core.$border-width | |||
6 | $font-size: props.def(--s-figures--font-size, props.get(core.$font-size--100)) !default; | 6 | $font-size: props.def(--s-figures--font-size, props.get(core.$font-size--100)) !default; |
7 | 7 | ||
8 | $text-color: props.def(--s-figures--text-color, props.get(core.$theme, --text-mute-more), 'color') !default; | 8 | $text-color: props.def(--s-figures--text-color, props.get(core.$theme, --text-mute-more), 'color') !default; |
9 | $border-color: props.def(--s-figures--border-color, props.get(core.$theme, --border-mute), 'color') !default; | 9 | $border-color: props.def(--s-figures--border-color, props.get(core.$theme, --border), 'color') !default; |
diff --git a/src/scopes/_figures.scss b/src/scopes/_figures.scss index 08a3035..981a8b6 100644 --- a/src/scopes/_figures.scss +++ b/src/scopes/_figures.scss | |||
@@ -1,20 +1,15 @@ | |||
1 | @use 'sass:meta'; | 1 | @use 'sass:meta'; |
2 | @use 'iro-sass/src/bem'; | 2 | @use 'iro-sass/src/bem'; |
3 | @use 'iro-sass/src/props'; | 3 | @use 'iro-sass/src/props'; |
4 | @use '../props' as *; | 4 | @use '../objects/figure.vars' as figure; |
5 | |||
6 | @forward 'figures.vars'; | ||
7 | @use 'figures.vars' as vars; | ||
8 | 5 | ||
9 | @mixin styles { | 6 | @mixin styles { |
10 | @include materialize-at-root(meta.module-variables('vars')); | ||
11 | |||
12 | @include bem.scope('figures') { | 7 | @include bem.scope('figures') { |
13 | figcaption { | 8 | figcaption { |
14 | padding-block: props.get(vars.$pad-b); | 9 | padding-block: props.get(figure.$pad-b); |
15 | font-size: props.get(vars.$font-size); | 10 | font-size: props.get(figure.$font-size); |
16 | color: props.get(vars.$text-color); | 11 | color: props.get(figure.$text-color); |
17 | border-block-end: props.get(vars.$border-width) solid props.get(vars.$border-color); | 12 | border-block-end: props.get(figure.$border-width) solid props.get(figure.$border-color); |
18 | 13 | ||
19 | &::before { | 14 | &::before { |
20 | display: block; | 15 | display: block; |
diff --git a/src/scopes/_figures.vars.scss b/src/scopes/_figures.vars.scss deleted file mode 100644 index 1737078..0000000 --- a/src/scopes/_figures.vars.scss +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | @use 'iro-sass/src/props'; | ||
2 | @use '../core.vars' as core; | ||
3 | @use './implicit.vars' as implicit; | ||
4 | |||
5 | $pad-b: props.def(--s-figures--pad-b, props.get(core.$size--100)) !default; | ||
6 | $border-width: props.def(--s-figures--border-width, props.get(core.$border-width--thin)) !default; | ||
7 | $font-size: props.def(--s-figures--font-size, props.get(core.$font-size--100)) !default; | ||
8 | |||
9 | $text-color: props.def(--s-figures--text-color, props.get(core.$theme, --text-mute-more), 'color') !default; | ||
10 | $border-color: props.def(--s-figures--border-color, props.get(core.$theme, --border-mute), 'color') !default; | ||
diff --git a/tpl/objects/divider.pug b/tpl/objects/divider.pug index 46425cd..ed4d27a 100644 --- a/tpl/objects/divider.pug +++ b/tpl/objects/divider.pug | |||
@@ -3,6 +3,8 @@ mixin divider(level) | |||
3 | let classes = { | 3 | let classes = { |
4 | 'o-divider': true, | 4 | 'o-divider': true, |
5 | 'o-divider--labelled': !!block, | 5 | 'o-divider--labelled': !!block, |
6 | 'o-divider--vertical': !!attributes.vertical, | ||
7 | 'o-divider--dot': !!attributes.dot, | ||
6 | ['o-divider--' + level]: true, | 8 | ['o-divider--' + level]: true, |
7 | ['o-divider--' + attributes.color]: !!attributes.color | 9 | ['o-divider--' + attributes.color]: !!attributes.color |
8 | } | 10 | } |
diff --git a/tpl/views/divider.pug b/tpl/views/divider.pug index e2f2e01..ea08984 100644 --- a/tpl/views/divider.pug +++ b/tpl/views/divider.pug | |||
@@ -23,6 +23,16 @@ mixin view-divider | |||
23 | +divider('medium') | 23 | +divider('medium') |
24 | +divider('faint') | 24 | +divider('faint') |
25 | 25 | ||
26 | .c-box | ||
27 | .l-media(style="height: 1em") | ||
28 | +divider('strong')(vertical=true class="l-media__block") | ||
29 | +divider('medium')(vertical=true class="l-media__block") | ||
30 | +divider('faint')(vertical=true class="l-media__block") | ||
31 | .l-media(style="height: 1em") | ||
32 | +divider('strong')(dot=true class="l-media__block") | ||
33 | +divider('medium')(dot=true class="l-media__block") | ||
34 | +divider('faint')(dot=true class="l-media__block") | ||
35 | |||
26 | each theme in ['accent', 'negative'] | 36 | each theme in ['accent', 'negative'] |
27 | .c-box | 37 | .c-box |
28 | +divider('strong')(color=theme)= 'Strong' | 38 | +divider('strong')(color=theme)= 'Strong' |