@progress/kendo-theme-default 5.0.0-next.4 → 5.0.2-dev.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,47 @@
 
     }
 
+
+    // Overflow container
+    .k-overflow-container {
+
+        .k-button {
+
+            // Hover state
+            &:hover,
+            &.k-hover {
+                color: $kendo-menu-popup-item-hover-text;
+                background: $kendo-menu-popup-item-hover-bg;
+            }
+
+            // Button focus state
+            &:focus,
+            &.k-focus {
+                box-shadow: $kendo-menu-popup-item-focus-shadow;
+            }
+
+            // Active state
+            &:active,
+            &.k-active {
+                color: $kendo-menu-popup-item-hover-text;
+                background: $kendo-menu-popup-item-hover-bg;
+            }
+
+            // Selected
+            &.k-selected {
+                color: $kendo-menu-popup-item-expanded-text;
+                background: $kendo-menu-popup-item-expanded-bg;
+            }
+
+            // Disabled state
+            &:disabled,
+            &.k-disabled {
+                color: inherit;
+            }
+        }
+
+    }
+
 }
 
 

package/scss/toolbar/_variables.scss

@@ -10,7 +10,7 @@ $toolbar-border-width: 1px !default;
 $toolbar-border-radius: null !default;
 $toolbar-spacing: $toolbar-padding-x !default;
 
