Release 17.2.4

Cherry-picked changesets: ed34ca2 Sergey Zvyagin - Add new css classes with base colors to generic themes (#2223) 5c1b85c Sergey Zvyagin - Fix numerous small issues in the new color schemes (#2224) 86137d3 Sergey Zvyagin - Fix RangeSelector scale ticks in contrast theme (#2227) 0ad956f Yana Yarovaya - Fix jQuery 1&2 slider tests in Chrome 62 (#2238)
DevExpress · Dec 14, 2017 · 73d464a · 73d464a · AlekseyMartynov · Dec 14, 2017
1 parent 762e82e
commit 73d464a
Show file tree

Hide file tree

Showing 19 changed files with 202 additions and 63 deletions.
diff --git a/drone-cache.sh b/drone-cache.sh
diff --git a/js/viz/core/themes/generic.carmine.js b/js/viz/core/themes/generic.carmine.js
@@ -2,7 +2,7 @@
 
 var themeModule = require("../../themes"),
     registerTheme = themeModule.registerTheme,
-
+    ACCENT_COLOR = "#f05b41",
     BACKGROUND_COLOR = "#fff",
     TITLE_COLOR = "#333",
     SUBTITLE_COLOR = "#8899a8",
@@ -83,11 +83,16 @@ registerTheme({
         scale: {
             breakStyle: { color: "#c1c5c7" },
             tick: {
-                opacity: 1
-            },
-            minorTick: {
-                opacity: 0.5
+                opacity: 0.12
             }
+        },
+        selectedRangeColor: ACCENT_COLOR,
+        sliderMarker: {
+            color: ACCENT_COLOR
+        },
+        sliderHandle: {
+            color: ACCENT_COLOR,
+            opacity: 0.5
         }
     },
     sparkline: {
@@ -102,5 +107,16 @@ registerTheme({
                 }
             }
         }
+    },
+    map: {
+        "layer:marker:dot": {
+            color: ACCENT_COLOR
+        },
+        "layer:marker:bubble": {
+            color: ACCENT_COLOR
+        },
+        legend: {
+            markerColor: ACCENT_COLOR
+        }
     }
 }, "generic.light");
