@progress/kendo-theme-default 5.0.0-beta.2 → 5.0.0-beta.3

package/scss/table/_variables.scss

@@ -32,20 +32,20 @@ $kendo-table-sizes: (
     sm: (
         font-size: $font-size,
         line-height: $line-height,
-        cell-padding-x: map-get( $spacing, 1),
-        cell-padding-y: map-get( $spacing, 1)
+        cell-padding-x: map-get( $spacing, 2 ),
+        cell-padding-y: map-get( $spacing, 1 )
     ),
     md: (
         font-size: $font-size,
         line-height: $line-height,
-        cell-padding-x: map-get( $spacing, 2),
-        cell-padding-y: map-get( $spacing, 2)
+        cell-padding-x: map-get( $spacing, 2 ),
+        cell-padding-y: map-get( $spacing, 2 )
     ),
     lg: (
         font-size: $font-size,
         line-height: $line-height,
-        cell-padding-x: map-get( $spacing, 3),
-        cell-padding-y: map-get( $spacing, 3)
+        cell-padding-x: map-get( $spacing, 2 ),
+        cell-padding-y: map-get( $spacing, 3 )
     )
 ) !default;
 
@@ -85,13 +85,13 @@ $kendo-table-footer-border: $grid-footer-border !default;
 
 /// Background color of group rows in table.
 /// @group table
-$kendo-table-group-row-bg: $grid-grouping-row-bg !default;
+$kendo-table-group-row-bg: $kendo-table-header-bg !default;
 /// Text color of group rows in table.
 /// @group table
-$kendo-table-group-row-text: $grid-grouping-row-text !default;
+$kendo-table-group-row-text: $kendo-table-header-text !default;
 /// Border color of group rows in table.
 /// @group table
-$kendo-table-group-row-border: null !default;
+$kendo-table-group-row-border: $kendo-table-header-border !default;
 
 
 /// Background color of alternating rows in table.

package/scss/tabstrip/_layout.scss

@@ -39,7 +39,7 @@
     .k-tabstrip-items {
         outline: 0;
         display: flex;
-        flex-direction: row;
+        flex-flow: row wrap;
         flex: 0 0 auto;
 
         .k-item {

package/scss/toolbar/_layout.scss

@@ -62,13 +62,20 @@
         .k-split-button {}
 
 
+        // Input
+        .k-input,
+        .k-picker:not(.k-colorpicker) {
+            width: $toolbar-input-width;
+        }
+
         // Overflow anchor
         .k-overflow-anchor {
             @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,6 +107,7 @@
             flex: 1 0 0%;
         }
 
+
         // Template
         .k-toolbar-template {
             align-self: center;
@@ -120,6 +128,7 @@
 
     // Angular specific
     kendo-toolbar-renderer {
+        display: inline-block;
         border-color: inherit;
     }
 
@@ -127,6 +136,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 +151,23 @@
 
         // Button
         .k-overflow-button {
+            @include border-radius( 0 );
+            padding: $kendo-list-item-padding-y-md $kendo-list-item-padding-x-md;
             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( $kendo-button-border-width == 0, null, 0);

package/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: $kendo-list-item-hover-text;
+                background: $kendo-list-item-hover-bg;
+            }
+
+            // Active state
+            &:active,
+            &.k-state-active {
+                color: $kendo-list-item-selected-text;
+                background: $kendo-list-item-selected-bg;
+            }
+
+            // Button focus state
+            .k-button:focus,
+            .k-button.k-state-focused {
+                box-shadow: $kendo-list-item-focus-shadow;
+            }
+
+            // Disabled state
+            &:disabled,
+            &.k-state-disabled {
+                color: inherit;
+            }
+        }
+
+    }
+
 }
 
 

package/scss/toolbar/_variables.scss

@@ -23,3 +23,5 @@ $toolbar-gradient: null !default;
 $toolbar-shadow: null !default;
 
 $toolbar-separator-border: inherit !default;
+
+$toolbar-input-width: 10em !default;

package/scss/treeview/_layout.scss

