diff --git a/src/component/form/deprecated/style/_module.scss b/src/component/form/deprecated/style/_module.scss index a7c286b0e..50b376b1b 100644 --- a/src/component/form/deprecated/style/_module.scss +++ b/src/component/form/deprecated/style/_module.scss @@ -117,5 +117,5 @@ } #{ns(info-text)} { - @include icon-image(information-fill, before); + @include icon-image(info-fill, before); } diff --git a/src/component/form/style/_legacy.scss b/src/component/form/style/_legacy.scss index 588370f51..fa8b96af5 100644 --- a/src/component/form/style/_legacy.scss +++ b/src/component/form/style/_legacy.scss @@ -22,7 +22,7 @@ } &--info { - @include icon-legacy(information-fill, sm); + @include icon-legacy(info-fill, sm); } } } diff --git a/src/component/form/style/module/_message.scss b/src/component/form/style/module/_message.scss index 22d7d502f..b51af52b3 100644 --- a/src/component/form/style/module/_message.scss +++ b/src/component/form/style/module/_message.scss @@ -33,6 +33,6 @@ } &--info { - @include icon-image(information-fill, before); + @include icon-image(info-fill, before); } } diff --git a/src/component/main.js b/src/component/main.js index 4e974c4b8..2c47da81e 100644 --- a/src/component/main.js +++ b/src/component/main.js @@ -3,7 +3,6 @@ import './accordion/main.js'; import './button/main.js'; import './card/main.js'; import './segmented/main.js'; -import './range/main.js'; import './breadcrumb/main.js'; import './tooltip/main.js'; import './toggle/main.js'; @@ -16,6 +15,7 @@ import './table/main.js'; import './tag/main.js'; import './transcription/main.js'; import './tile/main.js'; +import './range/main.js'; import './header/main.js'; import './display/main.js'; export default api; diff --git a/src/component/password/style/_legacy.scss b/src/component/password/style/_legacy.scss index a4627fdbd..94a9d4f58 100644 --- a/src/component/password/style/_legacy.scss +++ b/src/component/password/style/_legacy.scss @@ -4,9 +4,17 @@ //// @use 'module/legacy'; +@use 'module/spacing'; -// @include legacy.is(ie11) { -// #{ns(password)} { +@include legacy.is(ie11) { + #{ns(password)} { + &__checkbox { + @include absolute(0, 0); + @include margin(0); -// } -// } + input[type="checkbox"] { + top: spacing.space(-2v); + } + } + } +} diff --git a/src/component/password/style/_module.scss b/src/component/password/style/_module.scss index 36f3af961..d2440bf8a 100644 --- a/src/component/password/style/_module.scss +++ b/src/component/password/style/_module.scss @@ -5,6 +5,8 @@ #{ns(password)} { @include relative; + @include display-flex(row); + flex-wrap: wrap; @include set-text-margin(0 0 2v 0); #{ns-attr(capslock)} { @@ -19,7 +21,19 @@ } &__checkbox { - @include absolute(0, 0); + order: -1; + flex: 0; + align-self: flex-end; + @include margin-left(auto); + @include padding-left(2v); + + #{ns(label)} { + text-wrap: nowrap; + } + } + + #{ns(input-wrap)} { + flex: 1 0 100%; } &__input { @@ -34,21 +48,23 @@ } } - &__label { - @include padding-right(24v); + & > #{ns(label)} { + order: -1; + flex: 1; + min-width: 50%; } #{ns(message)} { &:first-child { - --comma: " "; + --comma: ' '; } } #{ns(message--valid)}#{ns-attr(valid)} { - --content: "\00a0-\00a0" attr(#{ns-attr(valid, null, true)}) var(--comma); + --content: '\00a0-\00a0'attr(#{ns-attr(valid, null, true)}) var(--comma); } #{ns(message--error)}#{ns-attr(error)} { - --content: "\00a0-\00a0" attr(#{ns-attr(error, null, true)}) var(--comma); + --content: '\00a0-\00a0'attr(#{ns-attr(error, null, true)}) var(--comma); } } diff --git a/src/core/style/action/module/_input.scss b/src/core/style/action/module/_input.scss index e8362d8ce..76ffe3924 100644 --- a/src/core/style/action/module/_input.scss +++ b/src/core/style/action/module/_input.scss @@ -35,5 +35,5 @@ input::-webkit-credentials-auto-fill-button { @include margin-left(4v); @include margin-right(-1px); @include size(5v, 5v); - mask-size: #{spacing.space(5v 5v)}; + -webkit-mask-size: #{spacing.space(5v 5v)}; }