Skip to content

Commit ed24ece

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent ce6ae86 commit ed24ece

File tree

9 files changed

+40
-13
lines changed

9 files changed

+40
-13
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This project has been released under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html), the text of which is included below. This license applies ONLY to the source of this repository and does not extend to any other Kendo UI distribution or variant, or any other 3rd party libraries used in a repository. For licensing information about Kendo UI, see the [License Agreements page](http://www.telerik.com/purchase/license-agreement/kendo-ui-professional) at [KendoUI.com](http://www.kendoui.com).
1+
This project has been released under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html), the text of which is included below. This license applies ONLY to the source of this repository and does not extend to any other Kendo UI distribution or variant, or any other 3rd party libraries used in a repository. For licensing information about Kendo UI, see the [License Agreements page](https://www.kendoui.com/purchase/license-agreement.aspx) at [KendoUI.com](http://www.kendoui.com).
22

33
> Copyright © 2014-2015 Telerik
44

styles/web/common/base.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ input.k-checkbox,
614614
.k-radio-label {
615615
display: inline-block;
616616
position: relative;
617-
padding-left: (@checkbox-size + (4 * @checkbox-border-width));
617+
padding-left: (@checkbox-size*1.8);
618618
vertical-align: text-top;
619619
line-height: 16px;
620620
cursor: pointer;

styles/web/kendo.blueopal.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@
3232
@fallback-texture: url('textures/highlight.png');
3333

3434
@import "type-default.less";
35+
@checkbox-active-border-color: contrast(@selected-background, lighten(@accent, 38%), darken(@accent, 29%), 0.5);

styles/web/kendo.default.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@
3232
@fallback-texture: url('textures/highlight.png');
3333

3434
@import "type-default.less";
35+
36+
@checkbox-active-border-color: darken(@base, 24%);
37+
@checkbox-active-box-shadow: 0 0 2px 0 @checkbox-active-border-color;

styles/web/kendo.uniform.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@
3232
@fallback-texture: url('textures/highlight.png');
3333

3434
@import "type-default.less";
35+
36+
@checkbox-active-box-shadow: 0 0 2px 0 @checkbox-active-border-color;

styles/web/themes/checkbox.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
}
4646

4747
.k-checkbox:checked:active + .k-checkbox-label:before,
48-
.k-checkbox:checked + .k-checkbox-label:before {
48+
.k-checkbox:checked + .k-checkbox-label:active:before {
4949
box-shadow: @checkbox-active-box-shadow;
5050
border-color: @checkbox-active-border-color;
5151
}
@@ -68,7 +68,8 @@
6868
border-radius: @checkbox-border-radius;
6969
}
7070

71-
.k-checkbox:focus + .k-checkbox-label:before {
71+
.k-checkbox:focus + .k-checkbox-label:before,
72+
.k-checkbox:focus + .k-checkbox-label:hover:before {
7273
border-color: @checkbox-active-border-color;
7374
box-shadow: @checkbox-active-box-shadow;
7475
}

styles/web/type-highcontrast.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,7 @@ html .km-pane-wrapper .km-widget,
22802280
@checkbox-border-radius: 3px;
22812281
@checkbox-background-color: darken(@base, 7%);
22822282
@checkbox-hover-border-color: @normal-text-color;
2283-
@checkbox-hover-box-shadow: 0 0 1px 0 #fff;
2283+
@checkbox-hover-box-shadow: 0 0 0 1px #fff;
22842284
@checkbox-checked-border-color: @normal-text-color;
22852285
@checkbox-checked-color: @normal-text-color;
22862286
@checkbox-active-border-color: @normal-text-color;

styles/web/type-material.less

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,37 +2287,57 @@ html .km-pane-wrapper .km-widget,
22872287
@checkbox-hover-border-color: lighten(@normal-text-color, 23%);
22882288
@checkbox-checked-border-color: @accent;
22892289
@checkbox-checked-background-color: @accent;
2290-
@checkbox-checked-color: saturate(@background, 29%);
2291-
@checkbox-active-border-color: lighten(@normal-text-color, 23%);
2290+
@checkbox-checked-color: contrast(@checkbox-checked-background-color, saturate(@background, 29%), );
2291+
@checkbox-active-border-color: lighten(@accent, 23%);
22922292
@checkbox-active-box-shadow: none;
22932293
@checkbox-disabled-background-color: contrast(@background, lighten(@background, 20%), darken(@background, 4%), 0.5);
22942294
@checkbox-disabled-color: @disabled-text-color;
22952295
@checkbox-disabled-border-color: contrast(@background, lighten(@background, 20%), darken(@background, 25%), 0.5);
22962296
@checkbox-indeterminate-background-color: @accent;
22972297
@checkbox-indeterminate-border-color: @accent;
22982298

2299+
.k-checkbox-label:before {
2300+
background: transparent;
2301+
}
2302+
22992303
.k-checkbox + .k-checkbox-label:after {
23002304
content: "";
23012305
position: absolute;
23022306
top: 1px;
23032307
left: 1px;
23042308
border-radius: 50%;
2305-
width: 1em;
2306-
height: 1em;
2309+
width: 16px;
2310+
height: 16px;
2311+
box-shadow: 0 0 0 0px transparent;
2312+
transition: box-shadow 0.3s;
2313+
}
2314+
2315+
.k-checkbox:focus + .k-checkbox-label:before {
2316+
border-color: @checkbox-border-color;
2317+
}
2318+
.k-checkbox:checked + .k-checkbox-label:before,
2319+
.k-checkbox:checked:hover + .k-checkbox-label:before,
2320+
.k-checkbox:checked + .k-checkbox-label:hover:before {
2321+
border-color: @checkbox-checked-border-color
23072322
}
23082323

23092324
.k-checkbox:focus + .k-checkbox-label:after {
2310-
box-shadow: 0 0 0 12px fadeout(@hover-background, 70%);
2325+
box-shadow: 0 0 0 12px fadeout(@checkbox-border-color, 80%);
2326+
background: fadeout(@checkbox-border-color, 80%);
23112327
}
23122328

23132329
.k-checkbox:active + .k-checkbox-label:after,
23142330
.k-checkbox + .k-checkbox-label:active:after {
2315-
box-shadow: 0 0 0 12px fadeout(@hover-background, 70%);
2331+
box-shadow: 0 0 0 12px fadeout(@checkbox-active-border-color, 60%);
2332+
background: fadeout(@checkbox-active-border-color, 60%);
23162333
}
23172334

2335+
.k-checkbox:checked:focus + .k-checkbox-label:after,
2336+
.k-checkbox:checked + .k-checkbox-label:focus:after,
23182337
.k-checkbox:checked:active + .k-checkbox-label:after,
23192338
.k-checkbox:checked + .k-checkbox-label:active:after {
2320-
box-shadow: 0 0 0 12px fadeout(@accent, 70%);
2339+
box-shadow: 0 0 0 12px fadeout(@checkbox-active-border-color, 60%);
2340+
background: fadeout(@checkbox-active-border-color, 60%);
23212341
}
23222342

23232343
.k-checkbox:disabled + .k-checkbox-label:active:after {

styles/web/type-nova.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ input.k-textbox:active {
15291529
@checkbox-border-color: darken(@widget-background-color, 12%);
15301530
@checkbox-border-radius: @inputs-border-radius;
15311531
@checkbox-background-color: @widget-background-color;
1532-
@checkbox-hover-border-color: darken(@base, 24%);
1532+
@checkbox-hover-border-color: @checkbox-border-color;
15331533
@checkbox-hover-box-shadow: none;
15341534
@checkbox-checked-border-color: darken(@widget-background-color, 12%);
15351535
@checkbox-checked-background-color: @widget-background-color;

0 commit comments

Comments
 (0)