diff --git a/packages/opendesign/src/cascader/style/style.scss b/packages/opendesign/src/cascader/style/style.scss index b15350e68353f6ac4d1aaa4a65a215d0c7e84d54..1b38647e588151de772bad18f786601ce0511ba0 100644 --- a/packages/opendesign/src/cascader/style/style.scss +++ b/packages/opendesign/src/cascader/style/style.scss @@ -4,7 +4,6 @@ .o-cascader-panel { position: relative; display: inline-flex; - border-radius: var(--o-radius_control-l); height: 200px; } diff --git a/packages/opendesign/src/collapse/style/var.scss b/packages/opendesign/src/collapse/style/var.scss index c0a5be4b62563a9f34dec43a7676135b1d3255b2..a70a68fc8e9b1c0158fb441d29a637bb4590b149 100644 --- a/packages/opendesign/src/collapse/style/var.scss +++ b/packages/opendesign/src/collapse/style/var.scss @@ -2,7 +2,7 @@ --collapse-radius: var(--o-radius_control-l); --collapse-bg-color: var(--o-color-fill2); --collapse-padding: 8px 32px; - --collapse-division-color: var(--o-color-control1); + --collapse-division-color: var(--o-color-control4); } .o-collapse-item { diff --git a/packages/opendesign/src/toggle/style/index.scss b/packages/opendesign/src/toggle/style/index.scss index d798d182755c829a0ebcddfffd84585d80f88d7a..504d59c44eea7243e3faa4e454b7675ea8b98768 100644 --- a/packages/opendesign/src/toggle/style/index.scss +++ b/packages/opendesign/src/toggle/style/index.scss @@ -1,73 +1,2 @@ -@use '../../_styles/mixin.scss' as *; -@use './var.scss'; - -.o-toggle { - display: inline-flex; - align-items: center; - justify-content: center; - height: var(--toggle-size); - max-width: var(--toggle-max-width); - min-width: var(--toggle-min-width); - padding: var(--toggle-padding); - transition: all var(--o-duration-s) var(--o-easing-standard); - background-color: var(--toggle-bg-color); - border: 1px solid var(--toggle-bd-color); - white-space: nowrap; - border-radius: var(--toggle-radius); - cursor: pointer; - - @include hover { - color: var(--toggle-color-hover); - background-color: var(--toggle-bg-color-hover); - border: 1px solid var(--toggle-bd-color-hover); - } - - &:active { - color: var(--toggle-color-active); - background-color: var(--toggle-bg-color-active); - border: 1px solid var(--toggle-bd-color-active); - } -} - -.o-toggle-checked { - background-color: transparent; - color: var(--toggle-color-checked); - border: 1px solid var(--toggle-bd-color-checked); - - @include hover { - color: var(--toggle-color-checked-hover); - border: 1px solid var(--toggle-bd-color-checked-hover); - } - - &:active { - color: var(--toggle-color-checked-active); - border: 1px solid var(--toggle-bd-color-checked-active); - } -} - -.o-toggle-disabled { - &, - &:hover, - &.active { - cursor: not-allowed; - color: var(--toggle-color-disabled); - background-color: var(--toggle-bg-color-disabled); - border-color: var(--toggle-bd-color-disabled); - } -} - -.o-toggle-checked.o-toggle-disabled { - &, - &:hover, - &.active { - color: var(--toggle-color-checked-disabled); - border-color: var(--toggle-bd-color-checked-disabled); - } -} - -.o-toggle-prefix { - display: inline-flex; - align-items: center; - font-size: var(--toggle-icon-size); - margin-right: var(--toggle-gap); -} +@use './style.scss' as *; +@use './media.scss' as *; diff --git a/packages/opendesign/src/toggle/style/media.scss b/packages/opendesign/src/toggle/style/media.scss new file mode 100644 index 0000000000000000000000000000000000000000..3bdec6ccc43752174545d336235a12a57000f212 --- /dev/null +++ b/packages/opendesign/src/toggle/style/media.scss @@ -0,0 +1,18 @@ +@use '../../_styles/mixin.scss' as *; + +@include respond-to('laptop') { + .o-toggle { + --toggle-text-size: var(--o-font_size-tip1); + --toggle-text-height: var(--o-line_height-tip1); + --toggle-icon-size: var(--o-icon_size_control-xs); + } +} + +@include respond-to('<=pad') { + .o-toggle { + --toggle-padding: 0 11px; + --toggle-text-size: var(--o-font_size-tip2); + --toggle-text-height: var(--o-line_height-tip2); + --toggle-icon-size: var(--o-icon_size_control-xs); + } +} diff --git a/packages/opendesign/src/toggle/style/style.scss b/packages/opendesign/src/toggle/style/style.scss new file mode 100644 index 0000000000000000000000000000000000000000..c4cca274d42972bab93c29077293fafa127f880b --- /dev/null +++ b/packages/opendesign/src/toggle/style/style.scss @@ -0,0 +1,76 @@ +@use '../../_styles/mixin.scss' as *; +@use './var.scss'; + +.o-toggle { + display: inline-flex; + align-items: center; + justify-content: center; + height: var(--toggle-size); + max-width: var(--toggle-max-width); + min-width: var(--toggle-min-width); + padding: var(--toggle-padding); + transition: all var(--o-duration-s) var(--o-easing-standard); + background-color: var(--toggle-bg-color); + border: 1px solid var(--toggle-bd-color); + white-space: nowrap; + border-radius: var(--toggle-radius); + cursor: pointer; + + @include hover { + color: var(--toggle-color-hover); + background-color: var(--toggle-bg-color-hover); + border: 1px solid var(--toggle-bd-color-hover); + } + + &:active { + color: var(--toggle-color-active); + background-color: var(--toggle-bg-color-active); + border: 1px solid var(--toggle-bd-color-active); + } +} + +.o-toggle-checked { + background-color: var(--toggle-bg-color-checked); + color: var(--toggle-color-checked); + border: 1px solid var(--toggle-bd-color-checked); + + @include hover { + color: var(--toggle-color-checked-hover); + background-color: var(--toggle-bg-color-checked-hover); + border: 1px solid var(--toggle-bd-color-checked-hover); + } + + &:active { + color: var(--toggle-color-checked-active); + background-color: var(--toggle-bg-color-checked-active); + border: 1px solid var(--toggle-bd-color-checked-active); + } +} + +.o-toggle-disabled { + &, + &:hover, + &.active { + cursor: not-allowed; + color: var(--toggle-color-disabled); + background-color: var(--toggle-bg-color-disabled); + border-color: var(--toggle-bd-color-disabled); + } +} + +.o-toggle-checked.o-toggle-disabled { + &, + &:hover, + &.active { + color: var(--toggle-color-checked-disabled); + background-color: var(--toggle-bg-color-checked-disabled); + border-color: var(--toggle-bd-color-checked-disabled); + } +} + +.o-toggle-prefix { + display: inline-flex; + align-items: center; + font-size: var(--toggle-icon-size); + margin-right: var(--toggle-gap); +} diff --git a/packages/opendesign/src/toggle/style/var.scss b/packages/opendesign/src/toggle/style/var.scss index 30a17bb99263be76cde41966045a0b9aebf6cac0..5841c7c18f986687aba03db832fe704cbc1f332f 100644 --- a/packages/opendesign/src/toggle/style/var.scss +++ b/packages/opendesign/src/toggle/style/var.scss @@ -16,21 +16,26 @@ --toggle-color-active: var(--o-color-info1); --toggle-color-disabled: var(--o-color-info4); - --toggle-bg-color: var(--o-color-control1-light); + --toggle-bg-color: var(--o-color-fill1); --toggle-bg-color-hover: var(--o-color-control2-light); --toggle-bg-color-active: var(--o-color-control3-light); --toggle-bg-color-disabled: var(--o-color-control4-light); - --toggle-bd-color: var(--o-color-control1-light); - --toggle-bd-color-hover: var(--o-color-control2-light); - --toggle-bd-color-active: var(--o-color-control3-light); - --toggle-bd-color-disabled: var(--o-color-control4-light); + --toggle-bd-color: var(--o-color-fill1); + --toggle-bd-color-hover: transparent; + --toggle-bd-color-active: transparent; + --toggle-bd-color-disabled: transparent; --toggle-color-checked: var(--o-color-primary1); --toggle-color-checked-hover: var(--o-color-primary2); --toggle-color-checked-active: var(--o-color-primary3); --toggle-color-checked-disabled: var(--o-color-primary4); + --toggle-bg-color-checked: transparent; + --toggle-bg-color-checked-hover: transparent; + --toggle-bg-color-checked-active: transparent; + --toggle-bg-color-checked-disabled: transparent; + --toggle-bd-color-checked: var(--o-color-primary1); --toggle-bd-color-checked-hover: var(--o-color-primary2); --toggle-bd-color-checked-active: var(--o-color-primary3);