-$toolbar-inner-calc-size: calc( #{$button-calc-size} + #{$toolbar-padding-y * 2} ) !default;
+$toolbar-inner-calc-size: calc( #{$kendo-button-calc-size} + #{$toolbar-padding-y * 2} ) !default;
 
 $toolbar-font-family: $font-family !default;
 $toolbar-font-size: $font-size !default;
@@ -23,3 +23,5 @@ $toolbar-gradient: null !default;
 $toolbar-shadow: null !default;
 
 $toolbar-separator-border: inherit !default;
+
+$toolbar-input-width: 10em !default;

package/scss/tooltip/_layout.scss

@@ -20,6 +20,12 @@
         z-index: 12000;
         -webkit-touch-callout: none;
         -webkit-tap-highlight-color: $rgba-transparent;
+
+        *,
+        *::before,
+        *::after {
+            box-sizing: border-box;
+        }
     }
 
     .k-tooltip-icon {
@@ -58,7 +64,6 @@
         border-width: $tooltip-callout-size;
         border-style: solid;
         border-color: transparent;
-        box-sizing: border-box;
         position: absolute;
         pointer-events: none;
     }

package/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/scss/treeview/_layout.scss

@@ -1,15 +1,15 @@
 @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;
         outline: 0;
-        font-family: $treeview-font-family;
-        font-size: $treeview-font-size;
-        line-height: $treeview-line-height;
+        font-family: $kendo-treeview-font-family;
+        font-size: $kendo-treeview-font-size;
+        line-height: $kendo-treeview-line-height;
         display: block;
         cursor: default;
         overflow: auto;
@@ -17,158 +17,171 @@
         -webkit-touch-callout: none;
         -webkit-tap-highlight-color: $rgba-transparent;
 
-        > .k-group {
-            outline: 0;
-            -webkit-touch-callout: none;
-            -webkit-tap-highlight-color: $rgba-transparent;
+        *,
+        *::before,
+        *::after {
+            box-sizing: border-box;
         }
+    }
 
-        .k-content,
-        > .k-group,
-        .k-item > .k-group {
-            margin: 0;
-            padding: 0;
-            background: none;
-            list-style: none;
-            position: relative;
-
-            &.ng-animating {
-                overflow: hidden;
-            }
-        }
 
-        // Wrappers
-        .k-top,
-        .k-mid,
-        .k-bot {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            align-content: center;
-        }
+    // Treeview filter
+    .k-treeview-filter {
+        padding: map-get( $spacing, 2 );
+        display: block;
+        position: relative;
+        flex: none;
+    }
 
-        // Items
-        .k-item {
-            outline-style: none;
-            margin: 0;
-            padding: 0 0 0 $treeview-indent;
-            border-width: 0;
-            display: block;
-        }
 
-        // 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;
+    // Treeview group
+    .k-treeview-group {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        position: relative;
+        outline: 0;
+        -webkit-touch-callout: none;
+        -webkit-tap-highlight-color: $rgba-transparent;
+
+        &.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-mid,
+    .k-treeview-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
-        .k-i-expand,
-        .k-i-collapse {
-            margin-left: -$treeview-indent;
-            cursor: pointer;
+    // Treeview item
+    .k-treeview-item {
+        outline-style: none;
+        margin: 0;
+        padding: 0 0 0 $kendo-treeview-indent;
+        border-width: 0;
+        display: block;
+    }
 
-            + .k-checkbox-wrapper {
-                margin-left: $icon-spacing;
-            }
-        }
 
-        // Checkboxes
-        .k-checkbox-wrapper {
+    // Treeview toggle
+    .k-treeview-toggle {
+        margin-left: -$kendo-treeview-indent;
+        flex: none;
+        display: inline-flex;
+        flex-flow: row nowrap;
+        align-items: center;
+        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;
+    }
+
+
+    // Treeview leaf
+    .k-treeview-leaf {
+        @include border-radius( $kendo-treeview-item-border-radius );
+        padding: $kendo-treeview-item-padding-y $kendo-treeview-item-padding-x;
+        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-focus {
+            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-hover,
+        &:focus,
+        &.k-focus {
+            text-decoration: underline;
         }
     }
 
+
     // RTL
     .k-rtl .k-treeview,
     .k-treeview[dir="rtl"] {
 
-        // Items
-        .k-item {
+        // Treeview item
+        .k-treeview-item {
             padding-left: 0;
-            padding-right: $treeview-indent;
+            padding-right: $kendo-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
-        .k-i-expand,
-        .k-i-collapse {
+        // Treeview toggle
+        .k-treeview-toggle {
             margin-left: 0;
-            margin-right: -$treeview-indent;
-
-            + .k-checkbox-wrapper {
-                margin-right: $icon-spacing;
-            }
+            margin-right: -$kendo-treeview-indent;
         }
 
-        // 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;
+            }
         }
+    }
+
+    @each $size, $size-props in $kendo-treeview-sizes {
+        $_font-size: map-get( $size-props, font-size);
+        $_line-height: map-get( $size-props, line-height);
+        $_item-padding-x: map-get( $size-props, item-padding-x);
+        $_item-padding-y: map-get( $size-props, item-padding-y);
+
+        .k-treeview-#{$size} {
+            font-size: $_font-size;
+            line-height: $_line-height;
 
+            .k-treeview-leaf {
+                padding: $_item-padding-y $_item-padding-x;
+            }
+        }
     }
+
 }

package/scss/treeview/_theme.scss

@@ -1,69 +1,78 @@
 @include exports("treeview/theme") {
 
-    // Appearance
+    // Treeview
     .k-treeview {
         @include fill(
-            $treeview-text,
-            $treeview-bg,
-            $treeview-border
+            $kendo-treeview-text,
+            $kendo-treeview-bg,
+            $kendo-treeview-border
         );
+    }
 
 
-        // Item
-        .k-in {}
+    // Treeview item
+    .k-treeview-item {}
 
 
-        // Interactive states
-        .k-in:hover,
-        .k-in.k-state-hover {
-            @include fill(
-                $treeview-item-hovered-text,
-                $treeview-item-hovered-bg,
-                $treeview-item-hovered-border,
-                $treeview-item-hovered-gradient
-            );
-        }
-        .k-in.k-state-selected {
+    // Treeview leaf
+    .k-treeview-leaf {
+
+        // Hover state
+        &:hover,
+        &.k-hover {
             @include fill(
-                $treeview-item-selected-text,
-                $treeview-item-selected-bg,
-                $treeview-item-selected-border,
-                $treeview-item-selected-gradient
+                $kendo-treeview-item-hover-text,
+                $kendo-treeview-item-hover-bg,
+                $kendo-treeview-item-hover-border,
+                $kendo-treeview-item-hover-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 );
+
+        // Focus state
+        &:focus,
+        &.k-focus {
+            @include box-shadow( $kendo-treeview-item-focus-shadow );
         }
 
-        // LoadMore button
-        .k-treeview-load-more-button {
+        // Selected state
+        &.k-selected {
             @include fill(
-                $treeview-loadmore-text,
-                $treeview-loadmore-bg,
-                $treeview-loadmore-border
+                $kendo-treeview-item-selected-text,
+                $kendo-treeview-item-selected-bg,
+                $kendo-treeview-item-selected-border,
+                $kendo-treeview-item-selected-gradient
             );
         }
+    }
+
+
+    // 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
+        );
 
-        .k-treeview-load-more-button:hover,
-        .k-treeview-load-more-button.k-state-hover {
+        // Hover state
+        &:hover,
+        &.k-hover {
             @include fill(
-                $treeview-loadmore-hover-text,
-                $treeview-loadmore-hover-bg,
-                $treeview-loadmore-hover-border
+                $kendo-treeview-loadmore-hover-text,
+                $kendo-treeview-loadmore-hover-bg,
+                $kendo-treeview-loadmore-hover-border
             );
         }
 
-        .k-treeview-load-more-button:focus,
-        .k-treeview-load-more-button.k-state-focused {
+        // Focus state
+        &:focus,
+        &.k-focus {
             @include fill(
-                $treeview-loadmore-focus-text,
-                $treeview-loadmore-focus-bg,
-                $treeview-loadmore-focus-border
+                $kendo-treeview-loadmore-focus-text,
+                $kendo-treeview-loadmore-focus-bg,
+                $kendo-treeview-loadmore-focus-border
             );
-            @include box-shadow( $treeview-loadmore-focus-shadow );
+            @include box-shadow( $kendo-treeview-loadmore-focus-shadow );
         }
     }