Browse Source

Adjust some underlying variables to have more comprehensible names

pull/2416/head
jlukic 9 years ago
parent
commit
a88ec27503
3 changed files with 53 additions and 43 deletions
  1. 54
      src/definitions/modules/checkbox.less
  2. 11
      src/themes/colored/modules/checkbox.variables
  3. 31
      src/themes/default/modules/checkbox.variables

54
src/definitions/modules/checkbox.less

@ -39,7 +39,7 @@
backface-visibility: hidden;
outline: none;
vertical-align: middle;
vertical-align: baseline;
}
.ui.checkbox input[type="checkbox"],
.ui.checkbox input[type="radio"] {
@ -61,7 +61,7 @@
.ui.checkbox label {
display: block;
cursor: pointer;
padding-left: @labelPadding;
padding-left: @labelDistance;
outline: none;
}
.ui.checkbox label {
@ -136,7 +136,7 @@
.ui.checkbox .box:hover::before,
.ui.checkbox label:hover::before {
background: @checkboxHoverBackground;
border: @checkboxHoverBorder;
border-color: @checkboxHoverBorderColor;
}
.ui.checkbox label:hover,
.ui.checkbox + label:hover {
@ -150,7 +150,7 @@
.ui.checkbox .box:active::before,
.ui.checkbox label:active::before {
background: @checkboxPressedBackground;
border: @checkboxPressedBorder;
border-color: @checkboxPressedBorderColor;
}
.ui.checkbox .box:active::after,
.ui.checkbox label:active::after {
@ -170,7 +170,7 @@
.ui.checkbox input[type="radio"]:checked ~ .box:before,
.ui.checkbox input[type="radio"]:checked ~ label:before {
background: @checkboxActiveBackground;
border: @checkboxActiveBorder;
border-color: @checkboxActiveBorderColor;
}
.ui.checkbox input[type="checkbox"]:checked ~ .box:after,
@ -194,7 +194,7 @@
.ui.checkbox input[type="radio"]:checked:focus ~ .box:before,
.ui.checkbox input[type="radio"]:checked:focus ~ label:before {
background: @checkboxFocusedBackground;
border: @checkboxFocusedBorder;
border-color: @checkboxFocusedBorderColor;
}
.ui.checkbox input[type="checkbox"]:focus ~ .box:after,
.ui.checkbox input[type="checkbox"]:focus ~ label:after,
@ -243,17 +243,22 @@
---------------*/
.ui.radio.checkbox {
min-height: @checkboxRadioSize;
min-height: @radioSize;
}
.ui.radio.checkbox .box,
.ui.radio.checkbox label {
padding-left: @radioLabelDistance;
}
/* Box */
.ui.radio.checkbox .box:before,
.ui.radio.checkbox label:before {
width: @checkboxRadioSize;
height: @checkboxRadioSize;
width: @radioSize;
height: @radioSize;
border-radius: @circularRadius;
top: @checkboxRadioTop;
left: @checkboxRadioLeft;
top: @radioTop;
left: @radioLeft;
transform: none;
}
@ -262,33 +267,32 @@
.ui.radio.checkbox label:after {
border: none;
content: '';
width: @checkboxRadioSize;
height: @checkboxRadioSize;
line-height: @checkboxRadioSize;
top: @checkboxRadioTop;
left: @checkboxRadioLeft;
font-size: @checkboxRadioCircleSize;
width: @radioSize;
height: @radioSize;
line-height: @radioSize;
top: @radioTop;
left: @radioLeft;
font-size: @radioCircleSize;
}
/* Radio Checkbox */
.ui.radio.checkbox .box:after,
.ui.radio.checkbox label:after {
width: @checkboxRadioSize;
height: @checkboxRadioSize;
border-radius: @checkboxBulletRadius;
transform: scale(@checkboxBulletScale);
background-color: @checkboxBulletColor;
width: @radioSize;
height: @radioSize;
border-radius: @bulletRadius;
transform: scale(@bulletScale);
background-color: @bulletColor;
}
/* Active */
.ui.radio.checkbox input[type="radio"]:checked ~ .box:before,
.ui.radio.checkbox input[type="radio"]:checked ~ label:before {
background-color: @checkboxRadioActiveBackground;
background-color: @radioActiveBackground;
}
.ui.radio.checkbox input[type="radio"]:checked ~ .box:after,
.ui.radio.checkbox input[type="radio"]:checked ~ label:after {
background-color: @checkboxActiveBulletColor;
background-color: @radioActiveBulletColor;
}
/*--------------

11
src/themes/colored/modules/checkbox.variables

@ -1,15 +1,18 @@
/* Checkbox */
@checkboxActiveBackground: @primaryColor;
@checkboxActiveColor: @white;
@checkboxActiveBorder: 1px solid @primaryColor;
@checkboxActiveBorderColor: @primaryColor;
@checkboxTransition: none;
/* Slider */
@sliderOnLineColor: @primaryColor;
@checkboxRadioActiveBackground: @primaryColor;
/* Radio */
@radioActiveBackground: @primaryColor;
@checkboxActiveBulletColor: @primaryColor;
/* Handle */
@handleBackground: @white @subtleGradient;
@handleBoxShadow:
0px 0px 0px 1px @selectedBorderColor inset
;
@checkboxTransition: none;

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

@ -8,7 +8,7 @@
/* Label */
@labelPadding: 1.75em;
@labelDistance: 1.85714em;
@neutralCheckbox: @transparentBlack;
@positiveCheckbox: @positiveColor;
@ -39,21 +39,21 @@
--------------------*/
@checkboxHoverBackground: @checkboxBackground;
@checkboxHoverBorder: 1px solid @selectedBorderColor;
@checkboxHoverBorderColor: @selectedBorderColor;
@labelHoverColor: @hoveredTextColor;
@checkboxPressedBackground: @offWhite;
@checkboxPressedBorder: 1px solid @selectedBorderColor;
@checkboxPressedBorderColor: @selectedBorderColor;
@checkboxPressedColor: @selectedTextColor;
@labelPressedColor: @selectedTextColor;
@checkboxFocusedBackground: @offWhite;
@checkboxFocusedBorder: 1px solid @selectedBorderColor;
@checkboxFocusedBorderColor: @selectedBorderColor;
@checkboxFocusedColor: @selectedTextColor;
@labelFocusedColor: @selectedTextColor;
@checkboxActiveBackground: #FFFFFF;
@checkboxActiveBorder: 1px solid @borderColor;
@checkboxActiveBorderColor: @selectedBorderColor;
@checkboxActiveColor: @selectedTextColor;
@labelActiveColor: @selectedTextColor;
@ -67,17 +67,20 @@
--------------------*/
/* Radio */
@checkboxRadioSize: 14px;
@checkboxRadioCircleSize: 9px;
@checkboxRadioTop: 1px;
@checkboxRadioLeft: 0px;
/* Uses px to avoid rounding issues with circles */
@checkboxBulletScale: 0.428571428; /* 6px @ 14pxrem */
@checkboxBulletColor: @textColor;
@checkboxBulletRadius: @circularRadius;
@radioSize: 14px;
@radioCircleSize: 9px;
@radioTop: 1px;
@radioLeft: 0px;
@radioLabelDistance: @labelDistance;
@checkboxActiveBulletColor: @checkboxActiveColor;
@checkboxRadioActiveBackground: @white;
@bulletScale: (0.428571428); /* 6px @ 14pxrem */
@bulletColor: @textColor;
@bulletRadius: @circularRadius;
@radioActiveBackground: @white;
@radioActiveBulletColor: @checkboxActiveColor;
/* Slider & Toggle Handle */
@handleBackground: @white @subtleGradient;

Loading…
Cancel
Save