diff --git a/docs/_config.yml b/docs/_config.yml index 5d83a502e92..9e34ac3c8e7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -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 @@ -1407,6 +1408,7 @@ defaults: path: "php" values: product: "php-ui" + platform: "php-ui" - scope: path: "api/php" @@ -1414,6 +1416,7 @@ defaults: product: "php-ui" editable: false has_api_toc: true + platform: "php-ui" - scope: path: "api/jsp" @@ -1421,11 +1424,13 @@ defaults: 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" diff --git a/styles/web/common/all.less b/styles/web/common/all.less index b64efb47c5d..734e2a7b6ad 100644 --- a/styles/web/common/all.less +++ b/styles/web/common/all.less @@ -1,4 +1,5 @@ @import "mixins.less"; +@import "flex.less"; @import "base.less"; @import "button.less"; @import "responsivepanel.less"; diff --git a/styles/web/common/flex.less b/styles/web/common/flex.less new file mode 100644 index 00000000000..a5bdb1c1d6d --- /dev/null +++ b/styles/web/common/flex.less @@ -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; } diff --git a/styles/web/type-bootstrap.less b/styles/web/type-bootstrap.less index 78dc2e0c2fd..420426d052a 100644 --- a/styles/web/type-bootstrap.less +++ b/styles/web/type-bootstrap.less @@ -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; } diff --git a/styles/web/type-default.less b/styles/web/type-default.less index cb09514659f..a563a721f09 100644 --- a/styles/web/type-default.less +++ b/styles/web/type-default.less @@ -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, diff --git a/styles/web/type-fiori.less b/styles/web/type-fiori.less index cd0998aee66..ed31cc920fc 100644 --- a/styles/web/type-fiori.less +++ b/styles/web/type-fiori.less @@ -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, @@ -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; } @@ -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, diff --git a/styles/web/type-material.less b/styles/web/type-material.less index 018c9562c69..0125199ae1c 100644 --- a/styles/web/type-material.less +++ b/styles/web/type-material.less @@ -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; } diff --git a/styles/web/type-metro.less b/styles/web/type-metro.less index 4c9dcd6ddca..296dc310fc0 100644 --- a/styles/web/type-metro.less +++ b/styles/web/type-metro.less @@ -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; } @@ -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; diff --git a/styles/web/type-office365.less b/styles/web/type-office365.less index 475dbba425f..934e93e1d36 100644 --- a/styles/web/type-office365.less +++ b/styles/web/type-office365.less @@ -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, diff --git a/typescript/kendo.all.d.ts b/typescript/kendo.all.d.ts index bc2f491a4fc..efdb5062828 100644 --- a/typescript/kendo.all.d.ts +++ b/typescript/kendo.all.d.ts @@ -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 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped