@progress/kendo-theme-fluent 11.2.1-dev.1 → 11.3.0-dev.0

package/scss/toolbar/_theme.scss

@@ -1,178 +1,14 @@
 @use "../core/_index.scss" as *;
 @use "./_variables.scss" as *;
+@use "@progress/kendo-theme-core/scss/components/toolbar/_theme.scss" as *;
 
 @mixin kendo-toolbar--theme() {
+    @include kendo-toolbar--theme-base();
 
-    // Theme
     .k-toolbar {
-
-        // Template item
         .k-toolbar-item:focus,
         .k-toolbar-item.k-focus {
-            outline-color: var( --kendo-toolbar-item-focus-outline-color, #{$kendo-toolbar-item-focus-outline-color} );
-        }
-
-    }
-
-    // Separator
-    .k-toolbar .k-separator,
-    .k-toolbar-separator {
-        border-color: var( --kendo-toolbar-separator-border, #{$kendo-toolbar-separator-border} );
-    }
-
-    .k-toolbar-items {
-        border-color: inherit;
-    }
-
-    // Solid Toolbar
-    .k-toolbar-solid {
-        @include fill (
-            var( --kendo-toolbar-text, #{$kendo-toolbar-text} ),
-            var( --kendo-toolbar-bg, #{$kendo-toolbar-bg} ),
-            var( --kendo-toolbar-border, #{$kendo-toolbar-border} )
-        );
-
-        &.k-toolbar-scrollable-overlay {
-            &::before {
-                background: linear-gradient(90deg, var( --kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay} ));
-            }
-
-            &::after {
-                background: linear-gradient(270deg, var( --kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay} ));
-            }
-        }
-    }
-
-    .k-toolbar-items-list-solid {
-        border-color:  var( --kendo-toolbar-border, #{$kendo-toolbar-border} );
-    }
-
-    // Outline Toolbar
-    .k-toolbar-outline {
-        @include fill (
-            $color: var( --kendo-toolbar-outline-text, #{$kendo-toolbar-outline-text} ),
-            $border: var( --kendo-toolbar-outline-border, #{$kendo-toolbar-outline-border} )
-        );
-
-        &.k-toolbar-scrollable-overlay {
-            &::before {
-                background: linear-gradient(90deg, var( --kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay} ));
-            }
-
-            &::after {
-                background: linear-gradient(270deg, var( --kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay} ));
-            }
-        }
-    }
-
-    .k-toolbar-items-list-outline {
-        border-color:  var( --kendo-toolbar-outline-border, #{$kendo-toolbar-outline-border} );
-    }
-
-    // Flat Toolbar
-    .k-toolbar-flat {
-        @include fill (
-            $color: var( --kendo-toolbar-flat-text, #{$kendo-toolbar-flat-text} ),
-            $border: var( --kendo-toolbar-flat-border, #{$kendo-toolbar-flat-border} )
-        );
-
-        > .k-separator,
-        .k-toolbar-separator {
-            border-inline-color: var( --kendo-toolbar-flat-border, #{$kendo-toolbar-flat-border} );
-        }
-
-        &.k-toolbar-scrollable-overlay {
-            &::before {
-                background: linear-gradient(90deg, var( --kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay} ));
-            }
-
-            &::after {
-                background: linear-gradient(270deg, var( --kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay} ));
-            }
-        }
-    }
-
-    .k-toolbar-items-list-flat {
-        border-color:  var( --kendo-toolbar-flat-border, #{$kendo-toolbar-flat-border} );
-    }
-
-    // stylelint-disable selector-class-pattern
-    .k-floating-toolbar,
-    .editorToolbarWindow.k-window-content {
-        color: var( --kendo-toolbar-text, #{$kendo-toolbar-text} );
-        background-color: var( --kendo-toolbar-bg, #{$kendo-toolbar-bg} );
-        border-color: var( --kendo-toolbar-border, #{$kendo-toolbar-border} );
-    }
-    // stylelint-enable selector-class-pattern
-
-    // Remove once the Overflow Popup uses
-    // the proper Menu rendering in all suites.
-    .k-overflow-container {
-
-        .k-button {
-
-            // Hover state
-            &:hover,
-            &.k-hover {
-                color: var( --kendo-menu-popup-item-hover-text, initial );
-                background: var( --kendo-menu-popup-item-hover-bg, initial );
-            }
-
-            // Button focus state
-            &:focus,
-            &.k-focus {
-                box-shadow: var( --kendo-menu-popup-item-focus-shadow, initial );
-            }
-
-            // Active state
-            &:active,
-            &.k-active {
-                color: var( --kendo-menu-popup-item-hover-text, initial );
-                background: var( --kendo-menu-popup-item-hover-bg, initial );
-            }
-
-            // Selected
-            &.k-selected {
-                color: var( --kendo-menu-popup-item-expanded-text, initial );
-                background: var( --kendo-menu-popup-item-expanded-bg, initial );
-            }
-
-            // Disabled state
-            &:disabled,
-            &.k-disabled {
-                color: inherit;
-            }
-        }
-    }
-
-    // RTL
-    :is(.k-rtl .k-toolbar-scrollable-overlay, [dir="rtl"] .k-toolbar-scrollable-overlay, .k-toolbar-scrollable-overlay.k-rtl, .k-toolbar-scrollable-overlay[dir="rtl"] ) {
-        &::before {
-            background: linear-gradient(270deg, var(--kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay}));
-        }
-
-        &::after {
-            background: linear-gradient(90deg, var(--kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay}));
-        }
-
-        &.k-toolbar-outline {
-            &::before {
-                background: linear-gradient(270deg, var(--kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay}));
-            }
-
-            &::after {
-                background: linear-gradient(90deg, var(--kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay}));
-            }
-        }
-
-        &.k-toolbar-flat {
-            &::before {
-                background: linear-gradient(270deg, var(--kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay}));
-            }
-
-            &::after {
-                background: linear-gradient(90deg, var(--kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay}));
-            }
+            outline-color: $kendo-toolbar-item-focus-outline-color;
         }
     }
 

package/scss/toolbar/_variables.scss

@@ -4,114 +4,114 @@
 
 /// The horizontal padding of the small Toolbar.
 /// @group toolbar
-$kendo-toolbar-sm-padding-x: k-spacing(1) !default;
+$kendo-toolbar-sm-padding-x: var( --kendo-toolbar-sm-padding-x, #{k-spacing(1)} ) !default;
 /// The horizontal padding of the medium Toolbar.
 /// @group toolbar
-$kendo-toolbar-md-padding-x: k-spacing(2) !default;
+$kendo-toolbar-md-padding-x: var( --kendo-toolbar-md-padding-x, #{k-spacing(2)} ) !default;
 /// The horizontal padding of the large Toolbar.
 /// @group toolbar
-$kendo-toolbar-lg-padding-x: k-spacing(2.5) !default;
+$kendo-toolbar-lg-padding-x: var( --kendo-toolbar-lg-padding-x, #{k-spacing(2.5)} ) !default;
 
 /// The vertical padding of the small Toolbar.
 /// @group toolbar
-$kendo-toolbar-sm-padding-y: k-spacing(1) !default;
+$kendo-toolbar-sm-padding-y: var( --kendo-toolbar-sm-padding-y, #{k-spacing(1)} ) !default;
 /// The vertical padding of the medium Toolbar.
 /// @group toolbar
-$kendo-toolbar-md-padding-y: k-spacing(2) !default;
+$kendo-toolbar-md-padding-y: var( --kendo-toolbar-md-padding-y, #{k-spacing(2)} ) !default;
 /// The vertical padding of the large Toolbar.
 /// @group toolbar
-$kendo-toolbar-lg-padding-y: k-spacing(2.5) !default;
+$kendo-toolbar-lg-padding-y: var( --kendo-toolbar-lg-padding-y, #{k-spacing(2.5)} ) !default;
 
 /// The spacing between the tools of the small Toolbar.
 /// @group toolbar
-$kendo-toolbar-sm-spacing: k-spacing(2) !default;
+$kendo-toolbar-sm-spacing: var( --kendo-toolbar-sm-spacing, #{k-spacing(2)} ) !default;
 /// The spacing between the tools of the medium Toolbar.
 /// @group toolbar
-$kendo-toolbar-md-spacing: k-spacing(2) !default;
+$kendo-toolbar-md-spacing: var( --kendo-toolbar-md-spacing, #{k-spacing(2)} ) !default;
 /// The spacing between the tools of the large Toolbar.
 /// @group toolbar
-$kendo-toolbar-lg-spacing: k-spacing(2) !default;
+$kendo-toolbar-lg-spacing: var( --kendo-toolbar-lg-spacing, #{k-spacing(2)} ) !default;
 
 /// The height of the small Toolbar button separator.
 /// @group toolbar
-$kendo-toolbar-sm-separator-height: $kendo-button-sm-calc-size !default;
+$kendo-toolbar-sm-separator-height: var( --kendo-toolbar-sm-separator-height, #{$kendo-button-sm-calc-size} ) !default;
 /// The height of the medium Toolbar button separator.
 /// @group toolbar
-$kendo-toolbar-md-separator-height: $kendo-button-md-calc-size !default;
+$kendo-toolbar-md-separator-height: var( --kendo-toolbar-md-separator-height, #{$kendo-button-md-calc-size} ) !default;
 /// The height of the large Toolbar button separator.
 /// @group toolbar
-$kendo-toolbar-lg-separator-height: $kendo-button-lg-calc-size !default;
+$kendo-toolbar-lg-separator-height: var( --kendo-toolbar-lg-separator-height, #{$kendo-button-lg-calc-size} ) !default;
 
 /// The width of the border around the Toolbar.
 /// @group toolbar
-$kendo-toolbar-border-width: 1px !default;
+$kendo-toolbar-border-width: var( --kendo-toolbar-border-width, 1px ) !default;
 
 /// The font family of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-font-family: var( --kendo-font-family, inherit ) !default;
+$kendo-toolbar-font-family: var( --kendo-toolbar-font-family, var( --kendo-font-family, inherit ) ) !default;
 /// The font size of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-font-size: var( --kendo-font-size, inherit ) !default;
+$kendo-toolbar-font-size: var( --kendo-toolbar-font-size, var( --kendo-font-size, inherit ) ) !default;
 /// The line height of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-line-height: var( --kendo-line-height, normal ) !default;
+$kendo-toolbar-line-height: var( --kendo-toolbar-line-height, var( --kendo-line-height, normal ) ) !default;
 
 /// The background color of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-bg: k-color(surface) !default;
+$kendo-toolbar-bg: var( --kendo-toolbar-bg, #{k-color(surface)} ) !default;
 /// The text color of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-text: k-color(on-app-surface) !default;
+$kendo-toolbar-text: var( --kendo-toolbar-text, #{k-color(on-app-surface)} ) !default;
 /// The color of the border around the Toolbar.
 /// @group toolbar
-$kendo-toolbar-border: color-mix(in srgb, k-color(border) 16%, transparent) !default;
+$kendo-toolbar-border: var( --kendo-toolbar-border, #{color-mix(in srgb, k-color(border) 16%, transparent)} ) !default;
 /// The left and right scroll overlay of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-scroll-overlay: $kendo-toolbar-bg, color-mix(in srgb, k-color(app-surface) 0%, transparent) !default;
+$kendo-toolbar-scroll-overlay: var( --kendo-toolbar-scroll-overlay, #{$kendo-toolbar-bg, color-mix(in srgb, k-color(app-surface) 0%, transparent)} ) !default;
 
 
 /// The text color of the outline Toolbar.
 /// @group toolbar
-$kendo-toolbar-outline-text: null !default;
+$kendo-toolbar-outline-text: var( --kendo-toolbar-outline-text, null ) !default;
 /// The color of the border around the outline Toolbar.
 /// @group toolbar
-$kendo-toolbar-outline-border: k-color(border) !default;
+$kendo-toolbar-outline-border: var( --kendo-toolbar-outline-border, #{k-color(border)} ) !default;
 /// The width of the border around the outline Toolbar.
 /// @group toolbar
-$kendo-toolbar-outline-border-width: $kendo-toolbar-border-width !default;
+$kendo-toolbar-outline-border-width: var( --kendo-toolbar-outline-border-width, #{$kendo-toolbar-border-width} ) !default;
 /// The left and right scroll overlay of the outline Toolbar.
 /// @group toolbar
-$kendo-toolbar-outline-scroll-overlay: k-color(app-surface), color-mix(in srgb, k-color(app-surface) 0%, transparent) !default;
+$kendo-toolbar-outline-scroll-overlay: var( --kendo-toolbar-outline-scroll-overlay, #{k-color(app-surface), color-mix(in srgb, k-color(app-surface) 0%, transparent)} ) !default;
 
 
 /// The text color of the flat Toolbar.
 /// @group toolbar
-$kendo-toolbar-flat-text: null !default;
+$kendo-toolbar-flat-text: var( --kendo-toolbar-flat-text, null ) !default;
 /// The color of the border around the flat Toolbar.
 /// @group toolbar
-$kendo-toolbar-flat-border: $kendo-toolbar-border !default;
+$kendo-toolbar-flat-border: var( --kendo-toolbar-flat-border, #{$kendo-toolbar-border} ) !default;
 /// The left and right scroll overlay of the flat Toolbar.
 /// @group toolbar
-$kendo-toolbar-flat-scroll-overlay: k-color(app-surface), color-mix(in srgb, k-color(app-surface) 0%, transparent) !default;
+$kendo-toolbar-flat-scroll-overlay: var( --kendo-toolbar-flat-scroll-overlay, #{k-color(app-surface), color-mix(in srgb, k-color(app-surface) 0%, transparent)} ) !default;
 
 
 /// The color of the separator border of the Toolbar.
 /// @group toolbar
-$kendo-toolbar-separator-border: inherit !default;
+$kendo-toolbar-separator-border: var( --kendo-toolbar-separator-border, inherit ) !default;
 
 /// The width of the input in the Toolbar.
 /// @group toolbar
-$kendo-toolbar-input-width: 10em !default;
+$kendo-toolbar-input-width: var( --kendo-toolbar-input-width, 10em ) !default;
 
 /// The border width of the focused Toolbar item.
 /// @group toolbar
-$kendo-toolbar-item-focus-outline-width: 1px !default;
+$kendo-toolbar-item-focus-outline-width: var( --kendo-toolbar-item-focus-outline-width, 1px ) !default;
 /// The border style of the focused Toolbar item.
 /// @group toolbar
-$kendo-toolbar-item-focus-outline-style: solid !default;
+$kendo-toolbar-item-focus-outline-style: var( --kendo-toolbar-item-focus-outline-style, solid ) !default;
 /// The border color of the focused Toolbar item.
 /// @group toolbar
-$kendo-toolbar-item-focus-outline-color: k-color(base-emphasis) !default;
+$kendo-toolbar-item-focus-outline-color: var( --kendo-toolbar-item-focus-outline-color, #{k-color(base-emphasis)} ) !default;
 
 /// The sizes map for the Toolbar.
 /// @group toolbar
@@ -135,3 +135,36 @@ $kendo-toolbar-sizes: (
         separator-height: $kendo-toolbar-lg-separator-height
     )
 ) !default;
+
+@forward "@progress/kendo-theme-core/scss/components/toolbar/_variables.scss" with (
+    $kendo-toolbar-sm-padding-x: $kendo-toolbar-sm-padding-x,
+    $kendo-toolbar-md-padding-x: $kendo-toolbar-md-padding-x,
+    $kendo-toolbar-lg-padding-x: $kendo-toolbar-lg-padding-x,
+    $kendo-toolbar-sm-padding-y: $kendo-toolbar-sm-padding-y,
+    $kendo-toolbar-md-padding-y: $kendo-toolbar-md-padding-y,
+    $kendo-toolbar-lg-padding-y: $kendo-toolbar-lg-padding-y,
+    $kendo-toolbar-sm-spacing: $kendo-toolbar-sm-spacing,
+    $kendo-toolbar-md-spacing: $kendo-toolbar-md-spacing,
+    $kendo-toolbar-lg-spacing: $kendo-toolbar-lg-spacing,
+    $kendo-toolbar-sm-separator-height: $kendo-toolbar-sm-separator-height,
+    $kendo-toolbar-md-separator-height: $kendo-toolbar-md-separator-height,
+    $kendo-toolbar-lg-separator-height: $kendo-toolbar-lg-separator-height,
+    $kendo-toolbar-border-width: $kendo-toolbar-border-width,
+    $kendo-toolbar-font-family: $kendo-toolbar-font-family,
+    $kendo-toolbar-font-size: $kendo-toolbar-font-size,
+    $kendo-toolbar-line-height: $kendo-toolbar-line-height,
+    $kendo-toolbar-bg: $kendo-toolbar-bg,
+    $kendo-toolbar-text: $kendo-toolbar-text,
+    $kendo-toolbar-border: $kendo-toolbar-border,
+    $kendo-toolbar-scroll-overlay: $kendo-toolbar-scroll-overlay,
+    $kendo-toolbar-outline-text: $kendo-toolbar-outline-text,
+    $kendo-toolbar-outline-border: $kendo-toolbar-outline-border,
+    $kendo-toolbar-outline-border-width: $kendo-toolbar-outline-border-width,
+    $kendo-toolbar-outline-scroll-overlay: $kendo-toolbar-outline-scroll-overlay,
+    $kendo-toolbar-flat-text: $kendo-toolbar-flat-text,
+    $kendo-toolbar-flat-border: $kendo-toolbar-flat-border,
+    $kendo-toolbar-flat-scroll-overlay: $kendo-toolbar-flat-scroll-overlay,
+    $kendo-toolbar-separator-border: $kendo-toolbar-separator-border,
+    $kendo-toolbar-input-width: $kendo-toolbar-input-width,
+    $kendo-toolbar-sizes: $kendo-toolbar-sizes
+);

package/scss/tooltip/_functions.scss

@@ -0,0 +1,17 @@
+@use "sass:map";
+@use "../core/_index.scss" as *;
+@use "../core/functions/index.import.scss" as *;
+
+@function tooltip-theme( $colors ) {
+    $_theme: ();
+
+    @each $name, $color in $colors {
+        $_theme: map.merge(( $name: (
+            color: k-color(on-#{$name}),
+            background-color: $color,
+            border: $color,
+        )), $_theme );
+    }
+
+    @return $_theme;
+}

package/scss/tooltip/_layout.scss

@@ -1,108 +1,47 @@
 @use "../core/_index.scss" as *;
 @use "./_variables.scss" as *;
+@use "@progress/kendo-theme-core/scss/components/tooltip/_layout.scss" as *;
 
 @mixin kendo-tooltip--layout() {
+    @include kendo-tooltip--layout-base();
 
     .k-tooltip {
-        @include border-radius( $kendo-tooltip-border-radius );
-        margin: 0;
-        padding-inline: var( --kendo-tooltip-padding-x, #{$kendo-tooltip-padding-x} );
-        padding-block: var( --kendo-tooltip-padding-y, #{$kendo-tooltip-padding-y} );
-        border-width: var( --kendo-tooltip-border-width, #{$kendo-tooltip-border-width} );
-        border-style: solid;
-        box-sizing: border-box;
-        background-repeat: repeat-x;
-        outline: 0;
-        font-family: var( --kendo-tooltip-font-family, #{$kendo-tooltip-font-family} );
-        font-size: var( --kendo-tooltip-font-size, #{$kendo-tooltip-font-size} );
-        line-height: var( --kendo-tooltip-line-height, #{$kendo-tooltip-line-height} );
-        display: flex;
-        flex-flow: row nowrap;
-        align-items: flex-start;
-        position: absolute;
-        z-index: 12000;
-        -webkit-touch-callout: none;
-        -webkit-tap-highlight-color: $kendo-color-rgba-transparent;
-
-        *,
-        *::before,
-        *::after {
-            box-sizing: border-box;
-        }
+        padding-inline: $kendo-tooltip-padding-x;
+        padding-block: $kendo-tooltip-padding-y;
+        border-width: $kendo-tooltip-border-width;
+        font-family: $kendo-tooltip-font-family;
+        font-size: $kendo-tooltip-font-size;
+        line-height: $kendo-tooltip-line-height;
     }
 
     .k-tooltip-icon {
-        margin-inline-end: var( --kendo-tooltip-icon-spacing, .5rem );
-        flex-shrink: 0;
+        margin-inline-end: .5rem;
     }
 
     .k-tooltip-title {
-        margin-block-end: var( --kendo-tooltip-title-margin, #{$kendo-tooltip-title-margin} );
-        font-size: var( --kendo-tooltip-title-font-size, #{$kendo-tooltip-title-font-size} );
-        line-height: var( --kendo-tooltip-title-line-height, #{$kendo-tooltip-title-line-height} );
-    }
-
-    .k-tooltip-content {
-        align-self: stretch;
-        flex: 1 1 auto;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        margin-block-end: $kendo-tooltip-title-margin;
+        font-size: $kendo-tooltip-title-font-size;
+        line-height: $kendo-tooltip-title-line-height;
     }
 
     .k-tooltip-button {
-        margin-inline-start: var( --kendo-tooltip-button-spacing, .5rem );
-        flex-shrink: 0;
-
-        .k-icon {
-            color: inherit;
-            vertical-align: top;
-        }
+        margin-inline-start: .5rem;
     }
 
-
-    // Callout
     .k-callout {
-        width: calc( #{$kendo-tooltip-callout-size} * 2 );
-        height: calc( #{$kendo-tooltip-callout-size} * 2 );
-        border-width: $kendo-tooltip-callout-size;
-        border-style: solid;
-        border-color: transparent;
-        position: absolute;
-        pointer-events: none;
         color: inherit;
     }
 
-    // TODO:
-    // Some implementations rely on margin + transform-rotate to position callout
-    // Remove margin tweaking and uncomment when their implementation is fixed.
-
     .k-callout-n {
         margin-inline-start: calc( #{$kendo-tooltip-callout-size} * -1 );
-        border-bottom-color: currentColor;
-        top: calc( calc( #{$kendo-tooltip-callout-size} * -1 ) * 2 );
-        left: 50%;
-        pointer-events: none;
     }
     .k-callout-e {
         margin-block-start: calc( #{$kendo-tooltip-callout-size} * -1 );
-        border-left-color: currentColor;
-        top: 50%;
-        right: calc( calc( #{$kendo-tooltip-callout-size} * -1 ) * 2 );
-        pointer-events: none;
     }
     .k-callout-s {
         margin-inline-start: calc( #{$kendo-tooltip-callout-size} * -1 );
-        border-top-color: currentColor;
-        bottom: calc( calc( #{$kendo-tooltip-callout-size} * -1 ) * 2);
-        left: 50%;
-        pointer-events: none;
     }
     .k-callout-w {
         margin-block-start: calc( #{$kendo-tooltip-callout-size} * -1 );
-        border-right-color: currentColor;
-        top: 50%;
-        left: calc( calc( #{$kendo-tooltip-callout-size} * -1 ) * 2);
-        pointer-events: none;
     }
-
 }

package/scss/tooltip/_theme.scss

@@ -1,34 +1,28 @@
 @use "sass:map";
 @use "../core/_index.scss" as *;
 @use "./_variables.scss" as *;
+@use "@progress/kendo-theme-core/scss/components/tooltip/_theme.scss" as *;
 
 @mixin kendo-tooltip--theme() {
-    .k-tooltip {
-        @include box-shadow( var( --kendo-tooltip-shadow, #{$kendo-tooltip-shadow} ) );
+    @include kendo-tooltip--theme-base();
 
-        color: var( --kendo-tooltip-text, #{$kendo-tooltip-text} );
-        background-color: var( --kendo-tooltip-bg, #{$kendo-tooltip-bg} );
-        border-color: var( --kendo-tooltip-border, #{$kendo-tooltip-border} );
-
-        .k-callout {
-            color: var( --kendo-tooltip-bg, #{$kendo-tooltip-bg} );
-        }
+    .k-tooltip-button {
+        color: $kendo-tooltip-button-text;
     }
 
-    @each $theme-color, $color-props in $kendo-tooltip-theme-colors {
-            $_bg: map.get( $color-props , bg );
-            $_text: map.get( $color-props , text );
-            $_border: map.get( $color-props , border );
-
-        .k-tooltip-#{$theme-color} {
-            --kendo-tooltip-text: #{$_text};
-            --kendo-tooltip-bg: #{$_bg};
-            --kendo-tooltip-border: #{$_border};
+    @each $name, $color in $kendo-tooltip-theme-colors {
+        @if($name == "primary" or $name == "dark" or $name == "light" or $name == "inverse") {
+            .k-tooltip-#{$name} {
+                color: k-color(on-#{$name});
+                background-color: k-color(#{$name});
+                border-color: k-color(#{$name});
+            }
+        } @else {
+            .k-tooltip-#{$name} {
+                color: k-color(#{$name}-on-subtle);
+                background-color: k-color(#{$name}-subtle);
+                border-color: k-color(#{$name}-subtle);
+            }
         }
     }
-
-    .k-tooltip-button {
-        color: var( --kendo-tooltip-button-text, #{$kendo-tooltip-button-text} );
-    }
-
 }