diff --git a/core/src/components/checkbox/checkbox.ios.scss b/core/src/components/checkbox/checkbox.ios.scss index baf1370c1f7..d634118c4d9 100644 --- a/core/src/components/checkbox/checkbox.ios.scss +++ b/core/src/components/checkbox/checkbox.ios.scss @@ -6,22 +6,22 @@ :host { --size: #{$checkbox-ios-icon-size}; + + // Border --border-radius: #{$checkbox-ios-icon-border-radius}; --border-width: #{$checkbox-ios-icon-border-width}; --border-style: #{$checkbox-ios-icon-border-style}; - --unchecked-border-color: #{$checkbox-ios-icon-border-color-off}; - --unchecked-background: #{$checkbox-ios-background-color-off}; + --border-color: #{$checkbox-ios-icon-border-color-off}; + + // Background + --background: #{$checkbox-ios-background-color-off}; } // iOS Checkbox Inner Checkmark: Checked // ----------------------------------------- .checkbox-inner { - @include position( - calc(var(--size) / 6), - null, null, - calc(var(--size) / 2.5 - 1px) - ); + @include position(calc(var(--size) / 6), null, null, calc(var(--size) / 2.5 - 1px)); position: absolute; diff --git a/core/src/components/checkbox/checkbox.md.scss b/core/src/components/checkbox/checkbox.md.scss index 7b372194770..a2a83564d9e 100644 --- a/core/src/components/checkbox/checkbox.md.scss +++ b/core/src/components/checkbox/checkbox.md.scss @@ -6,11 +6,15 @@ :host { --size: #{$checkbox-md-icon-size}; + + // Border --border-radius: calc(var(--size) * .125); --border-width: #{$checkbox-md-icon-border-width}; --border-style: #{$checkbox-md-icon-border-style}; - --unchecked-border-color: #{$checkbox-md-icon-border-color-off}; - --unchecked-background: #{$checkbox-md-icon-background-color-off}; + --border-color: #{$checkbox-md-icon-border-color-off}; + + // Background + --background: #{$checkbox-md-icon-background-color-off}; --transition: #{background $checkbox-md-transition-duration $checkbox-md-transition-easing}; } @@ -18,11 +22,7 @@ // ----------------------------------------- :host(.checkbox-checked) .checkbox-inner { - @include position( - calc(var(--size) * .05), - null, null, - calc(var(--size) * .3) - ); + @include position(calc(var(--size) * .05), null, null, calc(var(--size) * .3)); position: absolute; diff --git a/core/src/components/checkbox/checkbox.scss b/core/src/components/checkbox/checkbox.scss index d88792461e8..b9370549000 100644 --- a/core/src/components/checkbox/checkbox.scss +++ b/core/src/components/checkbox/checkbox.scss @@ -6,18 +6,20 @@ :host { --ion-color-base: #{ion-color(primary, base)}; --ion-color-contrast: #{ion-color(primary, contrast)}; - --background: var(--unchecked-backgroud); - --border-color: var(--unchecked-border-color); - --checked-border-color: #{current-color(base)}; - --checked-background: #{current-color(base)}; + + // Checked colors + --background-checked: #{current-color(base)}; + --border-color-checked: #{current-color(base)}; + --checkmark-color: #{current-color(contrast)}; display: inline-block; position: relative; } -:host(.checkbox-checked) { - --background: var(--checked-background); - --border-color: var(--checked-border-color); +:host(.checkbox-checked) .checkbox-icon { + border-color: var(--border-color-checked); + + background: var(--background-checked); } :host(.checkbox-checked) .checkbox-inner { @@ -36,17 +38,19 @@ input { width: var(--size); height: var(--size); + transition: var(--transition); + border-width: var(--border-width); border-style: var(--border-style); border-color: var(--border-color); - background-color: var(--background); + background: var(--background); contain: strict; } .checkbox-inner { - border-color: #{current-color(contrast)}; + border-color: var(--checkmark-color); opacity: 0; } diff --git a/core/src/components/checkbox/test/standalone/index.html b/core/src/components/checkbox/test/standalone/index.html index f67cce515c7..67b3b9feea1 100644 --- a/core/src/components/checkbox/test/standalone/index.html +++ b/core/src/components/checkbox/test/standalone/index.html @@ -9,11 +9,26 @@ -
- + +