Skip to content

Commit

Permalink
Sync with Kendo UI Professional
Browse files Browse the repository at this point in the history
  • Loading branch information
Kendo Bot committed Feb 20, 2019
1 parent 70ca2bc commit 53c4902
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 22 deletions.
5 changes: 5 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,7 @@ api:

product: "Kendo UI for jQuery"
platform: kendo-ui
other_platforms: [php-ui, jsp-ui]

## Assign layout and category per different paths

Expand All @@ -1407,25 +1408,29 @@ defaults:
path: "php"
values:
product: "php-ui"
platform: "php-ui"
-
scope:
path: "api/php"
values:
product: "php-ui"
editable: false
has_api_toc: true
platform: "php-ui"
-
scope:
path: "api/jsp"
values:
product: "jsp-ui"
editable: false
has_api_toc: true
platform: "jsp-ui"
-
scope:
path: "jsp"
values:
product: "jsp-ui"
platform: "jsp-ui"
-
scope:
path: "api"
Expand Down
1 change: 1 addition & 0 deletions styles/web/common/all.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "mixins.less";
@import "flex.less";
@import "base.less";
@import "button.less";
@import "responsivepanel.less";
Expand Down
44 changes: 44 additions & 0 deletions styles/web/common/flex.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Flex wrap
.k-flex-wrap { flex-wrap: wrap; }
.k-flex-nowrap { flex-wrap: nowrap; }
.k-flex-wrap-reverse { flex-wrap: wrap-reverse; }


// Flex, shrink grow
.k-flex { flex: 1 1 0; }
.k-flex-auto { flex: 1 1 auto; }
.k-no-flex { flex: 0 0 0; }
.k-no-flex-auto { flex: 0 0 auto; }
.k-flex-grow { flex-grow: 1; }
.k-no-flex-grow { flex-grow: 0; }
.k-flex-shrink { flex-shrink: 1; }
.k-no-flex-shrink { flex-shrink: 0; }


// Flex align
.k-align-items-start { align-items: flex-start; }
.k-align-items-end { align-items: flex-end; }
.k-align-items-center { align-items: center; }
.k-align-items-stretch { align-items: stretch; }
.k-align-items-baseline { align-items: baseline; }

.k-align-content-start { align-content: flex-start; }
.k-align-content-end { align-content: flex-end; }
.k-align-content-center { align-content: center; }
.k-align-content-stretch { align-content: stretch; }
.k-align-content-baseline { align-content: baseline; }

.k-align-self-start { align-self: flex-start; }
.k-align-self-end { align-self: flex-end; }
.k-align-self-center { align-self: center; }
.k-align-self-stretch { align-self: stretch; }
.k-align-self-baseline { align-self: baseline; }


// Flex justify
.k-justify-content-start { justify-content: flex-start; }
.k-justify-content-end { justify-content: flex-end; }
.k-justify-content-center { justify-content: center; }
.k-justify-content-between { justify-content: space-between; }
.k-justify-content-around { justify-content: space-around; }
.k-justify-content-evenly { justify-content: space-evenly; }
4 changes: 2 additions & 2 deletions styles/web/type-bootstrap.less
Original file line number Diff line number Diff line change
Expand Up @@ -2752,8 +2752,8 @@ thead.k-grid-header th.k-header:last-child
.box-shadow(inset @focused-shadow);
}

.k-panelbar > li > .k-link.k-state-selected
{
.k-panelbar .k-item .k-link.k-state-selected,
.k-panelbar > li > .k-link.k-state-selected {
color: @selected-text-color;
}

Expand Down
8 changes: 6 additions & 2 deletions styles/web/type-default.less
Original file line number Diff line number Diff line change
Expand Up @@ -992,11 +992,15 @@ td.k-state-focused.k-state-selected

.k-state-selected>.k-link,
.k-panelbar > li > .k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected
{
.k-panelbar .k-item .k-link.k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
color: @selected-text-color;
}

.k-panelbar .k-group .k-link.k-state-hover {
color: @hover-text-color;
}

.k-state-hover,
.k-splitbar-horizontal-hover,
.k-splitbar-vertical-hover,
Expand Down
15 changes: 10 additions & 5 deletions styles/web/type-fiori.less
Original file line number Diff line number Diff line change
Expand Up @@ -1049,9 +1049,14 @@ td.k-state-focused.k-state-selected

.k-state-selected>.k-link,
.k-panelbar > li > .k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected
{
.k-panelbar .k-item .k-link.k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
color: @selected-text-color;
background-color: @selected-background-color;

&:hover {
background-color: @primary-hover-background-color;
}
}

.k-state-hover,
Expand Down Expand Up @@ -2147,9 +2152,7 @@ html .km-pane-wrapper .km-widget,
}