@@ -1,8 +1,8 @@
 @include exports("treeview/layout") {
 
-    // Base
+    // Treeview
     .k-treeview {
-        padding: $kendo-treeview-padding-y $kendo-treeview-padding-x;
+        padding: 0;
         border-width: 0;
         background: none;
         box-sizing: border-box;
@@ -14,161 +14,156 @@
         white-space: nowrap;
         -webkit-touch-callout: none;
         -webkit-tap-highlight-color: $rgba-transparent;
+    }
 
-        > .k-treeview-group {
-            outline: 0;
-            -webkit-touch-callout: none;
-            -webkit-tap-highlight-color: $rgba-transparent;
-        }
 
-        .k-content,
-        > .k-treeview-group,
-        .k-treeview-item > .k-treeview-group {
-            margin: 0;
-            padding: 0;
-            background: none;
-            list-style: none;
-            position: relative;
-
-            &.ng-animating {
-                overflow: hidden;
-            }
-        }
+    // Treeview group
+    .k-treeview-group,
+    .k-treeview .k-group {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        position: relative;
+        outline: 0;
+        -webkit-touch-callout: none;
+        -webkit-tap-highlight-color: $rgba-transparent;
 
-        // Wrappers
-        .k-treeview-top,
-        .k-treeview-mid,
-        .k-treeview-bot {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            align-content: center;
+        &.ng-animating {
+            overflow: hidden;
         }
+    }
 
-        // Items
-        .k-treeview-item {
-            outline-style: none;
-            margin: 0;
-            padding: 0 0 0 $kendo-treeview-indent;
-            border-width: 0;
-            display: block;
-        }
 
-        // Link
-        .k-treeview-leaf {
-            @include border-radius( $kendo-treeview-item-border-radius );
-            margin: 0;
-            border: $kendo-treeview-item-border-width solid transparent;
-            text-decoration: none;
-            display: inline-flex;
-            align-items: center;
-            align-content: center;
-            vertical-align: middle;
-            position: relative;
-        }
-        .k-treeview-leaf.k-state-focused {
-            z-index: 1;
-        }
+    // Treeview wrappers
+    .k-treeview-top,
+    .k-treeview-mid,
+    .k-treeview-bot {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        align-content: center;
+    }
 
-        // 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: $kendo-treeview-loadmore-checkboxes-padding-x;
+    // Treeview item
+    .k-treeview-item {
+        outline-style: none;
+        margin: 0;
+        padding: 0 0 0 $kendo-treeview-indent;
+        border-width: 0;
+        display: block;
+    }
 
-            .k-i-loading {
-                margin-left: $kendo-treeview-loadmore-checkboxes-icon-indent;
-                margin-right: $kendo-treeview-loadmore-checkboxes-icon-margin-x;
-            }
-        }
 
-        // Expand / collapse
-        .k-i-expand,
-        .k-i-collapse {
-            margin-left: -$kendo-treeview-indent;
-            cursor: pointer;
+    // Treeview toggle
+    .k-treeview-toggle {
+        flex: none;
+        display: inline-flex;
+        flex-flow: row nowrap;
+        align-items: center;
+        cursor: pointer;
 
-            + .k-checkbox-wrapper {
-                margin-left: $icon-spacing;
-            }
+        + .k-checkbox-wrap,
+        + .k-checkbox-wrapper {
+            margin-left: $icon-spacing;
         }
+    }
 
-        // Checkboxes
-        .k-checkbox-wrapper {
+
+    // Loading icon
+    .k-treeview-loading {
+        margin-right: $icon-spacing;
+    }
+
+
+    // Checkbox
+    .k-treeview .k-checkbox-wrap,
+    .k-treeview .k-checkbox-wrapper {
+        margin-right: $icon-spacing;
+    }
+
+
+    // Treeview leaf
+    .k-treeview-leaf {
+        @include border-radius( $kendo-treeview-item-border-radius );
+        border: $kendo-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-treeview-leaf .k-icon,
-        .k-treeview-leaf .k-image,
-        .k-treeview-leaf .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;
         }
     }
 
-    .k-treeview-toggle {}
-
-    .k-treeview-leaf-text {}
 
     // RTL
     .k-rtl .k-treeview,
     .k-treeview[dir="rtl"] {
 
-        // Items
+        // Treeview item
         .k-treeview-item {
             padding-left: 0;
             padding-right: $kendo-treeview-indent;
         }
 
-        .k-treeview-load-more-checkboxes-container {
-            padding-left: 0;
-            padding-right: $kendo-treeview-loadmore-checkboxes-padding-x;
-
-            .k-i-loading {
-                margin-left: $kendo-treeview-loadmore-checkboxes-icon-margin-x;
-                margin-right: $kendo-treeview-loadmore-checkboxes-icon-indent;
-            }
-        }
-
-        // Expand / collapse
-        .k-i-expand,
-        .k-i-collapse {
+        // Treeview toggle
+        .k-treeview-toggle {
             margin-left: 0;
             margin-right: -$kendo-treeview-indent;
 
+            + .k-checkbox-wrap,
             + .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-treeview-leaf .k-icon,
-        .k-treeview-leaf .k-image,
-        .k-treeview-leaf .k-sprite {
-            margin-left: $icon-spacing;
+        // Checkbox
+        .k-checkbox-wrap,
+        .k-checkbox-wrapper {
             margin-right: 0;
+            margin-left: $icon-spacing;
+        }
+
+        // Treeview leaf
+        .k-treeview-leaf,
+        .k-in {
+            .k-icon,
+            .k-image,
+            .k-sprite {
+                margin-right: 0;
+                margin-left: $icon-spacing;
+            }
         }
     }
 

package/scss/treeview/_theme.scss

@@ -1,29 +1,41 @@
 @include exports("treeview/theme") {
 
-    // Appearance
+    // Treeview
     .k-treeview {
         @include fill(
             $kendo-treeview-text,
             $kendo-treeview-bg,
             $kendo-treeview-border
         );
+    }
+
 
+    // Treeview item
+    .k-treeview-item {}
 
-        // Item
-        .k-treeview-leaf {}
 
+    // Treeview leaf
+    .k-treeview-leaf {
 
-        // Interactive states
-        .k-treeview-leaf:hover,
-        .k-treeview-leaf.k-hover {
+        // Hover state
+        &:hover,
+        &.k-hover {
             @include fill(
-                $kendo-treeview-item-hovered-text,
-                $kendo-treeview-item-hovered-bg,
-                $kendo-treeview-item-hovered-border,
-                $kendo-treeview-item-hovered-gradient
+                $kendo-treeview-item-hover-text,
+                $kendo-treeview-item-hover-bg,
+                $kendo-treeview-item-hover-border,
+                $kendo-treeview-item-hover-gradient
             );
         }
-        .k-treeview-leaf.k-selected {
+
+        // Focus state
+        &:focus,
+        &.k-focus {
+            @include box-shadow( $kendo-treeview-item-focus-shadow );
+        }
+
+        // Selected state
+        &.k-selected {
             @include fill(
                 $kendo-treeview-item-selected-text,
                 $kendo-treeview-item-selected-bg,
@@ -31,24 +43,20 @@
                 $kendo-treeview-item-selected-gradient
             );
         }
-        .k-treeview-leaf.k-focus {
-            @include box-shadow( $kendo-treeview-item-focused-shadow );
-        }
-        .k-treeview-leaf.k-selected.k-focus {
-            @include box-shadow( $kendo-treeview-item-selected-focused-shadow );
-        }
+    }
 
-        // LoadMore button
-        .k-treeview-load-more-button {
-            @include fill(
-                $kendo-treeview-loadmore-text,
-                $kendo-treeview-loadmore-bg,
-                $kendo-treeview-loadmore-border
-            );
-        }
 
-        .k-treeview-load-more-button:hover,
-        .k-treeview-load-more-button.k-hover {
+    // Treeview load more button
+    .k-treeview .k-treeview-load-more-button {
+        @include fill(
+            $kendo-treeview-loadmore-text,
+            $kendo-treeview-loadmore-bg,
+            $kendo-treeview-loadmore-border
+        );
+
+        // Hover state
+        &:hover,
+        &.k-hover {
             @include fill(
                 $kendo-treeview-loadmore-hover-text,
                 $kendo-treeview-loadmore-hover-bg,
@@ -56,8 +64,9 @@
             );
         }
 
-        .k-treeview-load-more-button:focus,
-        .k-treeview-load-more-button.k-focus {
+        // Focus state
+        &:focus,
+        &.k-focus {
             @include fill(
                 $kendo-treeview-loadmore-focus-text,
                 $kendo-treeview-loadmore-focus-bg,