diff --git a/packages/core/scss/_variables.scss b/packages/core/scss/_variables.scss index 545751544b1..e5f9f1e9e9c 100644 --- a/packages/core/scss/_variables.scss +++ b/packages/core/scss/_variables.scss @@ -5,7 +5,7 @@ $kendo-enable-shadows: true !default; $kendo-enable-rounded: true !default; $kendo-enable-gradients: true !default; $kendo-enable-transitions: true !default; -$kendo-nested-disabled: false !default; +$kendo-nested-disabled: true !default; $kendo-enable-focus-contrast: false !default; // Equilateral triangle variables diff --git a/packages/core/scss/styles/_selection.scss b/packages/core/scss/styles/_selection.scss index ff3a01a8393..d985d28c183 100644 --- a/packages/core/scss/styles/_selection.scss +++ b/packages/core/scss/styles/_selection.scss @@ -1,4 +1,5 @@ @use "../color-system/_swatch-legacy.scss" as *; +@use "../color-system/_functions.import" as *; @use "../_variables.scss" as *; @mixin kendo-core--styles--selection() { diff --git a/packages/default/scss/adaptive/_variables.scss b/packages/default/scss/adaptive/_variables.scss index abfd7466329..6b4a1604b5c 100644 --- a/packages/default/scss/adaptive/_variables.scss +++ b/packages/default/scss/adaptive/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Adaptive $kendo-adaptive-bg: $kendo-component-bg !default; diff --git a/packages/default/scss/appbar/_theme.scss b/packages/default/scss/appbar/_theme.scss index 95ac230a69f..2569eb10d22 100644 --- a/packages/default/scss/appbar/_theme.scss +++ b/packages/default/scss/appbar/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-appbar--theme-base() { diff --git a/packages/default/scss/appbar/_variables.scss b/packages/default/scss/appbar/_variables.scss index 565477baf93..5c6fd64b4dd 100644 --- a/packages/default/scss/appbar/_variables.scss +++ b/packages/default/scss/appbar/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // AppBar diff --git a/packages/default/scss/avatar/_theme.scss b/packages/default/scss/avatar/_theme.scss index 7a2b1bffe15..db1a71ba021 100644 --- a/packages/default/scss/avatar/_theme.scss +++ b/packages/default/scss/avatar/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./_variables.scss" as *; @mixin kendo-avatar--theme-base() { diff --git a/packages/default/scss/badge/_theme.scss b/packages/default/scss/badge/_theme.scss index f6c9b6f4bc6..b4fed23c4d4 100644 --- a/packages/default/scss/badge/_theme.scss +++ b/packages/default/scss/badge/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @mixin kendo-badge--theme-base() { diff --git a/packages/default/scss/button/_theme.scss b/packages/default/scss/button/_theme.scss index a44ddd4d9fd..951ba5f10b2 100644 --- a/packages/default/scss/button/_theme.scss +++ b/packages/default/scss/button/_theme.scss @@ -160,9 +160,9 @@ &.k-hover { @if $name == "base" { @include fill( - if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )) + if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color ) ), + if($kendo-enable-color-system, k-color( on-base ), $color ), + if($kendo-enable-color-system, k-color( on-base ), $color ) ); } @else { @include fill( @@ -191,8 +191,8 @@ @if $name == "base" { @include fill( if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )) + if($kendo-enable-color-system, k-color( on-base ), $color ), + if($kendo-enable-color-system, k-color( on-base ), $color ) ); } @else { @include fill( @@ -208,8 +208,8 @@ @if $name == "base" { @include fill( if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )), - if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )) + if($kendo-enable-color-system, k-color( on-base ), $color ), + if($kendo-enable-color-system, k-color( on-base ), $color ) ); } @else { @include fill( diff --git a/packages/default/scss/button/_variables.scss b/packages/default/scss/button/_variables.scss index 88a7c8c7eaa..f5bc19d64ae 100644 --- a/packages/default/scss/button/_variables.scss +++ b/packages/default/scss/button/_variables.scss @@ -1,5 +1,7 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; + // Button /// The width of the border around the Button. diff --git a/packages/default/scss/card/_theme.scss b/packages/default/scss/card/_theme.scss index 659101deb03..ffcf64f16bf 100644 --- a/packages/default/scss/card/_theme.scss +++ b/packages/default/scss/card/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-card--theme-base() { diff --git a/packages/default/scss/chart-wizard/_variables.scss b/packages/default/scss/chart-wizard/_variables.scss index 379bd2363a3..becd97770c2 100644 --- a/packages/default/scss/chart-wizard/_variables.scss +++ b/packages/default/scss/chart-wizard/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Chart wizard diff --git a/packages/default/scss/chat/_variables.scss b/packages/default/scss/chat/_variables.scss index 12e86db7731..cd869ba2061 100644 --- a/packages/default/scss/chat/_variables.scss +++ b/packages/default/scss/chat/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../toolbar/_variables.scss" as *; // Chat diff --git a/packages/default/scss/chip/_variables.scss b/packages/default/scss/chip/_variables.scss index 30a4783c824..c20fa040090 100644 --- a/packages/default/scss/chip/_variables.scss +++ b/packages/default/scss/chip/_variables.scss @@ -1,5 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../button/_variables.scss" as *; diff --git a/packages/default/scss/dialog/_theme.scss b/packages/default/scss/dialog/_theme.scss index 7ea8246a3b4..9287b48e0b1 100644 --- a/packages/default/scss/dialog/_theme.scss +++ b/packages/default/scss/dialog/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-dialog--theme-base() { diff --git a/packages/default/scss/dropzone/_variables.scss b/packages/default/scss/dropzone/_variables.scss index 50a370b4564..56e22acf363 100644 --- a/packages/default/scss/dropzone/_variables.scss +++ b/packages/default/scss/dropzone/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // DropZone diff --git a/packages/default/scss/editor/_variables.scss b/packages/default/scss/editor/_variables.scss index 66508fb9439..b390bf31ce1 100644 --- a/packages/default/scss/editor/_variables.scss +++ b/packages/default/scss/editor/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../input/_variables.scss" as *; // Editor diff --git a/packages/default/scss/fab/_theme.scss b/packages/default/scss/fab/_theme.scss index 9308827f57d..05beff51d20 100644 --- a/packages/default/scss/fab/_theme.scss +++ b/packages/default/scss/fab/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-fab--theme-base() { diff --git a/packages/default/scss/index.scss b/packages/default/scss/index.scss index 1787326db0e..d6e3cee6a49 100644 --- a/packages/default/scss/index.scss +++ b/packages/default/scss/index.scss @@ -19,6 +19,7 @@ @forward "./ripple/_index.scss"; @forward "./table/_index.scss"; @forward "./virtual-scroller/_index.scss"; +@forward "./no-data/_index.scss"; // Indicators @@ -183,6 +184,7 @@ @use "./ripple/_index.scss" as *; @use "./table/_index.scss" as *; @use "./virtual-scroller/_index.scss" as *; +@use "./no-data/_index.scss" as *; // Indicators @@ -347,14 +349,15 @@ // Primitive components @include kendo-draggable--styles(); - @include kendo-action-buttons--styles(); @include kendo-list--styles(); @include kendo-listgroup--styles(); + @include kendo-action-buttons--styles(); @include kendo-overlay--styles(); @include kendo-popup--styles(); @include kendo-ripple--styles(); @include kendo-table--styles(); @include kendo-virtual-scroller--styles(); + @include kendo-no-data--styles(); // Indicators diff --git a/packages/default/scss/input/_variables.scss b/packages/default/scss/input/_variables.scss index 705ec813999..8ead3a8d25f 100644 --- a/packages/default/scss/input/_variables.scss +++ b/packages/default/scss/input/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../button/_variables.scss" as *; // Input diff --git a/packages/default/scss/list/_theme.scss b/packages/default/scss/list/_theme.scss index 2412861c7ee..dcc191e5b03 100644 --- a/packages/default/scss/list/_theme.scss +++ b/packages/default/scss/list/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./_variables.scss" as *; @mixin kendo-list--theme-base() { diff --git a/packages/default/scss/messagebox/_theme.scss b/packages/default/scss/messagebox/_theme.scss index 5df3ed423a0..090220c43f0 100644 --- a/packages/default/scss/messagebox/_theme.scss +++ b/packages/default/scss/messagebox/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./_variables.scss" as *; @mixin kendo-messagebox--theme-base() { diff --git a/packages/default/scss/no-data/_index.scss b/packages/default/scss/no-data/_index.scss index 6316443493b..a61c850484e 100644 --- a/packages/default/scss/no-data/_index.scss +++ b/packages/default/scss/no-data/_index.scss @@ -1,32 +1,17 @@ -@import "../core/_index.scss"; - - -// Module meta -$_kendo-module-meta: ( - name: "no-data", - dependencies: () -); +// Component +@forward "./_variables.scss"; +@use "./_layout.scss" as *; +@use "./_theme.scss" as *; // Dependencies +@use "../core/_index.scss" as *; -// Component -@import "./_variables.scss"; -@import "./_layout.scss"; -@import "./_theme.scss"; - -// Register -@import "../core/module-system/index.import.scss"; -@include module-register( $_kendo-module-meta... ); - // Expose @mixin kendo-no-data--styles() { - @include module-render( "no-data" ) { + @include import-once( "no-data" ) { + @include core-styles(); @include kendo-no-data--layout(); @include kendo-no-data--theme(); } } - -@if $kendo-auto-bootstrap { - @include kendo-no-data--styles(); -} diff --git a/packages/default/scss/no-data/_layout.scss b/packages/default/scss/no-data/_layout.scss index c0b0b7c562b..1d9a4e3c349 100644 --- a/packages/default/scss/no-data/_layout.scss +++ b/packages/default/scss/no-data/_layout.scss @@ -1,3 +1,5 @@ +@use "./variables.scss" as *; + @mixin kendo-no-data--layout-base() { .k-no-data { diff --git a/packages/default/scss/no-data/_theme.scss b/packages/default/scss/no-data/_theme.scss index 11a11c521f8..1b1dcdf85e3 100644 --- a/packages/default/scss/no-data/_theme.scss +++ b/packages/default/scss/no-data/_theme.scss @@ -1,3 +1,5 @@ +@use "./variables.scss" as *; + @mixin kendo-no-data--theme-base() { .k-no-data { diff --git a/packages/default/scss/no-data/_variables.scss b/packages/default/scss/no-data/_variables.scss index 4748b042c76..cd3fec182c3 100644 --- a/packages/default/scss/no-data/_variables.scss +++ b/packages/default/scss/no-data/_variables.scss @@ -1,3 +1,5 @@ +@use "../core/_index.scss" as *; + /// The minimum height of the 'No Data' text container. /// @group no-data $kendo-no-data-min-height: 140px !default; diff --git a/packages/default/scss/notification/_variables.scss b/packages/default/scss/notification/_variables.scss index 7f77ef10082..b631a01ffee 100644 --- a/packages/default/scss/notification/_variables.scss +++ b/packages/default/scss/notification/_variables.scss @@ -1,6 +1,7 @@ @use "sass:map"; @use "../core/_index.scss" as *; @use "../core/spacing/index.import.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../popup/_variables.scss" as *; // Notification diff --git a/packages/default/scss/panelbar/_variables.scss b/packages/default/scss/panelbar/_variables.scss index ccaf76f3c0e..814840f7a44 100644 --- a/packages/default/scss/panelbar/_variables.scss +++ b/packages/default/scss/panelbar/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../list/_variables.scss" as *; // Panelbar diff --git a/packages/default/scss/pivotgrid/_variables.scss b/packages/default/scss/pivotgrid/_variables.scss index 8e51ec500d6..97e6de88381 100644 --- a/packages/default/scss/pivotgrid/_variables.scss +++ b/packages/default/scss/pivotgrid/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../table/_variables.scss" as *; @use "../list/_variables.scss" as *; @use "../grid/_variables.scss" as *; diff --git a/packages/default/scss/progressbar/_theme.scss b/packages/default/scss/progressbar/_theme.scss index 6ef106e79c1..4e7bf2125e8 100644 --- a/packages/default/scss/progressbar/_theme.scss +++ b/packages/default/scss/progressbar/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-progressbar--theme-base() { diff --git a/packages/default/scss/progressbar/_variables.scss b/packages/default/scss/progressbar/_variables.scss index c748802ee6b..074d5831408 100644 --- a/packages/default/scss/progressbar/_variables.scss +++ b/packages/default/scss/progressbar/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // ProgressBar diff --git a/packages/default/scss/scheduler/_theme.scss b/packages/default/scss/scheduler/_theme.scss index 188e29cc1fc..9972b603b30 100644 --- a/packages/default/scss/scheduler/_theme.scss +++ b/packages/default/scss/scheduler/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-scheduler--theme-base() { diff --git a/packages/default/scss/scheduler/_variables.scss b/packages/default/scss/scheduler/_variables.scss index 1123a004b50..e1525251826 100644 --- a/packages/default/scss/scheduler/_variables.scss +++ b/packages/default/scss/scheduler/_variables.scss @@ -1,6 +1,7 @@ @use "sass:math"; @use "../core/_index.scss" as *; @use "../core/spacing/index.import.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../toolbar/_variables.scss" as *; @use "../calendar/_variables.scss" as *; diff --git a/packages/default/scss/slider/_variables.scss b/packages/default/scss/slider/_variables.scss index 0971c2e8462..fbcb7cc665a 100644 --- a/packages/default/scss/slider/_variables.scss +++ b/packages/default/scss/slider/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Slider /// The default size of the Slider. diff --git a/packages/default/scss/splitter/_variables.scss b/packages/default/scss/splitter/_variables.scss index 235f8e86ce7..9ed54edfe13 100644 --- a/packages/default/scss/splitter/_variables.scss +++ b/packages/default/scss/splitter/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Splitter diff --git a/packages/default/scss/stepper/_variables.scss b/packages/default/scss/stepper/_variables.scss index e85a687888d..95d9346b1d6 100644 --- a/packages/default/scss/stepper/_variables.scss +++ b/packages/default/scss/stepper/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Stepper diff --git a/packages/default/scss/switch/_variables.scss b/packages/default/scss/switch/_variables.scss index 465645d0eec..7c86d5f1f03 100644 --- a/packages/default/scss/switch/_variables.scss +++ b/packages/default/scss/switch/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; // Switch diff --git a/packages/default/scss/taskboard/_variables.scss b/packages/default/scss/taskboard/_variables.scss index d7675d85026..154b5fdb878 100644 --- a/packages/default/scss/taskboard/_variables.scss +++ b/packages/default/scss/taskboard/_variables.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../card/_variables.scss" as *; // TaskBoard diff --git a/packages/default/scss/timeline/_variables.scss b/packages/default/scss/timeline/_variables.scss index 46f6296d36e..8378af51f39 100644 --- a/packages/default/scss/timeline/_variables.scss +++ b/packages/default/scss/timeline/_variables.scss @@ -1,5 +1,6 @@ @use "../core/_index.scss" as *; @use "../core/spacing/index.import.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "../button/_variables.scss" as *; @use "../card/_variables.scss" as *; diff --git a/packages/default/scss/window/_theme.scss b/packages/default/scss/window/_theme.scss index b258093dc29..4c7c061021f 100644 --- a/packages/default/scss/window/_theme.scss +++ b/packages/default/scss/window/_theme.scss @@ -1,4 +1,5 @@ @use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; @use "./variables.scss" as *; @mixin kendo-window--theme-base() {