diff options
| author | Volpeon <git@volpeon.ink> | 2025-07-22 18:28:08 +0200 |
|---|---|---|
| committer | Volpeon <git@volpeon.ink> | 2025-07-22 18:28:08 +0200 |
| commit | 84e24e1df83806a139f4b402336cf1c8ada58d67 (patch) | |
| tree | 651df7647252c63e9bb00837ee1ae0aff8b9183c /src/objects | |
| parent | Fix (diff) | |
| download | iro-design-84e24e1df83806a139f4b402336cf1c8ada58d67.tar.gz iro-design-84e24e1df83806a139f4b402336cf1c8ada58d67.tar.bz2 iro-design-84e24e1df83806a139f4b402336cf1c8ada58d67.zip | |
Various fixes
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/_action-button.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_card.scss | 31 | ||||
| -rw-r--r-- | src/objects/_card.vars.scss | 6 | ||||
| -rw-r--r-- | src/objects/_checkbox.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_emoji.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_popover.vars.scss | 9 | ||||
| -rw-r--r-- | src/objects/_radio.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_side-nav.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_switch.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_tabbar.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_table.vars.scss | 2 | ||||
| -rw-r--r-- | src/objects/_thumbnail.vars.scss | 2 |
12 files changed, 37 insertions, 27 deletions
diff --git a/src/objects/_action-button.vars.scss b/src/objects/_action-button.vars.scss index 84bb415..10d345b 100644 --- a/src/objects/_action-button.vars.scss +++ b/src/objects/_action-button.vars.scss | |||
| @@ -52,7 +52,7 @@ $default-theme-override: () !default; | |||
| 52 | $default-theme: map.deep-merge(( | 52 | $default-theme: map.deep-merge(( |
| 53 | --bg-color: props.get(core.$theme, --bg-l2), | 53 | --bg-color: props.get(core.$theme, --bg-l2), |
| 54 | --label-color: props.get(core.$theme, --text), | 54 | --label-color: props.get(core.$theme, --text), |
| 55 | --border-color: props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), | 55 | --border-color: props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border-strong), |
| 56 | --shadow-color: props.get(core.$theme, --shadow), | 56 | --shadow-color: props.get(core.$theme, --shadow), |
| 57 | 57 | ||
| 58 | --hover: ( | 58 | --hover: ( |
diff --git a/src/objects/_card.scss b/src/objects/_card.scss index 6b80e2f..966bcd0 100644 --- a/src/objects/_card.scss +++ b/src/objects/_card.scss | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | position: relative; | 14 | position: relative; |
| 15 | display: flex; | 15 | display: flex; |
| 16 | flex-direction: column; | 16 | flex-direction: column; |
| 17 | background-clip: content-box; | ||
| 18 | background-color: props.get(vars.$bg-color); | 17 | background-color: props.get(vars.$bg-color); |
| 19 | border: props.get(vars.$border-width) solid transparent; | 18 | border: props.get(vars.$border-width) solid transparent; |
| 20 | border-color: props.get(vars.$border-color); | 19 | border-color: props.get(vars.$border-color); |
| @@ -42,19 +41,31 @@ | |||
| 42 | } | 41 | } |
| 43 | } | 42 | } |
| 44 | 43 | ||
| 44 | @include bem.modifier('borderless') { | ||
| 45 | border-color: props.get(vars.$bg-color); | ||
| 46 | |||
| 47 | @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') { | ||
| 48 | &:hover, | ||
| 49 | &:active { | ||
| 50 | border-color: props.get(vars.$hover--bg-color); | ||
| 51 | } | ||
| 52 | } | ||
| 53 | } | ||
| 54 | |||
| 45 | @include bem.elem('avatar') { | 55 | @include bem.elem('avatar') { |
| 46 | margin-block-start: props.get(vars.$pad-b); | 56 | margin-block-start: props.get(vars.$pad-b); |
| 47 | margin-inline-start: props.get(vars.$pad-i); | 57 | margin-inline-start: props.get(vars.$pad-i); |
| 48 | } | 58 | } |
| 49 | 59 | ||
| 50 | @include bem.elem('image') { | 60 | @include bem.elem('image') { |
| 51 | position: relative; | 61 | position: relative; |
| 52 | display: block; | 62 | display: block; |
| 53 | flex: 0 0 auto; | 63 | flex: 0 0 auto; |
| 54 | inline-size: 100%; | 64 | inline-size: calc(100% + 2 * props.get(vars.$border-width)); |
| 55 | overflow: hidden; | 65 | margin: calc(-1 * props.get(vars.$border-width)); |
| 56 | object-fit: cover; | 66 | overflow: hidden; |
| 57 | transition: background-color .2s, transform .2s, opacity .2s; | 67 | object-fit: cover; |
| 68 | transition: background-color .2s, transform .2s, opacity .2s; | ||
| 58 | 69 | ||
| 59 | &:first-child { | 70 | &:first-child { |
| 60 | border-start-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width)); | 71 | border-start-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width)); |
| @@ -121,7 +132,6 @@ | |||
| 121 | margin-inline: 0; | 132 | margin-inline: 0; |
| 122 | background-color: transparent; | 133 | background-color: transparent; |
| 123 | border: 0; | 134 | border: 0; |
| 124 | box-shadow: none; | ||
| 125 | 135 | ||
| 126 | @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') { | 136 | @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') { |
| 127 | &:hover, | 137 | &:hover, |
| @@ -141,7 +151,6 @@ | |||
| 141 | margin: 0; | 151 | margin: 0; |
| 142 | outline: none; | 152 | outline: none; |
| 143 | border: 0; | 153 | border: 0; |
| 144 | box-shadow: none; | ||
| 145 | 154 | ||
| 146 | @include bem.elem('image') { | 155 | @include bem.elem('image') { |
| 147 | margin: calc(-1 * props.get(vars.$key-focus--border-width)); | 156 | margin: calc(-1 * props.get(vars.$key-focus--border-width)); |
| @@ -179,8 +188,6 @@ | |||
| 179 | 188 | ||
| 180 | @include bem.modifier('thumbnail') { | 189 | @include bem.modifier('thumbnail') { |
| 181 | @include bem.elem('image') { | 190 | @include bem.elem('image') { |
| 182 | inline-size: calc(100% + 2 * props.get(vars.$border-width)); | ||
| 183 | margin: calc(-1 * props.get(vars.$border-width)); | ||
| 184 | border-radius: props.get(vars.$rounding); | 191 | border-radius: props.get(vars.$rounding); |
| 185 | } | 192 | } |
| 186 | 193 | ||
diff --git a/src/objects/_card.vars.scss b/src/objects/_card.vars.scss index c5bbc0d..592182e 100644 --- a/src/objects/_card.vars.scss +++ b/src/objects/_card.vars.scss | |||
| @@ -14,10 +14,16 @@ $image-overlay--pad-b: props.def(--o-card--image-overlay--pad-b, props.get($pad- | |||
| 14 | 14 | ||
| 15 | $hover--offset-b: props.def(--o-card--hover--offset-b, calc(-1 * props.get(core.$size--65))) !default; | 15 | $hover--offset-b: props.def(--o-card--hover--offset-b, calc(-1 * props.get(core.$size--65))) !default; |
| 16 | 16 | ||
| 17 | $shadow-x: props.def(--o-card--shadow-x, props.get(core.$shadow--l2--x)) !default; | ||
| 18 | $shadow-y: props.def(--o-card--shadow-y, props.get(core.$shadow--l2--y)) !default; | ||
| 19 | $shadow-blur: props.def(--o-card--shadow-blur, props.get(core.$shadow--l2--blur)) !default; | ||
| 20 | $shadow-grow: props.def(--o-card--shadow-grow, props.get(core.$shadow--l2--grow)) !default; | ||
| 21 | |||
| 17 | $key-focus--border-width: props.def(--o-card--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; | 22 | $key-focus--border-width: props.def(--o-card--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; |
| 18 | $key-focus--border-offset: props.def(--o-card--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; | 23 | $key-focus--border-offset: props.def(--o-card--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; |
| 19 | $key-focus--outline-width: props.def(--o-card--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default; | 24 | $key-focus--outline-width: props.def(--o-card--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default; |
| 20 | 25 | ||
| 26 | $shadow-color: props.def(--o-card--shadow-color, props.get(core.$theme, --shadow), 'color') !default; | ||
| 21 | $bg-color: props.def(--o-card--bg-color, props.get(core.$theme, --bg-l2), 'color') !default; | 27 | $bg-color: props.def(--o-card--bg-color, props.get(core.$theme, --bg-l2), 'color') !default; |
| 22 | $border-color: props.def(--o-card--border-color, props.get(core.$theme, --box, --border), 'color') !default; | 28 | $border-color: props.def(--o-card--border-color, props.get(core.$theme, --box, --border), 'color') !default; |
| 23 | $divider-color: props.def(--o-card--divider-color, props.get(core.$theme, --border-mute), 'color') !default; | 29 | $divider-color: props.def(--o-card--divider-color, props.get(core.$theme, --border-mute), 'color') !default; |
diff --git a/src/objects/_checkbox.vars.scss b/src/objects/_checkbox.vars.scss index aee26e6..25a0d3d 100644 --- a/src/objects/_checkbox.vars.scss +++ b/src/objects/_checkbox.vars.scss | |||
| @@ -7,7 +7,7 @@ $label-gap: props.def(--o-checkbox--label-gap, props.get(core.$size--125)) | |||
| 7 | $border-width: props.def(--o-checkbox--border-width, props.get(core.$border-width--medium)) !default; | 7 | $border-width: props.def(--o-checkbox--border-width, props.get(core.$border-width--medium)) !default; |
| 8 | $pad-i: props.def(--o-checkbox--pad-i, props.get(core.$size--65)) !default; | 8 | $pad-i: props.def(--o-checkbox--pad-i, props.get(core.$size--65)) !default; |
| 9 | $pad-b: props.def(--o-checkbox--pad-b, props.get(core.$size--65)) !default; | 9 | $pad-b: props.def(--o-checkbox--pad-b, props.get(core.$size--65)) !default; |
| 10 | $rounding: props.def(--o-checkbox--rounding, props.get(core.$rounding)) !default; | 10 | $rounding: props.def(--o-checkbox--rounding, props.get(core.$rounding--sm)) !default; |
| 11 | $spacing-sibling: props.def(--o-checkbox--spacing-sibling, props.get(core.$size--300)) !default; | 11 | $spacing-sibling: props.def(--o-checkbox--spacing-sibling, props.get(core.$size--300)) !default; |
| 12 | 12 | ||
| 13 | $key-focus--border-width: props.def(--o-checkbox--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; | 13 | $key-focus--border-width: props.def(--o-checkbox--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; |
diff --git a/src/objects/_emoji.vars.scss b/src/objects/_emoji.vars.scss index fbfb935..073f88b 100644 --- a/src/objects/_emoji.vars.scss +++ b/src/objects/_emoji.vars.scss | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | $size: props.def(--o-emoji--size, calc(1 / 14 * 18em)) !default; | 5 | $size: props.def(--o-emoji--size, calc(1 / 14 * 18em)) !default; |
| 6 | $pad: props.def(--o-emoji--pad, .3em) !default; | 6 | $pad: props.def(--o-emoji--pad, .3em) !default; |
| 7 | $rounding: props.def(--o-emoji--rounding, props.get(core.$rounding)) !default; | 7 | $rounding: props.def(--o-emoji--rounding, props.get(core.$rounding--sm)) !default; |
| 8 | $zoom: props.def(--o-emoji--zoom, 3) !default; | 8 | $zoom: props.def(--o-emoji--zoom, 3) !default; |
| 9 | $valign: props.def(--o-emoji--valign, -.25em) !default; | 9 | $valign: props.def(--o-emoji--valign, -.25em) !default; |
| 10 | 10 | ||
diff --git a/src/objects/_popover.vars.scss b/src/objects/_popover.vars.scss index 451cc18..e560d1b 100644 --- a/src/objects/_popover.vars.scss +++ b/src/objects/_popover.vars.scss | |||
| @@ -14,9 +14,6 @@ $shadow-y: props.def(--o-popover--shadow-y, props.get(core.$shadow--l2--y)) ! | |||
| 14 | $shadow-blur: props.def(--o-popover--shadow-blur, props.get(core.$shadow--l2--blur)) !default; | 14 | $shadow-blur: props.def(--o-popover--shadow-blur, props.get(core.$shadow--l2--blur)) !default; |
| 15 | $shadow-grow: props.def(--o-popover--shadow-grow, props.get(core.$shadow--l2--grow)) !default; | 15 | $shadow-grow: props.def(--o-popover--shadow-grow, props.get(core.$shadow--l2--grow)) !default; |
| 16 | 16 | ||
| 17 | $bg-color: props.def(--o-popover--bg-color, props.get(core.$theme, --bg-l2), 'color') !default; | 17 | $bg-color: props.def(--o-popover--bg-color, props.get(core.$theme, --bg-l2), 'color') !default; |
| 18 | $border-color: props.def(--o-popover--border-color, props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), 'color') !default; | 18 | $border-color: props.def(--o-popover--border-color, props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border-strong), 'color') !default; |
| 19 | 19 | $shadow-color: props.def(--o-popover--shadow-color, props.get(core.$theme, --shadow), 'color') !default; | |
| 20 | $shadow-color: props.def(--o-popover--shadow-color, props.get(core.$transparent-colors, --black, --200), 'color') !default; | ||
| 21 | |||
| 22 | $border-color-dark: props.def(--o-popover--border-color, props.get(core.$theme, --border-mute), 'dark') !default; | ||
diff --git a/src/objects/_radio.vars.scss b/src/objects/_radio.vars.scss index 51ea581..b18ae2b 100644 --- a/src/objects/_radio.vars.scss +++ b/src/objects/_radio.vars.scss | |||
| @@ -7,7 +7,7 @@ $label-gap: props.def(--o-radio--label-gap, props.get(core.$size--125)) ! | |||
| 7 | $border-width: props.def(--o-radio--border-width, props.get(core.$border-width--medium)) !default; | 7 | $border-width: props.def(--o-radio--border-width, props.get(core.$border-width--medium)) !default; |
| 8 | $pad-i: props.def(--o-radio--pad-i, props.get(core.$size--65)) !default; | 8 | $pad-i: props.def(--o-radio--pad-i, props.get(core.$size--65)) !default; |
| 9 | $pad-b: props.def(--o-radio--pad-b, props.get(core.$size--65)) !default; | 9 | $pad-b: props.def(--o-radio--pad-b, props.get(core.$size--65)) !default; |
| 10 | $rounding: props.def(--o-radio--rounding, props.get(core.$rounding)) !default; | 10 | $rounding: props.def(--o-radio--rounding, props.get(core.$rounding--sm)) !default; |
| 11 | $spacing-sibling: props.def(--o-radio--spacing-sibling, props.get(core.$size--300)) !default; | 11 | $spacing-sibling: props.def(--o-radio--spacing-sibling, props.get(core.$size--300)) !default; |
| 12 | 12 | ||
| 13 | $key-focus--border-width: props.def(--o-radio--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; | 13 | $key-focus--border-width: props.def(--o-radio--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; |
diff --git a/src/objects/_side-nav.vars.scss b/src/objects/_side-nav.vars.scss index 122dba6..711b2a7 100644 --- a/src/objects/_side-nav.vars.scss +++ b/src/objects/_side-nav.vars.scss | |||
| @@ -8,7 +8,7 @@ $separator: props.def(--o-side-nav--separator, props.get(core.$size--200 | |||
| 8 | 8 | ||
| 9 | $item--pad-i: props.def(--o-side-nav--item--pad-i, props.get(core.$size--150)) !default; | 9 | $item--pad-i: props.def(--o-side-nav--item--pad-i, props.get(core.$size--150)) !default; |
| 10 | $item--pad-b: props.def(--o-side-nav--item--pad-b, props.get(core.$size--100)) !default; | 10 | $item--pad-b: props.def(--o-side-nav--item--pad-b, props.get(core.$size--100)) !default; |
| 11 | $item--rounding: props.def(--o-side-nav--item--rounding, props.get(core.$rounding)) !default; | 11 | $item--rounding: props.def(--o-side-nav--item--rounding, props.get(core.$rounding--sm)) !default; |
| 12 | 12 | ||
| 13 | $item--key-focus--border-width: props.def(--o-side-nav--item--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; | 13 | $item--key-focus--border-width: props.def(--o-side-nav--item--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; |
| 14 | $item--key-focus--border-offset: props.def(--o-side-nav--item--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; | 14 | $item--key-focus--border-offset: props.def(--o-side-nav--item--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default; |
diff --git a/src/objects/_switch.vars.scss b/src/objects/_switch.vars.scss index 85596af..10489a5 100644 --- a/src/objects/_switch.vars.scss +++ b/src/objects/_switch.vars.scss | |||
| @@ -8,7 +8,7 @@ $label-gap: props.def(--o-switch--label-gap, props.get(core.$size--125)) ! | |||
| 8 | $border-width: props.def(--o-switch--border-width, props.get(core.$border-width--medium)) !default; | 8 | $border-width: props.def(--o-switch--border-width, props.get(core.$border-width--medium)) !default; |
| 9 | $pad-i: props.def(--o-switch--pad-i, props.get(core.$size--65)) !default; | 9 | $pad-i: props.def(--o-switch--pad-i, props.get(core.$size--65)) !default; |
| 10 | $pad-b: props.def(--o-switch--pad-b, props.get(core.$size--65)) !default; | 10 | $pad-b: props.def(--o-switch--pad-b, props.get(core.$size--65)) !default; |
| 11 | $rounding: props.def(--o-switch--rounding, props.get(core.$rounding)) !default; | 11 | $rounding: props.def(--o-switch--rounding, props.get(core.$rounding--sm)) !default; |
| 12 | $spacing-sibling: props.def(--o-switch--spacing-sibling, props.get(core.$size--300)) !default; | 12 | $spacing-sibling: props.def(--o-switch--spacing-sibling, props.get(core.$size--300)) !default; |
| 13 | 13 | ||
| 14 | $key-focus--border-width: props.def(--o-switch--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; | 14 | $key-focus--border-width: props.def(--o-switch--key-focus--border-width, props.get(core.$key-focus--border-width)) !default; |
diff --git a/src/objects/_tabbar.vars.scss b/src/objects/_tabbar.vars.scss index f4486d6..4095629 100644 --- a/src/objects/_tabbar.vars.scss +++ b/src/objects/_tabbar.vars.scss | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | @use '../core.vars' as core; | 4 | @use '../core.vars' as core; |
| 5 | 5 | ||
| 6 | $block-size: props.def(--o-tabbar--block-size, props.get(core.$size--700)) !default; | 6 | $block-size: props.def(--o-tabbar--block-size, props.get(core.$size--700)) !default; |
| 7 | $rounding: props.def(--o-tabbar--rounding, props.get(core.$rounding)) !default; | 7 | $rounding: props.def(--o-tabbar--rounding, props.get(core.$rounding--sm)) !default; |
| 8 | $spacing: props.def(--o-tabbar--spacing, props.get(core.$size--400)) !default; | 8 | $spacing: props.def(--o-tabbar--spacing, props.get(core.$size--400)) !default; |
| 9 | $tab--pad-i: props.def(--o-tabbar--tab--pad-i, props.get(core.$size--50)) !default; | 9 | $tab--pad-i: props.def(--o-tabbar--tab--pad-i, props.get(core.$size--50)) !default; |
| 10 | 10 | ||
diff --git a/src/objects/_table.vars.scss b/src/objects/_table.vars.scss index d1d53d7..b8d8093 100644 --- a/src/objects/_table.vars.scss +++ b/src/objects/_table.vars.scss | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | $pad-i: props.def(--o-table--pad-i, props.get(core.$size--175)) !default; | 5 | $pad-i: props.def(--o-table--pad-i, props.get(core.$size--175)) !default; |
| 6 | $pad-b: props.def(--o-table--pad-b, props.get(core.$size--125)) !default; | 6 | $pad-b: props.def(--o-table--pad-b, props.get(core.$size--125)) !default; |
| 7 | $rounding: props.def(--o-table--rounding, props.get(core.$rounding)) !default; | 7 | $rounding: props.def(--o-table--rounding, props.get(core.$rounding--sm)) !default; |
| 8 | $border-width: props.def(--o-table--border-width, props.get(core.$border-width--thin)) !default; | 8 | $border-width: props.def(--o-table--border-width, props.get(core.$border-width--thin)) !default; |
| 9 | 9 | ||
| 10 | $heading--font-family: props.def(--o-table--heading--font-family, props.get(core.$font--standard--family)) !default; | 10 | $heading--font-family: props.def(--o-table--heading--font-family, props.get(core.$font--standard--family)) !default; |
diff --git a/src/objects/_thumbnail.vars.scss b/src/objects/_thumbnail.vars.scss index ba8cebe..60bf2e9 100644 --- a/src/objects/_thumbnail.vars.scss +++ b/src/objects/_thumbnail.vars.scss | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | @use '../core.vars' as core; | 4 | @use '../core.vars' as core; |
| 5 | 5 | ||
| 6 | $size: props.def(--o-thumbnail--size, props.get(core.$size--700)) !default; | 6 | $size: props.def(--o-thumbnail--size, props.get(core.$size--700)) !default; |
| 7 | $rounding: props.def(--o-thumbnail--rounding, props.get(core.$rounding)) !default; | 7 | $rounding: props.def(--o-thumbnail--rounding, props.get(core.$rounding--sm)) !default; |
| 8 | $spacing: props.def(--o-thumbnail--spacing, props.get(core.$size--100)) !default; | 8 | $spacing: props.def(--o-thumbnail--spacing, props.get(core.$size--100)) !default; |
| 9 | $border-width: props.def(--o-thumbnail--border-width, props.get(core.$border-width--thin)) !default; | 9 | $border-width: props.def(--o-thumbnail--border-width, props.get(core.$border-width--thin)) !default; |
| 10 | 10 | ||
