@progress/kendo-theme-default 5.0.0-next.2 → 5.0.0

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 );
         }
     }
 

package/scss/treeview/_variables.scss

@@ -1,47 +1,126 @@
 // Treeview
-$treeview-padding-x: 0px !default;
-$treeview-padding-y: 0px !default;
-$treeview-font-family: $font-family !default;
-$treeview-font-size: $font-size !default;
-$treeview-line-height: $line-height !default;
-
-$treeview-indent: 16px !default;
-
-$treeview-item-padding-x: map-get( $spacing, 2 ) !default;
-$treeview-item-padding-y: map-get( $spacing, 1 ) !default;
-$treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: null !default;
-
-$treeview-bg: null !default;
-$treeview-text: $component-text !default;
-$treeview-border: null !default;
-
-$treeview-item-hovered-bg: $hovered-bg !default;
-$treeview-item-hovered-text: $hovered-text !default;
-$treeview-item-hovered-border: null !default;
-$treeview-item-hovered-gradient: null !default;
-
-$treeview-item-selected-bg: $selected-bg !default;
-$treeview-item-selected-text: $selected-text !default;
-$treeview-item-selected-border: null !default;
-$treeview-item-selected-gradient: null !default;
-
-$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;
-
-$treeview-loadmore-bg: transparent !default;
-$treeview-loadmore-text: $primary !default;
-$treeview-loadmore-border: null !default;
-
-$treeview-loadmore-hover-bg: transparent !default;
-$treeview-loadmore-hover-text: $primary-darker !default;
-$treeview-loadmore-hover-border: null !default;
-
-$treeview-loadmore-focus-bg: transparent !default;
-$treeview-loadmore-focus-text: $primary !default;
-$treeview-loadmore-focus-border: null !default;
-$treeview-loadmore-focus-shadow: none !default;
+
+/// Font family of the treeview component.
+/// @group treeview
+$kendo-treeview-font-family: $font-family !default;
+/// Font size of the treeview component.
+/// @group treeview
+$kendo-treeview-font-size: $font-size-md !default;
+/// Line height of the treeview component.
+/// @group treeview
+$kendo-treeview-line-height: $line-height-md !default;
+
+/// Indentation of child groups in treeview component.
+/// @group treeview
+$kendo-treeview-indent: 16px !default;
+
+/// Horizontal padding of treeview items.
+/// @group treeview
+$kendo-treeview-item-padding-x: map-get( $spacing, 2 ) !default;
+/// Vertical padding of treeview items.
+/// @group treeview
+$kendo-treeview-item-padding-y: map-get( $spacing, 1 ) !default;
+/// Border width of treeview items.
+/// @group treeview
+$kendo-treeview-item-border-width: 0px !default;
+/// Border radius of treeview items.
+/// @group treeview
+$kendo-treeview-item-border-radius: $border-radius !default;
+
+
+/// The sizes of the treeview.
+/// @group treeview
+$kendo-treeview-sizes: (
+    sm: (
+        font-size: $font-size-md,
+        line-height: $line-height-md,
+        item-padding-x: map-get( $spacing, 2 ),
+        item-padding-y: map-get( $spacing, 1 ) - map-get( $spacing, thin )
+    ),
+    md: (
+        font-size: $font-size-md,
+        line-height: $line-height-md,
+        item-padding-x: map-get( $spacing, 2 ),
+        item-padding-y: map-get( $spacing, 1 )
+    ),
+    lg: (
+        font-size: $font-size-md,
+        line-height: $line-height-md,
+        item-padding-x: map-get( $spacing, 2 ),
+        item-padding-y: map-get( $spacing, 1 ) + map-get( $spacing, thin )
+    )
+) !default;
+
+
+/// Background color of the treeview component.
+/// @group treeview
+$kendo-treeview-bg: null !default;
+/// Text color of the treeview component.
+/// @group treeview
+$kendo-treeview-text: $component-text !default;
+/// Border color of the treeview component.
+/// @group treeview
+$kendo-treeview-border: null !default;
+
+/// Background color of hovered treeview items.
+/// @group treeview
+$kendo-treeview-item-hover-bg: $hovered-bg !default;
+/// Text color of hovered treeview items.
+/// @group treeview
+$kendo-treeview-item-hover-text: $hovered-text !default;
+/// Border color of hovered treeview items.
+/// @group treeview
+$kendo-treeview-item-hover-border: null !default;
+/// Background gradient of hovered treeview items.
+/// @group treeview
+$kendo-treeview-item-hover-gradient: null !default;
+
+/// Background color of selected treeview items.
+/// @group treeview
+$kendo-treeview-item-selected-bg: $selected-bg !default;
+/// Text color of selected treeview items.
+/// @group treeview
+$kendo-treeview-item-selected-text: $selected-text !default;
+/// Border color of selected treeview items.
+/// @group treeview
+$kendo-treeview-item-selected-border: null !default;
+/// Background gradient of selected treeview items.
+/// @group treeview
+$kendo-treeview-item-selected-gradient: null !default;
+
+/// Box shadow of focused treeview items.
+/// @group treeview
+$kendo-treeview-item-focus-shadow: $focused-shadow !default;
+
+/// Background color of load more.
+/// @group treeview
+$kendo-treeview-loadmore-bg: transparent !default;
+/// Text color of load more.
+/// @group treeview
+$kendo-treeview-loadmore-text: $link-text !default;
+/// Border color of load more.
+/// @group treeview
+$kendo-treeview-loadmore-border: null !default;
+
+/// Background color of a hovered load more.
+/// @group treeview
+$kendo-treeview-loadmore-hover-bg: transparent !default;
+/// Text color of a hovered load more.
+/// @group treeview
+$kendo-treeview-loadmore-hover-text: $link-hover-text !default;
+/// Border color of a hovered load more.
+/// @group treeview
+$kendo-treeview-loadmore-hover-border: null !default;
+
+/// Background color of a focused load more.
+/// @group treeview
+$kendo-treeview-loadmore-focus-bg: transparent !default;
+/// Text color of a focused load more.
+/// @group treeview
+$kendo-treeview-loadmore-focus-text: $link-hover-text !default;
+/// Border color of a focused load more.
+/// @group treeview
+$kendo-treeview-loadmore-focus-border: null !default;
+/// Box shadow of a focused load more.
+/// @group treeview
+$kendo-treeview-loadmore-focus-shadow: $kendo-treeview-item-focus-shadow !default;

package/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,10 +25,10 @@ $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;
+$line-height-em: $line-height * 1em !default;
 
 
 // Font weight