@progress/kendo-theme-classic 4.43.1-dev.2 → 4.43.1-dev.6

package/modules/@progress/kendo-theme-default/scss/toolbar/_layout.scss

@@ -67,8 +67,9 @@
             @include border-radius( 0 );
             margin: 0;
             padding: $toolbar-padding-y;
-            width: $toolbar-inner-calc-size;
+            width: auto;
             height: 100%;
+            aspect-ratio: 1;
             border-width: 0;
             border-color: inherit;
             box-sizing: border-box;
@@ -100,12 +101,26 @@
             flex: 1 0 0%;
         }
 
+
         // Template
         .k-toolbar-template {
             align-self: center;
             align-items: center;
         }
 
+
+        // Child components
+        .k-textbox,
+        .k-combobox,
+        .k-dropdown,
+        .k-searchbox,
+        .k-numerictextbox,
+        .k-datepicker,
+        .k-timepicker,
+        .k-datetimepicker {
+            width: 10em;
+        }
+
     }
 
 
@@ -120,6 +135,7 @@
 
     // Angular specific
     kendo-toolbar-renderer {
+        display: inline-block;
         border-color: inherit;
     }
 
@@ -127,6 +143,14 @@
     // Overflow container
     .k-overflow-container {
 
+        > .k-item {
+            border-color: inherit;
+        }
+
+        .k-separator {
+            margin: map-get( $spacing, 1 ) 0;
+        }
+
         // Group
         .k-overflow-tool-group {
             display: block;
@@ -134,13 +158,23 @@
 
         // Button
         .k-overflow-button {
+            @include border-radius( 0 );
+            padding: $list-item-padding-y $list-item-padding-x;
             width: 100%;
+            border-width: 0;
+            color: inherit;
+            background-color: transparent;
+            background-image: none;
+            line-height: inherit;
+            display: flex;
+            justify-content: flex-start;
         }
 
         // Button group
         .k-button-group {
+            @include box-shadow( none );
             display: flex;
-            flex-direction: column;
+            flex-flow: column nowrap;
 
             .k-button {
                 margin: if( $button-border-width == 0, null, 0);
@@ -200,6 +234,7 @@
         .k-toolbar {
             padding: 0;
             border-width: 0;
+            flex-shrink: 1;
             color: inherit;
             background: none;
         }

package/modules/@progress/kendo-theme-default/scss/toolbar/_theme.scss

@@ -11,13 +11,6 @@
         @include box-shadow( $toolbar-shadow );
 
 
-        // Overflow anchor
-        .k-overflow-anchor {
-            color: inherit;
-            background: transparent;
-        }
-
-
         // Separator
         .k-separator {
             border-color: $toolbar-separator-border;
@@ -29,6 +22,41 @@
 
     }
 
+
+    // Overflow container
+    .k-overflow-container {
+
+        .k-button {
+
+            // Hover state
+            &:hover,
+            &.k-state-hover {
+                color: $list-item-hovered-text;
+                background: $list-item-hovered-bg;
+            }
+
+            // Active state
+            &:active,
+            &.k-state-active {
+                color: $list-item-selected-text;
+                background: $list-item-selected-bg;
+            }
+
+            // Button focus state
+            .k-button:focus,
+            .k-button.k-state-focused {
+                box-shadow: $list-item-focused-shadow;
+            }
+
+            // Disabled state
+            &:disabled,
+            &.k-state-disabled {
+                color: inherit;
+            }
+        }
+
+    }
+
 }
 
 

package/modules/@progress/kendo-theme-default/scss/treelist/_layout.scss

@@ -10,9 +10,13 @@
             padding: .4em .6em;
             line-height: 1.6em;
 
+            // TODO: see what this does and use a better name
             .k-loading {
                 vertical-align: baseline;
                 margin-right: 5px;
+
+                // TODO
+                display: none;
             }
         }
 

package/modules/@progress/kendo-theme-default/scss/treeview/_layout.scss

@@ -1,8 +1,8 @@
 @include exports("treeview/layout") {
 
-    // Base
+    // Treeview
     .k-treeview {
-        padding: $treeview-padding-y $treeview-padding-x;
+        padding: 0;
         border-width: 0;
         background: none;
         box-sizing: border-box;
@@ -16,159 +16,173 @@
         white-space: nowrap;
         -webkit-touch-callout: none;
         -webkit-tap-highlight-color: $rgba-transparent;
+    }
 
-        > .k-group {
-            outline: 0;
-            -webkit-touch-callout: none;
-            -webkit-tap-highlight-color: $rgba-transparent;
-        }
 
-        .k-content,
-        > .k-group,
-        .k-item > .k-group {
-            margin: 0;
-            padding: 0;
-            background: none;
-            list-style: none;
-            position: relative;
-
-            &.ng-animating {
-                overflow: hidden;
-            }
-        }
+    // Treeview filter
+    .k-treeview-filter {
+        padding: map-get( $spacing, 1 );
+        box-sizing: border-box;
+        display: block;
+        position: relative;
+        flex: none;
+    }
 
-        // Wrappers
-        .k-top,
-        .k-mid,
-        .k-bot {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            align-content: center;
-        }
 
-        // Items
-        .k-item {
-            outline-style: none;
-            margin: 0;
-            padding: 0 0 0 $treeview-indent;
-            border-width: 0;
-            display: block;
-        }
+    // Treeview group
+    .k-treeview-group,
+    .k-treeview .k-group {
+        margin: 0;
+        padding: 0;
+        background: none;
+        list-style: none;
+        position: relative;
+        outline: 0;
+        -webkit-touch-callout: none;
+        -webkit-tap-highlight-color: $rgba-transparent;
 
-        // Link
-        .k-in {
-            @include border-radius( $treeview-item-border-radius );
-            margin: 0;
-            padding: $treeview-item-padding-y $treeview-item-padding-x;
-            border: $treeview-item-border-width solid transparent;
-            text-decoration: none;
-            display: inline-flex;
-            align-items: center;
-            align-content: center;
-            vertical-align: middle;
-            position: relative;
-        }
-        .k-in.k-state-focused {
-            z-index: 1;
+        &.ng-animating {
+            overflow: hidden;
         }
+    }
 
-        // LoadMore button
-        .k-treeview-load-more-button {
-            cursor: pointer;
 
-            &:hover,
-            &.k-state-hover,
-            &:focus,
-            &.k-state-focused {
-                text-decoration: underline;
-            }
-        }
-        .k-treeview-load-more-checkboxes-container {
-            padding-left: $treeview-loadmore-checkboxes-padding-x;
+    // Treeview wrappers
+    .k-treeview-top,
+    .k-treeview .k-top,
+    .k-treeview-mid,
+    .k-treeview .k-mid,
+    .k-treeview-bot,
+    .k-treeview .k-bot {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        align-content: center;
+    }
 
-            .k-i-loading {
-                margin-left: $treeview-loadmore-checkboxes-icon-indent;
-                margin-right: $treeview-loadmore-checkboxes-icon-margin-x;
-            }
-        }
 
-        // Expand / collapse
+    // Treeview item
+    .k-treeview-item,
+    .k-treeview .k-item {
+        outline-style: none;
+        margin: 0;
+        padding: 0 0 0 $treeview-indent;
+        border-width: 0;
+        display: block;
+    }
+
+
+    // Treeview toggle
+    .k-treeview-toggle {
+        flex: none;
+        display: inline-flex;
+        flex-flow: row nowrap;
+        align-items: center;
+
         .k-i-expand,
         .k-i-collapse {
-            margin-left: -$treeview-indent;
-            cursor: pointer;
-
-            + .k-checkbox-wrapper {
-                margin-left: $icon-spacing;
-            }
+            margin: 0 !important; // sass-lint:disable-line no-important
         }
+    }
+    .k-treeview-toggle,
+    .k-treeview .k-i-expand,
+    .k-treeview .k-i-collapse {
+        margin-left: -$treeview-indent;
+        cursor: pointer;
+    }
+
+
+    // Loading icon
+    .k-treeview-loading {
+        margin-right: $icon-spacing;
+    }
+
+
+    // Checkbox
+    .k-treeview .k-checkbox-wrap,
+    .k-treeview .k-checkbox-wrapper {
+        margin-left: $icon-spacing;
+        margin-right: $icon-spacing;
+        align-self: center;
+    }
 
-        // Checkboxes
-        .k-checkbox-wrapper {
+
+    // Treeview leaf
+    .k-treeview-leaf,
+    .k-treeview .k-in {
+        @include border-radius( $treeview-item-border-radius );
+        margin: 0;
+        padding: $treeview-item-padding-y $treeview-item-padding-x;
+        border: $treeview-item-border-width solid transparent;
+        text-decoration: none;
+        display: inline-flex;
+        align-items: center;
+        align-content: center;
+        vertical-align: middle;
+        position: relative;
+
+        .k-icon,
+        .k-image,
+        .k-sprite {
             margin-right: $icon-spacing;
         }
 
-        // TODO: Delete the following block when https://github.com/telerik/kendo-angular-treeview/issues/138 is done
-        // Drag and Drop icon
-        .k-i-drag-and-drop {
-            position: absolute;
-            transform: translate(-50%, -50%);
-            z-index: 1000;
+        &.k-state-focus,
+        &.k-state-focused {
+            z-index: 1;
         }
+    }
 
-        // Other content
-        .k-in .k-icon,
-        .k-in .k-image,
-        .k-in .k-sprite {
-            margin-right: $icon-spacing;
+
+    // Treeview load more button
+    .k-treeview .k-treeview-load-more-button {
+        cursor: pointer;
+
+        &:hover,
+        &.k-state-hover,
+        &:focus,
+        &.k-state-focus,
+        &.k-state-focused {
+            text-decoration: underline;
         }
     }
 
+
     // RTL
     .k-rtl .k-treeview,
     .k-treeview[dir="rtl"] {
 
-        // Items
-        .k-item {
+        // Treeview item
+        .k-item,
+        .k-treeview-item {
             padding-left: 0;
             padding-right: $treeview-indent;
         }
 
-        .k-treeview-load-more-checkboxes-container {
-            padding-left: 0;
-            padding-right: $treeview-loadmore-checkboxes-padding-x;
-
-            .k-i-loading {
-                margin-left: $treeview-loadmore-checkboxes-icon-margin-x;
-                margin-right: $treeview-loadmore-checkboxes-icon-indent;
-            }
-        }
-
-        // Expand / collapse
+        // Treeview toggle
         .k-i-expand,
-        .k-i-collapse {
+        .k-i-collapse,
+        .k-treeview-toggle {
             margin-left: 0;
             margin-right: -$treeview-indent;
-
-            + .k-checkbox-wrapper {
-                margin-right: $icon-spacing;
-            }
         }
 
-        // Checkboxes
-        .k-checkbox-wrapper {
+        // Loading
+        .k-treeview-loading {
             margin-right: 0;
             margin-left: $icon-spacing;
         }
 
-        // Other content
-        .k-in .k-icon,
-        .k-in .k-image,
-        .k-in .k-sprite {
-            margin-left: $icon-spacing;
-            margin-right: 0;
+        // Treeview leaf
+        .k-treeview-leaf,
+        .k-in {
+            .k-icon,
+            .k-image,
+            .k-sprite {
+                margin-right: 0;
+                margin-left: $icon-spacing;
+            }
         }
-
     }
+
 }

package/modules/@progress/kendo-theme-default/scss/treeview/_theme.scss

@@ -1,21 +1,26 @@
 @include exports("treeview/theme") {
 
-    // Appearance
+    // Treeview
     .k-treeview {
         @include fill(
             $treeview-text,
             $treeview-bg,
             $treeview-border
         );
+    }
+
 
+    // Treeview item
+    .k-treeview-item {}
 
-        // Item
-        .k-in {}
 
+    // Treeview leaf
+    .k-treeview-leaf,
+    .k-treeview .k-in {
 
-        // Interactive states
-        .k-in:hover,
-        .k-in.k-state-hover {
+        // Hover state
+        &:hover,
+        &.k-state-hover {
             @include fill(
                 $treeview-item-hovered-text,
                 $treeview-item-hovered-bg,
@@ -23,7 +28,15 @@
                 $treeview-item-hovered-gradient
             );
         }
-        .k-in.k-state-selected {
+
+        // Focus state
+        &.k-state-focus,
+        &.k-state-focused {
+            @include box-shadow( $treeview-item-focused-shadow );
+        }
+
+        // Selected state
+        &.k-state-selected {
             @include fill(
                 $treeview-item-selected-text,
                 $treeview-item-selected-bg,
@@ -31,24 +44,20 @@
                 $treeview-item-selected-gradient
             );
         }
-        .k-in.k-state-focused {
-            @include box-shadow( $treeview-item-focused-shadow );
-        }
-        .k-in.k-state-selected.k-state-focused {
-            @include box-shadow( $treeview-item-selected-focused-shadow );
-        }
+    }
 
-        // LoadMore button
-        .k-treeview-load-more-button {
-            @include fill(
-                $treeview-loadmore-text,
-                $treeview-loadmore-bg,
-                $treeview-loadmore-border
-            );
-        }
 
-        .k-treeview-load-more-button:hover,
-        .k-treeview-load-more-button.k-state-hover {
+    // Treeview load more button
+    .k-treeview .k-treeview-load-more-button {
+        @include fill(
+            $treeview-loadmore-text,
+            $treeview-loadmore-bg,
+            $treeview-loadmore-border
+        );
+
+        // Hover state
+        &:hover,
+        &.k-state-hover {
             @include fill(
                 $treeview-loadmore-hover-text,
                 $treeview-loadmore-hover-bg,
@@ -56,8 +65,10 @@
             );
         }
 
-        .k-treeview-load-more-button:focus,
-        .k-treeview-load-more-button.k-state-focused {
+        // Focus state
+        &:focus,
+        &.k-state-focus,
+        &.k-state-focused {
             @include fill(
                 $treeview-loadmore-focus-text,
                 $treeview-loadmore-focus-bg,

package/modules/@progress/kendo-theme-default/scss/treeview/_variables.scss

@@ -1,47 +1,101 @@
 // Treeview
-$treeview-padding-x: 0px !default;
-$treeview-padding-y: 0px !default;
+
+/// Font family of the treeview component.
+/// @group treeview
 $treeview-font-family: $font-family !default;
-$treeview-font-size: $font-size !default;
-$treeview-line-height: $line-height !default;
+/// Font size of the treeview component.
+/// @group treeview
+$treeview-font-size: $font-size-md !default;
+/// Line height of the treeview component.
+/// @group treeview
+$treeview-line-height: $line-height-md !default;
 
+/// Indentation of child groups in treeview component.
+/// @group treeview
 $treeview-indent: 16px !default;
 
+/// Horizontal padding of treeview items.
+/// @group treeview
 $treeview-item-padding-x: map-get( $spacing, 2 ) !default;
+/// Vertical padding of treeview items.
+/// @group treeview
 $treeview-item-padding-y: map-get( $spacing, 1 ) !default;
+/// Border width of treeview items.
+/// @group treeview
 $treeview-item-border-width: 0px !default;
+/// Border radius of treeview items.
+/// @group treeview
 $treeview-item-border-radius: null !default;
 
+/// Background color of the treeview component.
+/// @group treeview
 $treeview-bg: null !default;
+/// Text color of the treeview component.
+/// @group treeview
 $treeview-text: $component-text !default;
+/// Border color of the treeview component.
+/// @group treeview
 $treeview-border: null !default;
 
+/// Background color of hovered treeview items.
+/// @group treeview
 $treeview-item-hovered-bg: $hovered-bg !default;
+/// Text color of hovered treeview items.
+/// @group treeview
 $treeview-item-hovered-text: $hovered-text !default;
+/// Border color of hovered treeview items.
+/// @group treeview
 $treeview-item-hovered-border: null !default;
+/// Background gradient of hovered treeview items.
+/// @group treeview
 $treeview-item-hovered-gradient: null !default;
 
+/// Background color of selected treeview items.
+/// @group treeview
 $treeview-item-selected-bg: $selected-bg !default;
+/// Text color of selected treeview items.
+/// @group treeview
 $treeview-item-selected-text: $selected-text !default;
+/// Border color of selected treeview items.
+/// @group treeview
 $treeview-item-selected-border: null !default;
+/// Background gradient of selected treeview items.
+/// @group treeview
 $treeview-item-selected-gradient: null !default;
 
+/// Box shadow of focused treeview items.
+/// @group treeview
 $treeview-item-focused-shadow: $focused-shadow !default;
-$treeview-item-selected-focused-shadow: null !default;
-
-$treeview-loadmore-checkboxes-padding-x: calc( #{$icon-spacing} + #{$checkbox-size} + #{$treeview-indent} ) !default;
-$treeview-loadmore-checkboxes-icon-indent: calc( -1 * (#{$icon-spacing} + #{$treeview-indent}) ) !default;
-$treeview-loadmore-checkboxes-icon-margin-x: $icon-spacing !default;
 
+/// Background color of load more.
+/// @group treeview
 $treeview-loadmore-bg: transparent !default;
-$treeview-loadmore-text: $primary !default;
+/// Text color of load more.
+/// @group treeview
+$treeview-loadmore-text: $link-text !default;
+/// Border color of load more.
+/// @group treeview
 $treeview-loadmore-border: null !default;
 
+/// Background color of a hovered load more.
+/// @group treeview
 $treeview-loadmore-hover-bg: transparent !default;
-$treeview-loadmore-hover-text: $primary-darker !default;
+/// Text color of a hovered load more.
+/// @group treeview
+$treeview-loadmore-hover-text: $link-hover-text !default;
+/// Border color of a hovered load more.
+/// @group treeview
 $treeview-loadmore-hover-border: null !default;
 
+/// Background color of a focused load more.
+/// @group treeview
 $treeview-loadmore-focus-bg: transparent !default;
-$treeview-loadmore-focus-text: $primary !default;
+/// Text color of a focused load more.
+/// @group treeview
+$treeview-loadmore-focus-text: $link-hover-text !default;
+/// Border color of a focused load more.
+/// @group treeview
 $treeview-loadmore-focus-border: null !default;
-$treeview-loadmore-focus-shadow: none !default;
+/// Box shadow of a focused load more.
+/// @group treeview
+$treeview-loadmore-focus-shadow: $treeview-item-focused-shadow !default;

package/modules/@progress/kendo-theme-default/scss/typography/_variables.scss

@@ -9,8 +9,8 @@ $enable-typography: false !default;
 $font-size: 14px !default;
 $font-size-xs: 10px !default;
 $font-size-sm: 12px !default;
-$font-size-md: 16px !default;
-$font-size-lg: 18px !default;
+$font-size-md: $font-size !default;
+$font-size-lg: 16px !default;
 $font-size-xl: 20px !default;
 
 /// Font family across all components.
@@ -25,7 +25,7 @@ $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Roboto Mono",
 /// @group typography
 $line-height: (20 / 14) !default;
 $line-height-xs: 1 !default;
-$line-height-sm: 1.2 !default;
+$line-height-sm: 1.25 !default;
 $line-height-md: $line-height !default;
 $line-height-lg: 1.5 !default;
 $line-height-em: $line-height * 1em !default;