Browse Source

Redo icon font for indeterminate state, begin js modifications

flex-list
jlukic 10 years ago
parent
commit
5ddc8875c6
4 changed files with 69 additions and 74 deletions
  1. 3
      src/definitions/modules/checkbox.js
  2. 110
      src/definitions/modules/checkbox.less
  3. 28
      src/themes/default/modules/checkbox.overrides
  4. 2
      src/themes/default/modules/checkbox.variables

3
src/definitions/modules/checkbox.js

@ -173,6 +173,9 @@ $.fn.checkbox = function(parameters) {
radio: function() {
return ($input.hasClass(className.radio) || $input.attr('type') == 'radio');
},
indeterminate: function() {
return $input.prop('indeterminate') !== undefined && $input.prop('indeterminate');
},
checked: function() {
return $input.prop('checked') !== undefined && $input.prop('checked');
},

110
src/definitions/modules/checkbox.less

@ -162,37 +162,13 @@
}
/*--------------
Active
---------------*/
.ui.checkbox input[type="checkbox"]:checked ~ .box:before,
.ui.checkbox input[type="checkbox"]:checked ~ label:before,
.ui.checkbox input[type="radio"]:checked ~ .box:before,
.ui.checkbox input[type="radio"]:checked ~ label:before {
background: @checkboxActiveBackground;
border-color: @checkboxActiveBorderColor;
}
.ui.checkbox input[type="checkbox"]:checked ~ .box:after,
.ui.checkbox input[type="checkbox"]:checked ~ label:after,
.ui.checkbox input[type="radio"]:checked ~ .box:after,
.ui.checkbox input[type="radio"]:checked ~ label:after {
opacity: 1;
color: @checkboxActiveColor;
}
/*--------------
Focus
Focus
---------------*/
.ui.checkbox input[type="checkbox"]:focus ~ .box:before,
.ui.checkbox input[type="checkbox"]:focus ~ label:before,
.ui.checkbox input[type="radio"]:focus ~ .box:before,
.ui.checkbox input[type="radio"]:focus ~ label:before,
.ui.checkbox input[type="checkbox"]:checked:focus ~ .box:before,
.ui.checkbox input[type="checkbox"]:checked:focus ~ label:before,
.ui.checkbox input[type="radio"]:checked:focus ~ .box:before,
.ui.checkbox input[type="radio"]:checked:focus ~ label:before {
.ui.checkbox input[type="radio"]:focus ~ label:before {
background: @checkboxFocusedBackground;
border-color: @checkboxFocusedBorderColor;
}
@ -207,6 +183,31 @@
color: @labelFocusedColor;
}
/*--------------
Active
---------------*/
.ui.checkbox input:checked ~ .box:before,
.ui.checkbox input:checked ~ label:before {
background: @checkboxActiveBackground;
border-color: @checkboxActiveBorderColor;
}
.ui.checkbox input:checked ~ .box:after,
.ui.checkbox input:checked ~ label:after {
opacity: 1;
color: @checkboxActiveColor;
}
/*--------------
Active Focus
---------------*/
.ui.checkbox input[type="radio"]:checked:focus ~ .box:before,
.ui.checkbox input[type="radio"]:checked:focus ~ label:before {
background: @checkboxFocusedBackground;
border-color: @checkboxFocusedBorderColor;
}
/*--------------
@ -254,19 +255,21 @@
/* Box */
.ui.radio.checkbox .box:before,
.ui.radio.checkbox label:before {
content: '';
transform: none;
width: @radioSize;
height: @radioSize;
border-radius: @circularRadius;
top: @radioTop;
left: @radioLeft;
transform: none;
}
/* Circle */
.ui.radio.checkbox .box:after,
.ui.radio.checkbox label:after {
border: none;
content: '';
content: '' !important;
width: @radioSize;
height: @radioSize;
line-height: @radioSize;
@ -314,13 +317,13 @@
.ui.slider.checkbox .box:before,
.ui.slider.checkbox label:before {
display: block;
position: absolute;
content: '';
top: @sliderLineVerticalOffset;
border: none !important;
left: 0em;
z-index: 1;
border: none !important;
top: @sliderLineVerticalOffset;
background-color: @sliderLineColor;
width: @sliderLineWidth;
@ -337,7 +340,7 @@
.ui.slider.checkbox label:after {
background: @handleBackground;
position: absolute;
content: '';
content: '' !important;
opacity: 1;
z-index: 2;
@ -373,22 +376,16 @@
}
/* Active */
.ui.slider.checkbox input[type="checkbox"]:checked ~ .box,
.ui.slider.checkbox input[type="checkbox"]:checked ~ label,
.ui.slider.checkbox input[type="radio"]:checked ~ .box,
.ui.slider.checkbox input[type="radio"]:checked ~ label {
.ui.slider.checkbox :checked ~ .box,
.ui.slider.checkbox :checked ~ label {
color: @sliderOnLabelColor;
}
.ui.slider.checkbox input[type="checkbox"]:checked ~ .box:before,
.ui.slider.checkbox input[type="checkbox"]:checked ~ label:before,
.ui.slider.checkbox input[type="radio"]:checked ~ .box:before,
.ui.slider.checkbox input[type="radio"]:checked ~ label:before {
.ui.slider.checkbox :checked ~ .box:before,
.ui.slider.checkbox :checked ~ label:before {
background-color: @sliderOnLineColor;
}
.ui.slider.checkbox input[type="checkbox"]:checked ~ .box:after,
.ui.slider.checkbox input[type="checkbox"]:checked ~ label:after,
.ui.slider.checkbox input[type="radio"]:checked ~ .box:after,
.ui.slider.checkbox input[type="radio"]:checked ~ label:after {
.ui.slider.checkbox :checked ~ .box:after,
.ui.slider.checkbox :checked ~ label:after {
left: @sliderTravelDistance;
}
@ -415,14 +412,13 @@
.ui.toggle.checkbox .box:before,
.ui.toggle.checkbox label:before {
display: block;
position: absolute;
content: '';
top: @toggleLaneVerticalOffset;
z-index: 1;
border: none;
top: @toggleLaneVerticalOffset;
background-color: @neutralCheckbox;
width: @toggleLaneWidth;
height: @toggleLaneHeight;
@ -434,7 +430,7 @@
.ui.toggle.checkbox label:after {
background: @handleBackground;
position: absolute;
content: '';
content: '' !important;
opacity: 1;
z-index: 2;
@ -473,22 +469,16 @@
}
/* Active */
.ui.toggle.checkbox input[type="checkbox"]:checked ~ .box,
.ui.toggle.checkbox input[type="checkbox"]:checked ~ label,
.ui.toggle.checkbox input[type="radio"]:checked ~ .box,
.ui.toggle.checkbox input[type="radio"]:checked ~ label {
.ui.toggle.checkbox input:checked ~ .box,
.ui.toggle.checkbox input:checked ~ label {
color: @toggleOnLabelColor;
}
.ui.toggle.checkbox input[type="checkbox"]:checked ~ .box:before,
.ui.toggle.checkbox input[type="checkbox"]:checked ~ label:before,
.ui.toggle.checkbox input[type="radio"]:checked ~ .box:before,
.ui.toggle.checkbox input[type="radio"]:checked ~ label:before {
.ui.toggle.checkbox input:checked ~ .box:before,
.ui.toggle.checkbox input:checked ~ label:before {
background-color: @toggleOnLaneColor;
}
.ui.toggle.checkbox input[type="checkbox"]:checked ~ .box:after,
.ui.toggle.checkbox input[type="checkbox"]:checked ~ label:after,
.ui.toggle.checkbox input[type="radio"]:checked ~ .box:after,
.ui.toggle.checkbox input[type="radio"]:checked ~ label:after {
.ui.toggle.checkbox input:checked ~ .box:after,
.ui.toggle.checkbox input:checked ~ label:after {
left: @toggleOnOffset;
}

28
src/themes/default/modules/checkbox.overrides
File diff suppressed because it is too large
View File

2
src/themes/default/modules/checkbox.variables

@ -15,7 +15,7 @@
@negativeCheckbox: @negativeColor;
/* Checkbox */
@checkboxSize: 17px;
@checkboxSize: 16px;
@checkboxBackground: @white;
@checkboxBorder: 1px solid @solidBorderColor;
@checkboxBorderRadius: 0.25em;

Loading…
Cancel
Save