@progress/kendo-theme-bootstrap 5.12.1-dev.2 → 5.12.1-dev.4

package/scss/filter/_variables.scss

@@ -1,13 +1,13 @@
 // Filter expression builder
-$filter-padding-x: $kendo-padding-md-x !default;
-$filter-padding-y: $kendo-padding-md-y !default;
+$kendo-filter-padding-x: $kendo-padding-md-x !default;
+$kendo-filter-padding-y: $kendo-padding-md-y !default;
 
-$filter-bottom-margin: 2.1em !default;
-$filter-line-size: 1px !default;
+$kendo-filter-bottom-margin: 2.1em !default;
+$kendo-filter-line-size: 1px !default;
 
-$filter-operator-dropdown-width: 15em !default;
+$kendo-filter-operator-dropdown-width: 15em !default;
 
-$filter-preview-field-text: $kendo-color-primary !default;
-$filter-preview-operator-text: $kendo-subtle-text !default;
+$kendo-filter-preview-field-text: $kendo-color-primary !default;
+$kendo-filter-preview-operator-text: $kendo-subtle-text !default;
 
-$filter-toolbar-focus-shadow: 0 0 0 .25rem rgba( $kendo-color-primary, .25 ) !default;
+$kendo-filter-toolbar-focus-shadow: 0 0 0 .25rem rgba( $kendo-color-primary, .25 ) !default;

package/scss/floating-label/_variables.scss

@@ -1,19 +1,19 @@
 // Floating label