.k-tabstrip-items .k-state-hover .k-link,
.k-panelbar > li.k-state-hover > .k-link,
.k-panelbar>li.k-state-default>.k-link.k-state-hover
{
.k-panelbar > li.k-state-hover > .k-link {
color: @hover-text-color;
}

Expand Down Expand Up @@ -2575,6 +2578,8 @@ div.k-window.k-state-focused
.k-list > .k-state-selected,
.k-drag-clue.k-state-selected,
.k-group > .k-item > .k-state-selected,
.k-group > .k-item > .k-link.k-state-selected,
.k-group > .k-item > .k-link.k-state-selected.k-state-hover,
.k-gantt .k-treelist .k-state-selected,
.k-gantt .k-treelist .k-state-selected td,
.k-gantt .k-treelist .k-alt.k-state-selected,
Expand Down
2 changes: 1 addition & 1 deletion styles/web/type-material.less
Original file line number Diff line number Diff line change
Expand Up @@ -2134,7 +2134,7 @@ html .km-pane-wrapper .km-widget,

.k-tabstrip-items .k-state-hover .k-link,
.k-panelbar > li.k-state-hover > .k-link,
.k-panelbar >li > .k-link.k-state-hover {
.k-panelbar .k-group >li > .k-link.k-state-hover {
color: @hover-text-color;
}

Expand Down
8 changes: 4 additions & 4 deletions styles/web/type-metro.less
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,8 @@ td.k-state-focused.k-state-selected

.k-state-selected>.k-link,
.k-panelbar > li > .k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected
{
.k-panelbar .k-item .k-link.k-state-selected,
.k-panelbar>li.k-state-default>.k-link.k-state-selected {
color: @selected-text-color;
}

Expand All @@ -992,11 +992,11 @@ td.k-state-focused.k-state-selected
.k-pager-wrap .k-link:hover,
.k-dropdown .k-state-focused,
.k-filebrowser-dropzone,
.k-panelbar .k-item .k-link.k-state-hover,
.k-mobile-list .k-item > .k-link:active,
.k-mobile-list .k-item > .k-label:active,
.k-mobile-list .k-edit-label.k-check:active,
.k-mobile-list .k-recur-view .k-check:active
{
.k-mobile-list .k-recur-view .k-check:active {
color: @hover-text-color;
background-color: @hover-background-color;
border-color: @hover-border-color;
Expand Down
15 changes: 8 additions & 7 deletions styles/web/type-office365.less
Original file line number Diff line number Diff line change
Expand Up @@ -2888,18 +2888,19 @@ input.k-textbox:focus {
background-color: @widget-background-color;
}

.k-panelbar .k-state-selected.k-state-hover {
background-color: @selected-background-color;
}

.k-panelbar > li > .k-state-selected,
.k-panelbar > li > .k-state-selected.k-state-hover,
.k-panelbar > li.k-state-default > .k-link.k-state-selected,
.k-panelbar > li > .k-state-focused.k-state-hover {
.k-panelbar > .k-item > .k-link.k-state-selected,
.k-panelbar > li.k-state-default > .k-link.k-state-selected {
color: @inverse-text-color;
background-color: @select-background-color;
}

.k-panelbar .k-state-selected.k-state-hover {
background-color: @selected-background-color;
color: @hover-text-color;
}


.k-panelbar.k-header,
.k-panelbar .k-content,
.k-panelbar .k-panel,
Expand Down
2 changes: 1 addition & 1 deletion typescript/kendo.all.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Type definitions for Kendo UI Professional v2019.1.115
// Type definitions for Kendo UI Professional v2019.1.220
// Project: http://www.telerik.com/kendo-ui
// Definitions by: Telerik <https://github.com/telerik>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
Expand Down

0 comments on commit 53c4902

Please sign in to comment.