diff --git a/js/viz/core/themes/generic.contrast.js b/js/viz/core/themes/generic.contrast.js
@@ -187,9 +187,11 @@ registerTheme({
     rangeSelector: {
         scale: {
             tick: {
+                color: WHITE,
                 opacity: 0.4
             },
             minorTick: {
+                color: WHITE,
                 opacity: 0.12
             },
             breakStyle: {

diff --git a/js/viz/core/themes/generic.darkmoon.js b/js/viz/core/themes/generic.darkmoon.js
@@ -2,7 +2,7 @@
 
 var themeModule = require("../../themes"),
     registerTheme = themeModule.registerTheme,
-
+    ACCENT_COLOR = "#3debd3",
     BACKGROUND_COLOR = "#465672",
     TITLE_COLOR = "#fff",
     SUBTITLE_COLOR = "#919bac",
@@ -105,6 +105,19 @@ registerTheme({
     map: {
         background: {
             borderColor: BORDER_COLOR
+        },
+        "layer:area": {
+            color: "#97a3b6",
+            borderColor: BACKGROUND_COLOR
+        },
+        "layer:marker:dot": {
+            color: ACCENT_COLOR
+        },
+        "layer:marker:bubble": {
+            color: ACCENT_COLOR
+        },
+        legend: {
+            markerColor: ACCENT_COLOR
         }
     },
     rangeSelector: {
@@ -114,11 +127,19 @@ registerTheme({
         scale: {
             breakStyle: { color: "#73869e" },
             tick: {
-                opacity: 1
-            },
-            minorTick: {
-                opacity: 0.5
+                opacity: 0.2
+            }
+        },
+        selectedRangeColor: ACCENT_COLOR,
+        sliderMarker: {
+            color: ACCENT_COLOR,
+            font: {
+                color: "#000"
             }
+        },
+        sliderHandle: {
+            color: ACCENT_COLOR,
+            opacity: 0.5
         }
     }
 }, "generic.dark");
diff --git a/js/viz/core/themes/generic.darkviolet.js b/js/viz/core/themes/generic.darkviolet.js
@@ -2,7 +2,7 @@
 
 var themeModule = require("../../themes"),
     registerTheme = themeModule.registerTheme,
-
+    ACCENT_COLOR = "#9c63ff",
     BACKGROUND_COLOR = "#17171f",
     TITLE_COLOR = "#f5f6f7",
     SUBTITLE_COLOR = "#fff",
@@ -106,11 +106,30 @@ registerTheme({
         scale: {
             breakStyle: { color: "#575e6b" },
             tick: {
-                opacity: 1
-            },
-            minorTick: {
-                opacity: 0.5
+                opacity: 0.2
             }
+        },
+        selectedRangeColor: ACCENT_COLOR,
+        sliderMarker: {
+            color: ACCENT_COLOR,
+            font: {
+                color: "#fff"
+            }
+        },
+        sliderHandle: {
+            color: ACCENT_COLOR,
+            opacity: 0.5
+        }
+    },
+    map: {
+        "layer:marker:dot": {
+            color: ACCENT_COLOR
+        },
+        "layer:marker:bubble": {
+            color: ACCENT_COLOR
+        },
+        legend: {
+            markerColor: ACCENT_COLOR
         }
     }
 }, "generic.dark");
diff --git a/js/viz/core/themes/generic.greenmist.js b/js/viz/core/themes/generic.greenmist.js
@@ -2,7 +2,7 @@
 
 var themeModule = require("../../themes"),
     registerTheme = themeModule.registerTheme,
-
+    ACCENT_COLOR = "#3cbab2",
     BACKGROUND_COLOR = "#f5f5f5",
     TITLE_COLOR = "#28484f",
     SUBTITLE_COLOR = "#7eb2be",
@@ -106,11 +106,27 @@ registerTheme({
         scale: {
             breakStyle: { color: "#c1c1c1" },
             tick: {
-                opacity: 1
-            },
-            minorTick: {
-                opacity: 0.5
+                opacity: 0.12
             }
+        },
+        selectedRangeColor: ACCENT_COLOR,
+        sliderMarker: {
+            color: ACCENT_COLOR
+        },
+        sliderHandle: {
+            color: ACCENT_COLOR,
+            opacity: 0.5
+        }
+    },
+    map: {
+        "layer:marker:dot": {
+            color: ACCENT_COLOR
+        },
+        "layer:marker:bubble": {
+            color: ACCENT_COLOR
+        },
+        legend: {
+            markerColor: ACCENT_COLOR
         }
     }
 }, "generic.light");
diff --git a/js/viz/core/themes/generic.softblue.js b/js/viz/core/themes/generic.softblue.js
@@ -2,7 +2,7 @@
 
 var themeModule = require("../../themes"),
     registerTheme = themeModule.registerTheme,
-
+    ACCENT_COLOR = "#7ab8eb",
     BACKGROUND_COLOR = "#fff",
     TITLE_COLOR = "#333",
     SUBTITLE_COLOR = "#99a1a8",
@@ -83,11 +83,16 @@ registerTheme({
         scale: {
             breakStyle: { color: "#cfd2d3" },
             tick: {
-                opacity: 1
-            },
-            minorTick: {
-                opacity: 0.5
+                opacity: 0.12
             }
+        },
+        selectedRangeColor: ACCENT_COLOR,
+        sliderMarker: {
+            color: ACCENT_COLOR
+        },
+        sliderHandle: {
+            color: ACCENT_COLOR,
+            opacity: 0.5
         }
     },
     sparkline: {
@@ -102,5 +107,16 @@ registerTheme({
                 }
             }
         }
+    },
+    map: {
+        "layer:marker:dot": {
+            color: ACCENT_COLOR
+        },
+        "layer:marker:bubble": {
+            color: ACCENT_COLOR
+        },
+        legend: {
+            markerColor: ACCENT_COLOR
+        }
     }
 }, "generic.light");
diff --git a/js/viz/themes.js b/js/viz/themes.js
@@ -158,8 +158,6 @@ function patchAxes(theme) {
     mergeScalar(theme.gauge.scale.label.font, colorFieldName, null, theme.axisLabelColor);
     mergeScalar(theme.gauge.scale.tick, colorFieldName, null, theme.backgroundColor);
     mergeScalar(theme.gauge.scale.minorTick, colorFieldName, null, theme.backgroundColor);
-    mergeScalar(theme.rangeSelector.scale.tick, colorFieldName, null, theme.axisColor);
-    mergeScalar(theme.rangeSelector.scale.minorTick, colorFieldName, null, theme.axisColor);
     mergeScalar(theme.rangeSelector.scale.label.font, colorFieldName, null, theme.axisLabelColor);
 }
 

diff --git a/styles/widgets/base/scheduler.less b/styles/widgets/base/scheduler.less
@@ -1908,6 +1908,7 @@
     color: @SCHEDULER_APPOINTMENT_TEXT_COLOR;
 
     &.dx-button,
+    &.dx-button.dx-state-hover,
     &.dx-button.dx-state-active,
     &.dx-button.dx-state-focused {
         background-color: @SCHEDULER_APPOINTMENT_BASE_COLOR;

diff --git a/styles/widgets/generic/color-schemes/carmine/generic.carmine.less b/styles/widgets/generic/color-schemes/carmine/generic.carmine.less
@@ -846,7 +846,7 @@
 * @type color
 * @group overlays.toasts
 */
-@toast-color: @base-inverted-text-color;
+@toast-color: #fff;
 @toast-shadow-color: transparent;
 
 @toast-border-radius: @base-border-radius-large;