Skip to content

Commit 53c4902

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 70ca2bc commit 53c4902

File tree

10 files changed

+82
-22
lines changed

10 files changed

+82
-22
lines changed

docs/_config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,6 +1390,7 @@ api:
13901390

13911391
product: "Kendo UI for jQuery"
13921392
platform: kendo-ui
1393+
other_platforms: [php-ui, jsp-ui]
13931394

13941395
## Assign layout and category per different paths
13951396

@@ -1407,25 +1408,29 @@ defaults:
14071408
path: "php"
14081409
values:
14091410
product: "php-ui"
1411+
platform: "php-ui"
14101412
-
14111413
scope:
14121414
path: "api/php"
14131415
values:
14141416
product: "php-ui"
14151417
editable: false
14161418
has_api_toc: true
1419+
platform: "php-ui"
14171420
-
14181421
scope:
14191422
path: "api/jsp"
14201423
values:
14211424
product: "jsp-ui"
14221425
editable: false
14231426
has_api_toc: true
1427+
platform: "jsp-ui"
14241428
-
14251429
scope:
14261430
path: "jsp"
14271431
values:
14281432
product: "jsp-ui"
1433+
platform: "jsp-ui"
14291434
-
14301435
scope:
14311436
path: "api"

styles/web/common/all.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "mixins.less";
2+
@import "flex.less";
23
@import "base.less";
34
@import "button.less";
45
@import "responsivepanel.less";

styles/web/common/flex.less

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Flex wrap
2+
.k-flex-wrap { flex-wrap: wrap; }
3+
.k-flex-nowrap { flex-wrap: nowrap; }
4+
.k-flex-wrap-reverse { flex-wrap: wrap-reverse; }
5+
6+
7+
// Flex, shrink grow
8+
.k-flex { flex: 1 1 0; }
9+
.k-flex-auto { flex: 1 1 auto; }
10+
.k-no-flex { flex: 0 0 0; }
11+
.k-no-flex-auto { flex: 0 0 auto; }
12+
.k-flex-grow { flex-grow: 1; }
13+
.k-no-flex-grow { flex-grow: 0; }
14+
.k-flex-shrink { flex-shrink: 1; }
15+
.k-no-flex-shrink { flex-shrink: 0; }
16+
17+
18+
// Flex align
19+
.k-align-items-start { align-items: flex-start; }
20+
.k-align-items-end { align-items: flex-end; }
21+
.k-align-items-center { align-items: center; }
22+
.k-align-items-stretch { align-items: stretch; }
23+
.k-align-items-baseline { align-items: baseline; }
24+
25+
.k-align-content-start { align-content: flex-start; }
26+
.k-align-content-end { align-content: flex-end; }
27+
.k-align-content-center { align-content: center; }
28+
.k-align-content-stretch { align-content: stretch; }
29+
.k-align-content-baseline { align-content: baseline; }
30+
31+
.k-align-self-start { align-self: flex-start; }
32+
.k-align-self-end { align-self: flex-end; }
33+
.k-align-self-center { align-self: center; }
34+
.k-align-self-stretch { align-self: stretch; }
35+
.k-align-self-baseline { align-self: baseline; }
36+
37+
38+
// Flex justify
39+
.k-justify-content-start { justify-content: flex-start; }
40+
.k-justify-content-end { justify-content: flex-end; }
41+
.k-justify-content-center { justify-content: center; }
42+
.k-justify-content-between { justify-content: space-between; }
43+
.k-justify-content-around { justify-content: space-around; }
44+
.k-justify-content-evenly { justify-content: space-evenly; }

styles/web/type-bootstrap.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,8 +2752,8 @@ thead.k-grid-header th.k-header:last-child
27522752
.box-shadow(inset @focused-shadow);
27532753
}
27542754

2755-
.k-panelbar > li > .k-link.k-state-selected
2756-
{
2755+
.k-panelbar .k-item .k-link.k-state-selected,
2756+
.k-panelbar > li > .k-link.k-state-selected {
27572757
color: @selected-text-color;
27582758
}
27592759

styles/web/type-default.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -992,11 +992,15 @@ td.k-state-focused.k-state-selected
992992

993993
.k-state-selected>.k-link,
994994
.k-panelbar > li > .k-state-selected,
995-
.k-panelbar>li.k-state-default>.k-link.k-state-selected
996-
{
995+
.k-panelbar .k-item .k-link.k-state-selected,
996+
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
997997
color: @selected-text-color;
998998
}
999999

1000+
.k-panelbar .k-group .k-link.k-state-hover {
1001+
color: @hover-text-color;
1002+
}
1003+
10001004
.k-state-hover,
10011005
.k-splitbar-horizontal-hover,
10021006
.k-splitbar-vertical-hover,

styles/web/type-fiori.less

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,14 @@ td.k-state-focused.k-state-selected
10491049

10501050
.k-state-selected>.k-link,
10511051
.k-panelbar > li > .k-state-selected,
1052-
.k-panelbar>li.k-state-default>.k-link.k-state-selected
1053-
{
1052+
.k-panelbar .k-item .k-link.k-state-selected,
1053+
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
10541054
color: @selected-text-color;
1055+
background-color: @selected-background-color;
1056+
1057+
&:hover {
1058+
background-color: @primary-hover-background-color;
1059+
}
10551060
}
10561061

10571062
.k-state-hover,
@@ -2147,9 +2152,7 @@ html .km-pane-wrapper .km-widget,
21472152
}
21482153