-$floating-label-scale: 1 !default;
-$floating-label-font-size: $kendo-input-font-size !default;
-$floating-label-line-height: $kendo-input-line-height !default;
-$floating-label-height: calc( #{$floating-label-line-height} * #{$floating-label-font-size} ) !default;
-$floating-label-offset-x: calc( #{$kendo-input-padding-x} + #{$kendo-input-border-width} ) !default;
-$floating-label-offset-y: calc( #{$floating-label-height} + #{$kendo-input-border-width} + #{$kendo-input-padding-y} ) !default;
+$kendo-floating-label-scale: 1 !default;
+$kendo-floating-label-font-size: $kendo-input-font-size !default;
+$kendo-floating-label-line-height: $kendo-input-line-height !default;
+$kendo-floating-label-height: calc( #{$kendo-floating-label-line-height} * #{$kendo-floating-label-font-size} ) !default;
+$kendo-floating-label-offset-x: calc( #{$kendo-input-padding-x} + #{$kendo-input-border-width} ) !default;
+$kendo-floating-label-offset-y: calc( #{$kendo-floating-label-height} + #{$kendo-input-border-width} + #{$kendo-input-padding-y} ) !default;
 
-$floating-label-focus-scale: 1 !default;
-$floating-label-focus-offset-x: 0 !default;
-$floating-label-focus-offset-y: 0 !default;
+$kendo-floating-label-focus-scale: 1 !default;
+$kendo-floating-label-focus-offset-x: 0 !default;
+$kendo-floating-label-focus-offset-y: 0 !default;
 
-$floating-label-transition: .2s ease-out !default;
+$kendo-floating-label-transition: .2s ease-out !default;
 
-$floating-label-bg: null !default;
-$floating-label-text: null !default;
+$kendo-floating-label-bg: null !default;
+$kendo-floating-label-text: null !default;
 
-$floating-label-focus-bg: null !default;
-$floating-label-focus-text: null !default;
+$kendo-floating-label-focus-bg: null !default;
+$kendo-floating-label-focus-text: null !default;

package/scss/forms/_layout.scss

@@ -6,9 +6,9 @@
     .k-form,
     .k-form-inline {
         legend {
-            font-size: $font-size * 1.5;
+            font-size: $kendo-font-size-md * 1.5;
             font-weight: normal;
-            line-height: $line-height;
+            line-height: $kendo-line-height-md;
             text-transform: none;
         }
 

package/scss/forms/_variables.scss

@@ -7,11 +7,11 @@
 // Forms
 $kendo-form-spacer: $kendo-padding-md-x * 2 !default;
 
-$kendo-form-font-size: $font-size !default;
+$kendo-form-font-size: $kendo-font-size-md !default;
 $kendo-form-line-height: $input-btn-line-height !default;
 $kendo-form-line-height-em: calc( #{$kendo-form-line-height} * 1em ) !default;
-$kendo-form-line-height-sm: $line-height-sm !default;
-$kendo-form-line-height-lg: $line-height-lg !default;
+$kendo-form-sm-line-height: $kendo-line-height-sm !default;
+$kendo-form-lg-line-height: $kendo-line-height-lg !default;
 
 $kendo-form-fieldset-margin: 2rem 0 0 !default;
 $kendo-form-fieldset-padding: 0px !default;
@@ -22,22 +22,22 @@ $kendo-form-legend-border-width: 0 0 2px !default;
 $kendo-form-legend-border-style: solid !default;
 $kendo-form-legend-border-color: $kendo-component-border !default;
 $kendo-form-legend-width: 100% !default;
-$kendo-form-legend-font-size: $font-size-sm !default;
+$kendo-form-legend-font-size: $kendo-font-size-sm !default;
 $kendo-form-legend-text-transform: uppercase !default;
 
 $kendo-form-label-margin-bottom: k-map-get( $kendo-spacing, 2 ) !default;
 
 $kendo-form-button-margin-x: 8px !default;
 
-$kendo-form-hint-font-size: $font-size-xs !default;
+$kendo-form-hint-font-size: $kendo-font-size-xs !default;
 $kendo-form-hint-font-style: normal !default;
 $kendo-form-hint-margin-top: 4px !default;
 
-$kendo-form-rows-spacing-sm: k-map-get( $kendo-spacing, 4 ) !default;
-$kendo-form-rows-spacing-md: $kendo-form-rows-spacing-sm !default;
-$kendo-form-rows-spacing-lg: $kendo-form-rows-spacing-sm !default;
+$kendo-form-sm-rows-spacing: k-map-get( $kendo-spacing, 4 ) !default;
+$kendo-form-md-rows-spacing: $kendo-form-sm-rows-spacing !default;
+$kendo-form-lg-rows-spacing: $kendo-form-sm-rows-spacing !default;
 
-$kendo-form-separator-margin: $kendo-form-rows-spacing-md 0 0 !default;
+$kendo-form-separator-margin: $kendo-form-md-rows-spacing 0 0 !default;
 $kendo-form-separator-border-color: $kendo-form-legend-border-color !default;
 
 $kendo-horizontal-form-label-padding-top: 5px !default;
@@ -54,13 +54,13 @@ $kendo-forms-invalid-color: $kendo-color-error !default;
 
 // Label
 $kendo-label-optional-margin-x: 6px !default;
-$kendo-label-optional-font-size: $font-size-xs !default;
+$kendo-label-optional-font-size: $kendo-font-size-xs !default;
 $kendo-label-optional-font-style: italic !default;
 
 
 // Fieldset
 $kendo-fieldset-margin: 30px !default;
-$kendo-fieldset-font-size: $h4-font-size !default;
+$kendo-fieldset-font-size: $kendo-h4-font-size !default;
 
 $kendo-fieldset-bg: null !default;
 $kendo-fieldset-text: null !default;
@@ -73,12 +73,12 @@ $kendo-fieldset-legend-border: null !default;
 // Sizes
 $kendo-form-sizes: (
     sm: (
-        form-rows-spacing: $kendo-form-rows-spacing-sm
+        form-rows-spacing: $kendo-form-sm-rows-spacing
     ),
     md: (
-        form-rows-spacing: $kendo-form-rows-spacing-md
+        form-rows-spacing: $kendo-form-md-rows-spacing
     ),
     lg: (
-        form-rows-spacing: $kendo-form-rows-spacing-lg
+        form-rows-spacing: $kendo-form-lg-rows-spacing
     )
 ) !default;

package/scss/gantt/_variables.scss

@@ -1,93 +1,93 @@
 // Gantt
-$gantt-border-width: 1px !default;
-$gantt-font-family: $font-family !default;
-$gantt-font-size: $font-size !default;
-$gantt-line-height: $line-height !default;
-
-$gantt-bg: $kendo-component-bg !default;
-$gantt-text: $kendo-component-text !default;
-$gantt-border: $kendo-component-border !default;
-
-$gantt-treelist-bg: null !default;
-$gantt-treelist-text: null !default;
-$gantt-treelist-border: null !default;
-
-$gantt-nonwork-bg: rgba( k-contrast-color( $gantt-bg ), .025 ) !default;
-$gantt-nonwork-text: null !default;
-$gantt-nonwork-border: null !default;
-
-$gantt-line-size: 2px !default;
-$gantt-line-fill: k-color-mix( $gantt-text, $gantt-bg ) !default;
-$gantt-line-selected-fill: $kendo-selected-bg !default;
-
-$gantt-dot-size: 8px !default;
-$gantt-dot-spacing: 4px !default;
-$gantt-dot-bg: $gantt-text !default;
-$gantt-dot-border: null !default;
-$gantt-dot-hover-bg: $gantt-bg !default;
-$gantt-dot-hover-border: $gantt-text !default;
-
-$gantt-milestone-bg: if( k-is-light( $gantt-bg ), $gray-300, $gray-700 ) !default;
-$gantt-milestone-border: k-try-shade( $gantt-milestone-bg, 2 ) !default;
-$gantt-milestone-selected-bg: $kendo-selected-bg !default;
-$gantt-milestone-selected-border: $kendo-selected-border !default;
-
-$gantt-summary-bg: k-color-mix( $gantt-text, $gantt-bg ) !default;
-$gantt-summary-progress-bg: $gantt-text !default;
-$gantt-summary-selected-bg: k-color-mix( $kendo-selected-bg, $gantt-bg ) !default;
-$gantt-summary-progress-selected-bg: $kendo-selected-bg !default;
-
-$gantt-task-padding-x: k-map-get( $kendo-spacing, 2 ) !default;
-$gantt-task-padding-y: k-map-get( $kendo-spacing, 1 ) !default;
-$gantt-task-border-width: 1px !default;
-$gantt-task-bg: if( k-is-light( $gantt-bg ), $gray-300, $gray-700 ) !default;
-$gantt-task-text: k-contrast-color( $gantt-task-bg ) !default;
-$gantt-task-border: if( k-is-light( $gantt-bg ), $gray-400, $gray-600 ) !default;
-$gantt-task-progress-bg: if( k-is-light( $gantt-bg ), $gray-400, $gray-600 ) !default;
-$gantt-task-selected-bg: k-color-mix( $kendo-selected-bg, $gantt-bg ) !default;
-$gantt-task-selected-text: $kendo-selected-text !default;
-$gantt-task-selected-border: $kendo-selected-bg !default;
-$gantt-task-progress-selected-bg: $kendo-selected-bg !default;
-
-$gantt-planned-margin-y: .35em !default;
-$gantt-planned-border-width: 2px !default;
-$gantt-planned-line-height: .75em !default;
-
-$gantt-planned-dependency-margin-y: .6em !default;
-
-$gantt-planned-moment-width: 6px !default;
-$gantt-planned-moment-height: $gantt-planned-moment-width !default;
-$gantt-planned-moment-border-radius: calc( ( #{$gantt-planned-border-width * 2} + #{$gantt-planned-moment-width} ) / 2 ) !default;
-$gantt-planned-moment-left-margin-x: calc( #{k-math-div( $gantt-planned-border-width, 2 )} - #{$gantt-planned-moment-border-radius} ) !default;
-$gantt-planned-milestone-moment-margin-x: $gantt-planned-moment-width !default;
-
-$gantt-planned-duration-height: $gantt-planned-border-width !default;
-$gantt-planned-duration-hover-height: calc( #{$gantt-planned-border-width} + 1px ) !default;
-
-$gantt-planned-single-drag-hint-top: .35em !default;
-$gantt-planned-summary-drag-hint-top: 1em !default;
-$gantt-planned-milestone-drag-hint-top: .85em !default;
-
-$gantt-rtl-milestone-wrap-margin-x: -2.3em !default;
-$gantt-rtl-milestone-planned-moment-margin-x: .2em !default;
-$gantt-rtl-milestone-dot-start-margin-x: -.1em !default;
-
-$gantt-planned-offset-resize-handler-margin-x: 1.2em !default;
-
-$gantt-planned-bg: $kendo-color-primary !default;
-$gantt-planned-border: $gantt-planned-bg !default;
-
-$gantt-delayed-bg: $kendo-color-error !default;
-$gantt-delayed-bg-lighter: k-color-tint( $gantt-delayed-bg, 5 ) !default;
-
-$gantt-advanced-bg: $kendo-color-success !default;
-$gantt-advanced-bg-lighter: k-color-tint( $gantt-advanced-bg, 5 ) !default;
-
-$gantt-action-on-offset-text: #000000 !default;
-$gantt-offset-resize-handler-top: 45% !default;
-
-$gantt-validation-tooltip-width: 200px !default;
-$gantt-validation-tooltip-label-width: 50px !default;
-$gantt-validation-tooltip-border: #656565 !default;
-$gantt-validation-tooltip-valid-border: $kendo-color-success !default;
-$gantt-validation-tooltip-invalid-border: $kendo-color-error !default;
+$kendo-gantt-border-width: 1px !default;
+$kendo-gantt-font-family: $kendo-font-family !default;
+$kendo-gantt-font-size: $kendo-font-size-md !default;
+$kendo-gantt-line-height: $kendo-line-height-md !default;
+
+$kendo-gantt-bg: $kendo-component-bg !default;
+$kendo-gantt-text: $kendo-component-text !default;
+$kendo-gantt-border: $kendo-component-border !default;
+
+$kendo-gantt-treelist-bg: null !default;
+$kendo-gantt-treelist-text: null !default;
+$kendo-gantt-treelist-border: null !default;
+
+$kendo-gantt-nonwork-bg: rgba( k-contrast-color( $kendo-gantt-bg ), .025 ) !default;
+$kendo-gantt-nonwork-text: null !default;
+$kendo-gantt-nonwork-border: null !default;
+
+$kendo-gantt-line-size: 2px !default;
+$kendo-gantt-line-fill: k-color-mix( $kendo-gantt-text, $kendo-gantt-bg ) !default;
+$kendo-gantt-line-selected-fill: $kendo-selected-bg !default;
+
+$kendo-gantt-dot-size: 8px !default;
+$kendo-gantt-dot-spacing: 4px !default;
+$kendo-gantt-dot-bg: $kendo-gantt-text !default;
+$kendo-gantt-dot-border: null !default;
+$kendo-gantt-dot-hover-bg: $kendo-gantt-bg !default;
+$kendo-gantt-dot-hover-border: $kendo-gantt-text !default;
+
+$kendo-gantt-milestone-bg: if( k-is-light( $kendo-gantt-bg ), $gray-300, $gray-700 ) !default;
+$kendo-gantt-milestone-border: k-try-shade( $kendo-gantt-milestone-bg, 2 ) !default;
+$kendo-gantt-milestone-selected-bg: $kendo-selected-bg !default;
+$kendo-gantt-milestone-selected-border: $kendo-selected-border !default;
+
+$kendo-gantt-summary-bg: k-color-mix( $kendo-gantt-text, $kendo-gantt-bg ) !default;
+$kendo-gantt-summary-progress-bg: $kendo-gantt-text !default;
+$kendo-gantt-summary-selected-bg: k-color-mix( $kendo-selected-bg, $kendo-gantt-bg ) !default;
+$kendo-gantt-summary-progress-selected-bg: $kendo-selected-bg !default;
+
+$kendo-gantt-task-padding-x: k-map-get( $kendo-spacing, 2 ) !default;
+$kendo-gantt-task-padding-y: k-map-get( $kendo-spacing, 1 ) !default;
+$kendo-gantt-task-border-width: 1px !default;
+$kendo-gantt-task-bg: if( k-is-light( $kendo-gantt-bg ), $gray-300, $gray-700 ) !default;
+$kendo-gantt-task-text: k-contrast-color( $kendo-gantt-task-bg ) !default;
+$kendo-gantt-task-border: if( k-is-light( $kendo-gantt-bg ), $gray-400, $gray-600 ) !default;
+$kendo-gantt-task-progress-bg: if( k-is-light( $kendo-gantt-bg ), $gray-400, $gray-600 ) !default;
+$kendo-gantt-task-selected-bg: k-color-mix( $kendo-selected-bg, $kendo-gantt-bg ) !default;
+$kendo-gantt-task-selected-text: $kendo-selected-text !default;
+$kendo-gantt-task-selected-border: $kendo-selected-bg !default;
+$kendo-gantt-task-progress-selected-bg: $kendo-selected-bg !default;
+
+$kendo-gantt-planned-margin-y: .35em !default;
+$kendo-gantt-planned-border-width: 2px !default;
+$kendo-gantt-planned-line-height: .75em !default;
+
+$kendo-gantt-planned-dependency-margin-y: .6em !default;
+
+$kendo-gantt-planned-moment-width: 6px !default;
+$kendo-gantt-planned-moment-height: $kendo-gantt-planned-moment-width !default;
+$kendo-gantt-planned-moment-border-radius: calc( ( #{$kendo-gantt-planned-border-width * 2} + #{$kendo-gantt-planned-moment-width} ) / 2 ) !default;
+$kendo-gantt-planned-moment-left-margin-x: calc( #{k-math-div( $kendo-gantt-planned-border-width, 2 )} - #{$kendo-gantt-planned-moment-border-radius} ) !default;
+$kendo-gantt-planned-milestone-moment-margin-x: $kendo-gantt-planned-moment-width !default;
+
+$kendo-gantt-planned-duration-height: $kendo-gantt-planned-border-width !default;
+$kendo-gantt-planned-duration-hover-height: calc( #{$kendo-gantt-planned-border-width} + 1px ) !default;
+
+$kendo-gantt-planned-single-drag-hint-top: .35em !default;
+$kendo-gantt-planned-summary-drag-hint-top: 1em !default;
+$kendo-gantt-planned-milestone-drag-hint-top: .85em !default;
+
+$kendo-gantt-rtl-milestone-wrap-margin-x: -2.3em !default;
+$kendo-gantt-rtl-milestone-planned-moment-margin-x: .2em !default;
+$kendo-gantt-rtl-milestone-dot-start-margin-x: -.1em !default;
+
+$kendo-gantt-planned-offset-resize-handler-margin-x: 1.2em !default;
+
+$kendo-gantt-planned-bg: $kendo-color-primary !default;
+$kendo-gantt-planned-border: $kendo-gantt-planned-bg !default;
+
+$kendo-gantt-delayed-bg: $kendo-color-error !default;
+$kendo-gantt-delayed-bg-lighter: k-color-tint( $kendo-gantt-delayed-bg, 5 ) !default;
+
+$kendo-gantt-advanced-bg: $kendo-color-success !default;
+$kendo-gantt-advanced-bg-lighter: k-color-tint( $kendo-gantt-advanced-bg, 5 ) !default;
+
+$kendo-gantt-action-on-offset-text: #000000 !default;
+$kendo-gantt-offset-resize-handler-top: 45% !default;
+
+$kendo-gantt-validation-tooltip-width: 200px !default;
+$kendo-gantt-validation-tooltip-label-width: 50px !default;
+$kendo-gantt-validation-tooltip-border: #656565 !default;
+$kendo-gantt-validation-tooltip-valid-border: $kendo-color-success !default;
+$kendo-gantt-validation-tooltip-invalid-border: $kendo-color-error !default;

package/scss/grid/_theme.scss

@@ -8,6 +8,7 @@
             background-color: inherit;
         }
 
+        td,
         .k-table-td,
         .k-grid-content,
         .k-grid-header-locked,
@@ -30,7 +31,9 @@
 
         // Selected state
         .k-table-th.k-selected,
+        td.k-selected,
         .k-table-td.k-selected,
+        .k-table-row.k-selected > td,
         .k-table-row.k-selected > .k-table-td {
             color: $kendo-grid-selected-text;
             background-color: $kendo-grid-selected-bg;
@@ -38,7 +41,12 @@
 
         // Focused state
         .k-table-th,
+        td,
         .k-table-td,
+        .k-master-row > td,
+        .k-grouping-row > td,
+        .k-detail-row > td,
+        .k-group-footer > td,
         .k-master-row > .k-table-td,
         .k-grouping-row > .k-table-td,
         .k-detail-row > .k-table-td,
@@ -60,6 +68,7 @@
         .k-grid-header-locked,
         .k-grid-content-locked,
         .k-grid-header-locked .k-header,
+        .k-grid-content-locked td,
         .k-grid-content-locked .k-table-td {
             border-color: $kendo-grid-sticky-header-border;
         }
@@ -69,25 +78,31 @@
         }
 
         .k-grid-content-locked {
+            .k-group-footer td,
             .k-group-footer .k-table-td,
             .k-group-cell {
                 @include fill( $border: $kendo-grid-header-border );
             }
 
+            .k-grouping-row + .k-table-row td,
             .k-grouping-row + .k-table-row .k-table-td {
                 border-top-color: $kendo-grid-header-border;
             }
 
             // Selected state
+            .k-selected td,
             .k-selected .k-table-td {
                 @include fill( $bg: $kendo-grid-sticky-selected-bg );
             }
 
+            .k-selected.k-table-alt-row td,
             .k-selected.k-table-alt-row .k-table-td {
                 @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
             }
 
             // Selected hover
+            .k-selected:hover td,
+            .k-selected.k-hover td,
             .k-selected:hover .k-table-td,
             .k-selected.k-hover .k-table-td {
                 @include fill( $bg: $kendo-grid-sticky-selected-hover-bg );
@@ -184,12 +199,14 @@
         // Selected state
         &.k-selected .k-grid-content-sticky,
         &.k-selected .k-grid-row-sticky,
+        td.k-grid-content-sticky.k-selected,
         .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-bg );
         }
 
         &.k-selected.k-table-alt-row .k-grid-content-sticky,
         &.k-selected.k-table-alt-row .k-grid-row-sticky,
+        &.k-table-alt-row td.k-grid-content-sticky.k-selected,
         &.k-table-alt-row .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
         }
@@ -209,6 +226,8 @@
         &.k-selected.k-hover .k-grid-content-sticky,
         &.k-selected:hover .k-grid-row-sticky,
         &.k-selected.k-hover .k-grid-row-sticky,
+        &:hover td.k-grid-content-sticky.k-selected,
+        &.k-hover td.k-grid-content-sticky.k-selected,
         &:hover .k-table-td.k-grid-content-sticky.k-selected,
         &.k-hover .k-table-td.k-grid-content-sticky.k-selected {
             background-color: $kendo-grid-sticky-selected-hover-bg;
@@ -228,11 +247,14 @@
             }
         }
 
+        .k-grid-row-sticky td,
         .k-grid-row-sticky .k-table-td {
             border-top-color: $kendo-grid-sticky-border;
             border-bottom-color: $kendo-grid-sticky-border;
             background-color: $kendo-grid-sticky-bg;
 
+            &:hover td,
+            &.k-hover td,
             &:hover .k-table-td,
             &.k-hover .k-table-td {
                 background-color: $kendo-grid-sticky-hover-bg;
@@ -240,12 +262,15 @@
         }
 
         .k-table-alt-row .k-grid-content-sticky,
+        .k-grid-row-sticky.k-table-alt-row td,
         .k-grid-row-sticky.k-table-alt-row .k-table-td {
             @include fill( $bg: $kendo-grid-sticky-alt-bg );
         }
 
         // Selected state
         .k-table-row.k-selected .k-grid-content-sticky,
+        .k-selected.k-grid-row-sticky td,
+        .k-grid-row-sticky td.k-selected,
         .k-selected.k-grid-row-sticky .k-table-td,
         .k-grid-row-sticky .k-table-td.k-selected,
         .k-selected.k-grid-content-sticky {
@@ -253,6 +278,7 @@
         }
 
         .k-table-row.k-selected.k-table-alt-row .k-grid-content-sticky,
+        .k-selected.k-table-alt-row.k-grid-row-sticky td,
         .k-selected.k-table-alt-row.k-grid-row-sticky .k-table-td,
         .k-table-alt-row .k-selected.k-grid-content-sticky {
             @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
@@ -261,6 +287,10 @@
         // Hover state
         .k-table-row:hover .k-grid-content-sticky,
         .k-table-row.k-hover .k-grid-content-sticky,
+        .k-grid-row-sticky:hover td,
+        .k-grid-row-sticky.k-hover td,
+        .k-grid-row-sticky.k-table-alt-row:hover td,
+        .k-grid-row-sticky.k-table-alt-row.k-hover td,
         .k-grid-row-sticky:hover .k-table-td,
         .k-grid-row-sticky.k-hover .k-table-td,
         .k-grid-row-sticky.k-table-alt-row:hover .k-table-td,
@@ -273,12 +303,18 @@
         // Selected + Hover
         .k-table-row.k-selected:hover .k-grid-content-sticky,
         .k-table-row.k-selected.k-hover .k-grid-content-sticky,
+        .k-selected.k-grid-row-sticky:hover td,
+        .k-selected.k-grid-row-sticky.k-hover td,
+        .k-selected.k-table-alt-row.k-grid-row-sticky:hover td,
+        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover td,
         .k-selected.k-grid-row-sticky:hover .k-table-td,
         .k-selected.k-grid-row-sticky.k-hover .k-table-td,
         .k-selected.k-table-alt-row.k-grid-row-sticky:hover .k-table-td,
         .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover .k-table-td,
         .k-table-row.k-selected.k-table-alt-row:hover .k-grid-content-sticky,
         .k-table-row.k-selected.k-table-alt-row.k-hover .k-grid-content-sticky,
+        .k-grid-row-sticky:hover td.k-selected,
+        .k-grid-row-sticky.k-hover td.k-selected,
         .k-grid-row-sticky:hover .k-table-td.k-selected,
         .k-grid-row-sticky.k-hover .k-table-td.k-selected,
         .k-table-row:hover .k-grid-content-sticky.k-selected,
@@ -299,6 +335,7 @@
     }
 
     .k-group-footer {
+        td,
         .k-table-td,
         .k-grid-footer-sticky {
             @include fill( $bg: $kendo-grid-sticky-footer-bg );
@@ -369,9 +406,9 @@
         .k-menu:not(.k-context-menu) {
 
             @include fill(
-                $popup-text,
-                $popup-bg,
-                $popup-border
+                $kendo-popup-text,
+                $kendo-popup-bg,
+                $kendo-popup-border
             );
 
             .k-item {
@@ -412,7 +449,7 @@
     }
 
     .k-check-all-wrap {
-        @include fill( $border: $popup-border );
+        @include fill( $border: $kendo-popup-border );
     }
 
     .k-grid-norecords-template {