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

package/scss/{datetime → timeselector}/_layout.scss

@@ -1,69 +1,43 @@
-@include exports("datetime/layout") {
+@include exports( "timeselector/layout" ) {
 
-    .k-datetime-container {
-
-        .k-datetime-wrap {
-            width: $datetime-width;
-            overflow: hidden;
-        }
-
-        .k-datetime-buttongroup {
-            padding: $kendo-button-padding-x;
-        }
-
-        .k-datetime-selector {
-            display: flex;
-            transition: transform .2s;
-        }
-
-        .k-datetime-calendar-wrap,
-        .k-datetime-time-wrap {
-            text-align: center;
-            flex: 0 0 $datetime-width;
-        }
-
-        .k-timeselector {
-            outline: none;
-        }
-
-        .k-time-list-container {
-            justify-content: center;
-        }
-
-        .k-time-tab {
-
-            .k-datetime-selector {
-                transform: translateX(-100%);
-            }
-        }
-
-        .k-rtl &,
-        &.k-rtl,
-        [dir="rtl"] &,
-        &[dir="rtl"] {
-            .k-time-tab {
+    // Time selector
+    .k-timeselector {
+        border-width: $time-selector-border-width;
+        border-style: solid;
+        box-sizing: border-box;
+        outline: 0;
+        font-family: $time-selector-font-family;
+        font-size: $time-selector-font-size;
+        line-height: $time-selector-line-height;
+        position: relative;
+        overflow: hidden;
+        display: flex;
+        flex-flow: column nowrap;
+        user-select: none;
+        -webkit-touch-callout: none;
+        -webkit-tap-highlight-color: $rgba-transparent;
 
-                .k-datetime-selector {
-                    transform: translateX(100%);
-                }
-            }
+        .k-popup > & {
+            border-width: 0;
         }
     }
 
-    // Infinite timepicker
-    .k-timeselector {}
 
-
-    // Header
-    .k-time-header {
+    // Time selector header
+    .k-time-header,
+    .k-time-selector-header {
+        padding: $time-selector-header-padding-y $time-selector-header-padding-x;
+        box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        padding: 2 * $padding-y $padding-x * 2;
-        line-height: $timepicker-header-height;
+        flex: 0 0 auto;
 
-        .k-title {
+        .k-title,
+        .k-time-selector-header-title {
+            padding: $kendo-button-padding-y $kendo-button-padding-x;
             font-weight: bold;
+            display: inline-block;
         }
 
         .k-time-now {
@@ -73,32 +47,57 @@
         }
     }
 
-    // Content
+
+    // Time selector footer
+    // .k-time-footer {}
+    // .k-time-selector-footer {}
+
+
+    // Time list container
+    .k-time-list-container {
+        display: flex;
+        position: relative;
+        flex: 1 1 auto;
+    }
+
+
+    // Time list highlight
+    .k-time-highlight,
+    .k-time-list-highlight {
+        width: 100%;
+        height: $time-list-highlight-height;
+        border-width: $time-list-highlight-border-width;
+        border-style: solid;
+        box-sizing: border-box;
+        position: absolute;
+        top: calc( 50% + #{$time-list-title-height / 2});
+        left: 0;
+        right: 0;
+        transform: translateY(-50%);
+        z-index: 1;
+    }
+
+
+    // Time list wrapper
     .k-time-list-wrapper {
-        display: inline-block;
-        overflow: hidden;
+        min-width: $time-list-width;
+        height: $time-list-height;
         box-sizing: content-box;
-        overflow-x: hidden;
-        overflow-y: auto;
+        display: inline-flex;
+        flex-flow: column nowrap;
+        align-items: stretch;
+        overflow: hidden;
         position: relative;
-        padding: $time-list-padding 0;
         text-align: center;
-        min-width: $time-list-width;
-        height: $time-list-height;
         flex: 1 1 auto;
 
         .k-title {
-            display: block;
+            font-size: $time-list-title-font-size;
+            line-height: $time-list-title-line-height;
+            font-weight: bold;
             text-align: center;
-            font-size: $font-size-xs;
-            position: absolute;
             text-transform: capitalize;
-            font-weight: bold;
-            min-width: 100%;
-            height: 1.5em;
-            line-height: 1.5em;
-            margin-top: -$time-list-padding;
-            z-index: 12;
+            display: block;
         }
 
         &.k-state-focused {
@@ -110,14 +109,14 @@
                 width: 100%;
                 left: 0;
                 pointer-events: none;
-                height: calc(50% - 1em);
+                height: calc( 50% - #{$time-list-highlight-height / 2} );
                 box-sizing: border-box;
                 border-width: 0;
                 border-style: solid;
             }
 
             &::before {
-                top: 0;
+                top: $time-list-title-height;
             }
 
             &::after {
@@ -126,47 +125,16 @@
         }
     }
 
-    .k-time-container {
-        position: absolute;
-        display: block;
-        overflow-x: hidden;
-        overflow-y: scroll;
-        line-height: $line-height;
-        left: 0;
-        right: 0;
-        top: $time-list-padding;
-        bottom: $time-list-padding;
-
-        @include hide-scrollbar("right");
-
-        > ul {
-            height: auto;
-            width: $time-list-width;
-            margin: auto;
-        }
-
-        .k-rtl &,
-        &.k-rtl,
-        [dir="rtl"] &,
-        &[dir="rtl"] {
-            @include hide-scrollbar("left");
-        }
-    }
-
-    .k-time-list-container {
-        display: flex;
-        position: relative;
-    }
 
+    // Time list
     .k-time-list {
-        position: absolute;
         display: flex;
-        z-index: 10;
-        outline: 0;
-        bottom: 0;
-        right: 0;
-        left: 0;
-        top: 0;
+        flex-flow: row nowrap;
+        align-items: stretch;
+        flex: 1;
+        position: relative;
+        z-index: 1;
+        overflow: hidden;
 
         &::before,
         &::after {
@@ -184,38 +152,56 @@
         &::after { bottom: 0; }
     }
 
-    .k-time-list .k-item {
-        padding: $time-list-item-padding-y $time-list-item-padding-x;
-        min-height: calc( #{decimal-round($line-height-em, 2)} + 2px );
-        line-height: calc( #{decimal-round($line-height-em, 2)} + 2px );
-    }
 
-    .k-time-highlight {
-        position: absolute;
-        top: 50%;
-        left: 0;
-        right: 0;
-        transform: translateY(-50%);
-        width: 100%;
-        height: $kendo-button-inner-calc-size;
-        z-index: 1;
-        border-width: $time-highlight-size 0;
-        border-style: solid;
+    // Time list content
+    .k-time-container,
+    .k-time-list-content {
+        position: relative;
+        flex: 1 1 auto;
+        display: block;
+        overflow-x: hidden;
+        overflow-y: scroll;
+
+        @include hide-scrollbar("right");
+
+        > ul {
+            height: auto;
+            width: $time-list-width;
+            margin: auto;
+        }
+
+        .k-rtl &
+        [dir="rtl"] & {
+            @include hide-scrollbar("left");
+        }
+
+        .k-scrollable-placeholder {
+            position: absolute;
+            width: 1px;
+            top: 0;
+            right: 0;
+        }
     }
 
-    .k-time-container .k-scrollable-placeholder {
-        position: absolute;
-        width: 1px;
-        top: 0;
-        right: 0;
+
+    // Time list item
+    .k-time-list-item,
+    .k-time-list .k-item {
+        padding: $time-list-item-padding-y $time-list-item-padding-x;
     }
 
+
+    // Time separator
     .k-time-separator {
         width: 0;
-        height: 100%;
-        display: inline-flex;
+        height: $time-list-highlight-height;
         align-self: center;
+        display: inline-flex;
         justify-content: center;
+        align-items: center;
+        position: relative;
         z-index: 11;
+        top: calc( #{$time-list-title-height / 2} );
     }
+
 }

package/scss/{datetime → timeselector}/_theme.scss

@@ -1,21 +1,29 @@
-@include exports("datetime/theme") {
+@include exports( "timeselector/theme" ) {
+
+    // Time selector
+    .k-timeselector {
+        @include fill(
+            $time-selector-text,
+            $time-selector-bg,
+            $time-selector-border
+        );
+    }
 
-    // Timepicker header
-    .k-time-header {
+
+    // Time selector header
+    .k-time-header,
+    .k-time-selector-header {
 
         .k-time-now {
             color: $link-text;
-            background: transparent;
-
-            &:hover,
-            &:focus {
-                color: $link-hover-text;
-            }
+        }
+        .k-time-now:hover {
+            color: $link-hover-text;
         }
     }
 
 
-    // Timepicker content
+    // Time list wrapper
     .k-time-list-wrapper {
 
         .k-title {
@@ -34,11 +42,13 @@
         }
     }
 
+
+    // Time list
     .k-time-list {
         &::before,
         &::after {
             $shadow-size: 3em;
-            box-shadow: 0 0 $shadow-size ($shadow-size / 2) $popup-bg;
+            box-shadow: 0 0 $shadow-size ($shadow-size / 2) $time-selector-bg;
         }
 
         .k-item:hover {
@@ -57,14 +67,4 @@
         );
     }
 
-    .k-datetime-container {
-        .k-date-tab {
-
-            .k-datetime-buttongroup,
-            .k-datetime-selector {
-                background-color: $component-bg;
-            }
-        }
-    }
-
 }

package/scss/timeselector/_variables.scss

@@ -0,0 +1,32 @@
+// Time selector
+$time-selector-border-width: 1px !default;
+$time-selector-font-family: $font-family !default;
+$time-selector-font-size: $font-size !default;
+$time-selector-line-height: $line-height !default;
+
+$time-selector-bg: $component-bg !default;
+$time-selector-text: $component-text !default;
+$time-selector-border: $component-border !default;
+
+$time-selector-header-padding-x: map-get( $spacing, 1 ) !default;
+$time-selector-header-padding-y: map-get( $spacing, 1 ) !default;
+$time-selector-header-border-width: 0px !default;
+
+$time-list-width: 4em !default;
+$time-list-height: 240px !default;
+
+$time-list-title-font-size: $font-size-sm !default;
+$time-list-title-line-height: 1.5 !default;
+$time-list-title-height: ( $time-list-title-font-size * $time-list-title-line-height) !default;
+$time-list-title-text: $subtle-text !default;
+$time-list-title-focus-text: $component-text !default;
+
+$time-list-item-padding-x: $kendo-list-item-padding-x-md !default;
+$time-list-item-padding-y: $kendo-list-item-padding-y-md !default;
+
+$time-list-highlight-border-width: 1px 0px !default;
+$time-list-highlight-height: calc( #{$time-selector-font-size * $time-selector-line-height} + #{ $time-list-item-padding-y * 2} ) !default;
+$time-list-highlight-bg: $component-bg !default;
+$time-list-highlight-border: $component-border !default;
+
+$time-list-focused-bg: rgba(0, 0, 0, .04) !default;

package/scss/treeview/_layout.scss

@@ -2,14 +2,12 @@
 
     // Base
     .k-treeview {
-        padding: $treeview-padding-y $treeview-padding-x;
+        padding: $kendo-treeview-padding-y $kendo-treeview-padding-x;
         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;
         display: block;
         cursor: default;
         overflow: auto;
@@ -17,15 +15,15 @@
         -webkit-touch-callout: none;
         -webkit-tap-highlight-color: $rgba-transparent;
 
-        > .k-group {
+        > .k-treeview-group {
             outline: 0;
             -webkit-touch-callout: none;
             -webkit-tap-highlight-color: $rgba-transparent;
         }
 
         .k-content,
-        > .k-group,
-        .k-item > .k-group {
+        > .k-treeview-group,
+        .k-treeview-item > .k-treeview-group {
             margin: 0;
             padding: 0;
             background: none;
@@ -38,9 +36,9 @@
         }
 
         // Wrappers
-        .k-top,
-        .k-mid,
-        .k-bot {
+        .k-treeview-top,
+        .k-treeview-mid,
+        .k-treeview-bot {
             display: flex;
             flex-direction: row;
             align-items: center;
@@ -48,20 +46,19 @@
         }
 
         // Items
-        .k-item {
+        .k-treeview-item {
             outline-style: none;
             margin: 0;
-            padding: 0 0 0 $treeview-indent;
+            padding: 0 0 0 $kendo-treeview-indent;
             border-width: 0;
             display: block;
         }
 
         // Link
-        .k-in {
-            @include border-radius( $treeview-item-border-radius );
+        .k-treeview-leaf {
+            @include border-radius( $kendo-treeview-item-border-radius );
             margin: 0;
-            padding: $treeview-item-padding-y $treeview-item-padding-x;
-            border: $treeview-item-border-width solid transparent;
+            border: $kendo-treeview-item-border-width solid transparent;
             text-decoration: none;
             display: inline-flex;
             align-items: center;
@@ -69,7 +66,7 @@
             vertical-align: middle;
             position: relative;
         }
-        .k-in.k-state-focused {
+        .k-treeview-leaf.k-state-focused {
             z-index: 1;
         }
 
@@ -85,18 +82,18 @@
             }
         }
         .k-treeview-load-more-checkboxes-container {
-            padding-left: $treeview-loadmore-checkboxes-padding-x;
+            padding-left: $kendo-treeview-loadmore-checkboxes-padding-x;
 
             .k-i-loading {
-                margin-left: $treeview-loadmore-checkboxes-icon-indent;
-                margin-right: $treeview-loadmore-checkboxes-icon-margin-x;
+                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: -$treeview-indent;
+            margin-left: -$kendo-treeview-indent;
             cursor: pointer;
 
             + .k-checkbox-wrapper {
@@ -118,30 +115,34 @@
         }
 
         // Other content
-        .k-in .k-icon,
-        .k-in .k-image,
-        .k-in .k-sprite {
+        .k-treeview-leaf .k-icon,
+        .k-treeview-leaf .k-image,
+        .k-treeview-leaf .k-sprite {
             margin-right: $icon-spacing;
         }
     }
 
+    .k-treeview-toggle {}
+
+    .k-treeview-leaf-text {}
+
     // RTL
     .k-rtl .k-treeview,
     .k-treeview[dir="rtl"] {
 
         // Items
-        .k-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;
+            padding-right: $kendo-treeview-loadmore-checkboxes-padding-x;
 
             .k-i-loading {
-                margin-left: $treeview-loadmore-checkboxes-icon-margin-x;
-                margin-right: $treeview-loadmore-checkboxes-icon-indent;
+                margin-left: $kendo-treeview-loadmore-checkboxes-icon-margin-x;
+                margin-right: $kendo-treeview-loadmore-checkboxes-icon-indent;
             }
         }
 
@@ -149,7 +150,7 @@
         .k-i-expand,
         .k-i-collapse {
             margin-left: 0;
-            margin-right: -$treeview-indent;
+            margin-right: -$kendo-treeview-indent;
 
             + .k-checkbox-wrapper {
                 margin-right: $icon-spacing;
@@ -163,12 +164,27 @@
         }
 
         // Other content
-        .k-in .k-icon,
-        .k-in .k-image,
-        .k-in .k-sprite {
+        .k-treeview-leaf .k-icon,
+        .k-treeview-leaf .k-image,
+        .k-treeview-leaf .k-sprite {
             margin-left: $icon-spacing;
             margin-right: 0;
         }
+    }
+
+    @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-x $_item-padding-y;
+            }
+        }
     }
 }