Slider: get rid of excess string literal in testcafe test and move cs…

…s variables to colors (DevExpress#26898)
jdvictoria · Mar 13, 2024 · 74a93cd · 74a93cd
1 parent 963f449
commit 74a93cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/packages/devextreme/scss/widgets/material/slider/_colors.scss b/packages/devextreme/scss/widgets/material/slider/_colors.scss
@@ -24,5 +24,12 @@ $material-slider-bar-disabled-bg: color.change($base-text-color, $alpha: 0.24) !
 * $name 30. Slider tooltip text color
 * $type color
 */
-$material-slider-tooltip-color: $base-inverted-text-color !default;
-$material-slider-inverted-tooltip-color: $base-text-color !default;
+$material-slider-tooltip-color: null !default;
+
+@if $mode == "light" {
+  $material-slider-tooltip-color: $base-inverted-text-color !default;
+}
+
+@if $mode == "dark" {
+  $material-slider-tooltip-color: $base-text-color !default;
+}
diff --git a/packages/devextreme/scss/widgets/material/slider/_index.scss b/packages/devextreme/scss/widgets/material/slider/_index.scss
@@ -80,15 +80,7 @@ $material-slider-tooltip-width-without-paddings: $material-slider-tooltip-width
 
       .dx-popup-content {
         line-height: normal;
-
-        @if $mode == "light" {
-          color: $material-slider-tooltip-color;
-        }
-
-        @if $mode == "dark" {
-          color: $material-slider-inverted-tooltip-color;
-        }
-
+        color: $material-slider-tooltip-color;
         padding: $material-slider-tooltip-popup-content-padding;
 
         .dx-slider-tooltip-position-top & {

diff --git a/packages/devextreme/testing/testcafe/tests/editors/slider/slider.ts b/packages/devextreme/testing/testcafe/tests/editors/slider/slider.ts
@@ -11,7 +11,7 @@ test('Slider appearance', async (t) => {
 
   await testScreenshot(t, takeScreenshot, 'slider-appearance.png', { element: '#container' });
 
-  await testScreenshot(t, takeScreenshot, 'slider-appearance.png', { element: '#container', theme: `${getFullThemeName().replace('light', 'dark')}` });
+  await testScreenshot(t, takeScreenshot, 'slider-appearance.png', { element: '#container', theme: getFullThemeName().replace('light', 'dark') });
 
   await t
     .expect(compareResults.isValid())