21492154
.k-tabstrip-items .k-state-hover .k-link,
2150-
.k-panelbar > li.k-state-hover > .k-link,
2151-
.k-panelbar>li.k-state-default>.k-link.k-state-hover
2152-
{
2155+
.k-panelbar > li.k-state-hover > .k-link {
21532156
color: @hover-text-color;
21542157
}
21552158

@@ -2575,6 +2578,8 @@ div.k-window.k-state-focused
25752578
.k-list > .k-state-selected,
25762579
.k-drag-clue.k-state-selected,
25772580
.k-group > .k-item > .k-state-selected,
2581+
.k-group > .k-item > .k-link.k-state-selected,
2582+
.k-group > .k-item > .k-link.k-state-selected.k-state-hover,
25782583
.k-gantt .k-treelist .k-state-selected,
25792584
.k-gantt .k-treelist .k-state-selected td,
25802585
.k-gantt .k-treelist .k-alt.k-state-selected,

styles/web/type-material.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,7 @@ html .km-pane-wrapper .km-widget,
21342134

21352135
.k-tabstrip-items .k-state-hover .k-link,
21362136
.k-panelbar > li.k-state-hover > .k-link,
2137-
.k-panelbar >li > .k-link.k-state-hover {
2137+
.k-panelbar .k-group >li > .k-link.k-state-hover {
21382138
color: @hover-text-color;
21392139
}
21402140

styles/web/type-metro.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,8 @@ td.k-state-focused.k-state-selected
979979

980980
.k-state-selected>.k-link,
981981
.k-panelbar > li > .k-state-selected,
982-
.k-panelbar>li.k-state-default>.k-link.k-state-selected
983-
{
982+
.k-panelbar .k-item .k-link.k-state-selected,
983+
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
984984
color: @selected-text-color;
985985
}
986986

@@ -992,11 +992,11 @@ td.k-state-focused.k-state-selected
992992
.k-pager-wrap .k-link:hover,
993993
.k-dropdown .k-state-focused,
994994
.k-filebrowser-dropzone,
995+
.k-panelbar .k-item .k-link.k-state-hover,
995996
.k-mobile-list .k-item > .k-link:active,
996997
.k-mobile-list .k-item > .k-label:active,
997998
.k-mobile-list .k-edit-label.k-check:active,
998-
.k-mobile-list .k-recur-view .k-check:active
999-
{
999+
.k-mobile-list .k-recur-view .k-check:active {
10001000
color: @hover-text-color;
10011001
background-color: @hover-background-color;
10021002
border-color: @hover-border-color;

styles/web/type-office365.less

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,18 +2888,19 @@ input.k-textbox:focus {
28882888
background-color: @widget-background-color;
28892889
}
28902890

2891-
.k-panelbar .k-state-selected.k-state-hover {
2892-
background-color: @selected-background-color;
2893-
}
2894-
28952891
.k-panelbar > li > .k-state-selected,
2896-
.k-panelbar > li > .k-state-selected.k-state-hover,
2897-
.k-panelbar > li.k-state-default > .k-link.k-state-selected,
2898-
.k-panelbar > li > .k-state-focused.k-state-hover {
2892+
.k-panelbar > .k-item > .k-link.k-state-selected,
2893+
.k-panelbar > li.k-state-default > .k-link.k-state-selected {
28992894
color: @inverse-text-color;
29002895
background-color: @select-background-color;
29012896
}
29022897

2898+
.k-panelbar .k-state-selected.k-state-hover {
2899+
background-color: @selected-background-color;
2900+
color: @hover-text-color;
2901+
}
2902+
2903+
29032904
.k-panelbar.k-header,
29042905
.k-panelbar .k-content,
29052906
.k-panelbar .k-panel,

typescript/kendo.all.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for Kendo UI Professional v2019.1.115
1+
// Type definitions for Kendo UI Professional v2019.1.220
22
// Project: http://www.telerik.com/kendo-ui
33
// Definitions by: Telerik <https://github.com/telerik>
44
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

0 commit comments

Comments
 (0)