diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 02aa03c119..5927b685d0 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -671,22 +671,16 @@ Checkbox State ---------------------*/ .ui.form .fields.@{state} .field .checkbox:not(.toggle):not(.slider) label, - .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) label, - .ui.form .fields.@{state} .field .checkbox:not(.toggle):not(.slider) .box, - .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) .box { + .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) label { color: @c; } .ui.form .fields.@{state} .field .checkbox:not(.toggle):not(.slider) label:before, - .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) label:before, - .ui.form .fields.@{state} .field .checkbox:not(.toggle):not(.slider) .box:before, - .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) .box:before { + .ui.form .field.@{state} .checkbox:not(.toggle):not(.slider) label:before { background: @bg; border-color: @bdc; } .ui.form .fields.@{state} .field .checkbox label:after, - .ui.form .field.@{state} .checkbox label:after, - .ui.form .fields.@{state} .field .checkbox .box:after, - .ui.form .field.@{state} .checkbox .box:after { + .ui.form .field.@{state} .checkbox label:after { color: @c; } @@ -813,9 +807,7 @@ .ui.inverted.form label, .ui.form .inverted.segment label, .ui.form .inverted.segment .ui.checkbox label, - .ui.form .inverted.segment .ui.checkbox .box, .ui.inverted.form .ui.checkbox label, - .ui.inverted.form .ui.checkbox .box, .ui.inverted.form .inline.fields > label, .ui.inverted.form .inline.fields .field > label, .ui.inverted.form .inline.fields .field > p, diff --git a/src/definitions/modules/checkbox.js b/src/definitions/modules/checkbox.js index 60e2fc6aaa..f2dbb5d675 100644 --- a/src/definitions/modules/checkbox.js +++ b/src/definitions/modules/checkbox.js @@ -864,7 +864,7 @@ $.fn.checkbox.settings = { selector : { checkbox : '.ui.checkbox', - label : 'label, .box', + label : 'label', input : 'input[type="checkbox"], input[type="radio"]', link : 'a[href]' } diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less index 43a5376735..9b18d2b7b1 100755 --- a/src/definitions/modules/checkbox.less +++ b/src/definitions/modules/checkbox.less @@ -55,126 +55,6 @@ } -& when (@variationCheckboxBox) { - /*-------------- - Box - ---------------*/ - - /* .box selector is deprecated and will be removed in v3 */ - .ui.checkbox .box { - &:extend(.ui.checkbox label all); - } - .ui.checkbox + .box { - &:extend(.ui.checkbox + label all); - } - .ui.checkbox input:focus ~ .box { - &:extend(.ui.checkbox input:focus ~ label all); - } - .ui.checkbox input:checked ~ .box { - &:extend(.ui.checkbox input:checked ~ label all); - } - & when (@variationCheckboxIndeterminate) { - .ui.checkbox input:not([type=radio]):indeterminate ~ .box { - &:extend(.ui.checkbox input:not([type=radio]):indeterminate ~ label all); - } - .ui.checkbox input:not([type=radio]):indeterminate:focus ~ .box { - &:extend(.ui.checkbox input:not([type=radio]):indeterminate:focus ~ label all); - } - } - .ui.checkbox input:checked:focus ~ .box { - &:extend(.ui.checkbox input:checked:focus ~ label all); - } - & when (@variationCheckboxDisabled) { - .ui.disabled.checkbox .box { - &:extend(.ui.disabled.checkbox label all); - } - - .ui.checkbox input[disabled] ~ .box { - &:extend(.ui.checkbox input[disabled] ~ label all); - } - } - & when (@variationCheckboxRadio) { - .ui.radio.checkbox .box { - &:extend(.ui.radio.checkbox label all); - } - .ui.radio.checkbox input:focus ~ .box { - &:extend(.ui.radio.checkbox input:focus ~ label all); - } - .ui.radio.checkbox input:indeterminate ~ .box { - &:extend(.ui.radio.checkbox input:indeterminate ~ label all); - } - .ui.radio.checkbox input:checked ~ .box { - &:extend(.ui.radio.checkbox input:checked ~ label all); - } - .ui.radio.checkbox input:focus:checked ~ .box { - &:extend(.ui.radio.checkbox input:focus:checked ~ label all); - } - } - & when (@variationCheckboxSlider) { - .ui.slider.checkbox .box { - &:extend(.ui.slider.checkbox label all); - } - .ui.slider.checkbox input:focus ~ .box { - &:extend(.ui.slider.checkbox input:focus ~ label all); - } - .ui.slider.checkbox input:checked ~ .box { - &:extend(.ui.slider.checkbox input:checked ~ label all); - } - .ui.slider.checkbox input:focus:checked ~ .box { - &:extend(.ui.slider.checkbox input:focus:checked ~ label all); - } - } - & when (@variationCheckboxToggle) { - .ui.toggle.checkbox .box { - &:extend(.ui.toggle.checkbox label all); - } - .ui.toggle.checkbox input ~ .box { - &:extend(.ui.toggle.checkbox input ~ label all); - } - .ui.toggle.checkbox input:focus ~ .box { - &:extend(.ui.toggle.checkbox input:focus ~ label all); - } - .ui.toggle.checkbox input:checked ~ .box { - &:extend(.ui.toggle.checkbox input:checked ~ label all); - } - .ui.toggle.checkbox input:focus:checked ~ .box { - &:extend(.ui.toggle.checkbox input:focus:checked ~ label all); - } - } - & when (@variationCheckboxFitted) { - .ui.fitted.checkbox .box { - &:extend(.ui.fitted.checkbox label all); - } - } - & when (@variationCheckboxInverted) { - .ui.inverted.checkbox .box { - &:extend(.ui.inverted.checkbox label all); - } - & when (@variationCheckboxSlider) { - .ui.inverted.slider.checkbox .box { - &:extend(.ui.inverted.slider.checkbox label all); - } - .ui.inverted.slider.checkbox input:checked ~ .box { - &:extend(.ui.inverted.slider.checkbox input:checked ~ label all); - } - .ui.inverted.slider.checkbox input:focus:checked ~ .box { - &:extend(.ui.inverted.slider.checkbox input:focus:checked ~ label all); - } - } - & when (@variationCheckboxToggle) { - .ui.inverted.toggle.checkbox .box { - &:extend(.ui.inverted.toggle.checkbox label all); - } - .ui.inverted.toggle.checkbox input:checked ~ .box { - &:extend(.ui.inverted.toggle.checkbox input:checked ~ label all); - } - .ui.inverted.toggle.checkbox input:focus:checked ~ .box { - &:extend(.ui.inverted.toggle.checkbox input:focus:checked ~ label all); - } - } - } -} - .ui.checkbox label { cursor: auto; position: relative; @@ -833,32 +713,6 @@ each(@variationCheckboxSizes, { } } } - & when (@@raw > 1) and (@variationCheckboxBox) { - .ui.@{value}.form .checkbox, - .ui.@{value}.checkbox { - &:not(.slider):not(.toggle):not(.radio) { - & - .box:after, - .box:before { - transform: scale(@@raw); - transform-origin:left; - } - } - &.radio when (@variationCheckboxRadio) { - & - .box:before { - transform: scale(@@raw); - transform-origin:left; - } - & - .box:after { - transform:scale(@@circleScale); - transform-origin:left; - left: @@circleLeft; - } - } - } - } }) .loadUIOverrides(); diff --git a/src/themes/default/globals/variation.variables b/src/themes/default/globals/variation.variables index f0b2a9111c..e3b6ea2778 100644 --- a/src/themes/default/globals/variation.variables +++ b/src/themes/default/globals/variation.variables @@ -383,7 +383,6 @@ @variationCalendarDisabled: true; /* Checkbox */ -@variationCheckboxBox: false; //.box (instead of label) is an ancient fragment of sui v1 and not even documented in v2.x anymore @variationCheckboxDisabled: true; @variationCheckboxReadonly: true; @variationCheckboxInverted: true;