From 73d464a884c34512c81a4955037a0f840c79789f Mon Sep 17 00:00:00 2001 From: alexander-kotov-dx Date: Thu, 14 Dec 2017 17:16:00 +0300 Subject: [PATCH] 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) --- drone-cache.sh | 0 js/viz/core/themes/generic.carmine.js | 26 ++++++++-- js/viz/core/themes/generic.contrast.js | 2 + js/viz/core/themes/generic.darkmoon.js | 31 +++++++++-- js/viz/core/themes/generic.darkviolet.js | 29 +++++++++-- js/viz/core/themes/generic.greenmist.js | 26 ++++++++-- js/viz/core/themes/generic.softblue.js | 26 ++++++++-- js/viz/themes.js | 2 - styles/widgets/base/scheduler.less | 1 + .../carmine/generic.carmine.less | 2 +- .../contrast/generic.contrast.less | 46 ++++++++-------- .../color-schemes/dark/generic.dark.less | 2 +- .../darkmoon/generic.darkmoon.less | 10 ++-- .../darkviolet/generic.darkviolet.less | 2 +- .../greenmist/generic.greenmist.less | 2 +- .../color-schemes/light/generic.light.less | 2 +- .../softblue/generic.softblue.less | 2 +- styles/widgets/generic/common.generic.less | 52 +++++++++++++++++++ .../tests/DevExpress.viz.core/themes.tests.js | 2 - 19 files changed, 202 insertions(+), 63 deletions(-) mode change 100755 => 100644 drone-cache.sh diff --git a/drone-cache.sh b/drone-cache.sh old mode 100755 new mode 100644 diff --git a/js/viz/core/themes/generic.carmine.js b/js/viz/core/themes/generic.carmine.js index f003fcfd349b..70029423d853 100644 --- 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 index 14b07c8e4bfd..d535f2a801d9 100644 --- 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 index da709774b110..777a2f50a166 100644 --- 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 index 160ff90de357..4155d59ff01b 100644 --- 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 index 1668aee9d937..28310ebb2ddf 100644 --- 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 index 9a19ba0f685a..766cb6ca2ff3 100644 --- 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 index 5e57c1067edb..f7f548e95536 100644 --- 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 index a03b62095f56..59b08ba6bf67 100644 --- 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 index e58556351ad5..0667bc28e1f1 100644 --- 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; diff --git a/styles/widgets/generic/color-schemes/contrast/generic.contrast.less b/styles/widgets/generic/color-schemes/contrast/generic.contrast.less index 3667b0164a75..aa1f52fcaf80 100644 --- a/styles/widgets/generic/color-schemes/contrast/generic.contrast.less +++ b/styles/widgets/generic/color-schemes/contrast/generic.contrast.less @@ -17,10 +17,10 @@ @base-border-color: #fff; @base-border-radius: 4px; -@base-contrast-color: #cf00d7; +@base-accent: #cf00d7; -@base-hover-color: @base-contrast-color; -@base-focus-color: @base-contrast-color; +@base-hover-color: @base-accent; +@base-focus-color: @base-accent; @base-shadow-color: transparent; @base-default: #52BBE7; @@ -100,7 +100,7 @@ * @type color * @group badges */ -@badge-bg: @base-contrast-color; +@badge-bg: @base-accent; // TextEditor /** @@ -561,7 +561,7 @@ * @type color * @group overlays.toasts */ -@toast-color: @base-inverted-text-color; +@toast-color: #fff; @dropdowneditor-button-hover-border-color: @base-border-color; @dropdowneditor-button-active-border-color: transparent; @@ -690,7 +690,7 @@ * @type color * @group scrollview */ -@scrollable-scrollbar-active-bg: fade(@base-contrast-color, 80%); +@scrollable-scrollbar-active-bg: fade(@base-accent, 80%); // Toolbar @@ -758,7 +758,7 @@ * @group sliders * @paletteColorOpacity 1 */ -@slider-range-bg: @base-contrast-color; +@slider-range-bg: @base-accent; @slider-range-border-color: @slider-range-bg; @slider-handle-bg: @base-inverted-bg; @slider-handle-border-color: #fff - @base-border-color; @@ -776,7 +776,7 @@ * @group progressbars */ @progressbar-bg: @base-bg; -@progressbar-border-color: @base-contrast-color; +@progressbar-border-color: @base-accent; /** * @name 20. Selected range background color @@ -784,11 +784,11 @@ * @group progressbars * @paletteColorOpacity 1 */ -@progressbar-range-bg: @base-contrast-color; -@progressbar-range-border-color: @base-contrast-color; +@progressbar-range-bg: @base-accent; +@progressbar-range-border-color: @base-accent; -@progressbar-range-disabled-bg: fade(@base-contrast-color, 60%); -@progressbar-range-indeterminate-color: @base-contrast-color; +@progressbar-range-disabled-bg: fade(@base-accent, 60%); +@progressbar-range-indeterminate-color: @base-accent; // Switch @@ -1035,7 +1035,7 @@ * @group datagrid * @paletteColorOpacity 1 */ -@datagrid-focused-border-color: @base-contrast-color; +@datagrid-focused-border-color: @base-accent; /** * @name 131. Editor background * @type color @@ -1226,7 +1226,7 @@ * @group treelist * @paletteColorOpacity 1 */ -@treelist-focused-border-color: @base-contrast-color; +@treelist-focused-border-color: @base-accent; /** * @name 131. Editor background * @type color @@ -1297,7 +1297,7 @@ @PIVOTGRID_HIERARCHY_IMAGE: url(images/widgets/generic/color-schemes/contrast/grid/hierarchy.png); @PIVOTGRID_FIELD_AREA_TEXT_COLOR: @PIVOTGRID_AREA_COLOR; -@PIVOTGRID_POSITION_INDICATOR_COLOR: @base-contrast-color; +@PIVOTGRID_POSITION_INDICATOR_COLOR: @base-accent; /** * @name 70. Spin icon color * @type color @@ -1319,13 +1319,13 @@ @SCHEDULER_DROPPABLE_CELL_BACKGROUND_COLOR: @base-bg; -@SCHEDULER_APPOINTMENT_BASE_COLOR: @base-contrast-color; +@SCHEDULER_APPOINTMENT_BASE_COLOR: @base-accent; @SCHEDULER_APPOINTMENT_TEXT_COLOR: @base-text-color; @SCHEDULER_DD_APPOINTMENT_HOVER_TEXT_COLOR: @base-inverted-text-color; @scheduler-appointment-focus-color: #fff - @base-text-color; @SCHEDULER_APPOINTMENT_START_COLOR: @base-inverted-bg; -@SCHEDULER_WORKSPACE_FOCUSED_CELL_COLOR: lighten(@base-contrast-color, 5%); +@SCHEDULER_WORKSPACE_FOCUSED_CELL_COLOR: lighten(@base-accent, 5%); @SCHEDULER_PANEL_TEXT_COLOR: @base-text-color; @SCHEDULER_WORKSPACE_MONTH_TEXT_COLOR: @base-text-color; @@ -1333,7 +1333,7 @@ @scheduler-dropdown-appointment-date-color: @base-text-color; @SCHEDULER_WORKSPACE_BACKGROUND_COLOR: @base-bg; -@SCHEDULER_WORKSPACE_ACCENT_COLOR: @base-contrast-color; +@SCHEDULER_WORKSPACE_ACCENT_COLOR: @base-accent; @scheduler-popup-title-bg: @SCHEDULER_WORKSPACE_BACKGROUND_COLOR; @@ -1354,7 +1354,7 @@ @SCHEDULER_OTHER_MONTH_CELL_OPACITY: 1; @SCHEDULER_FILL_FOCUSED_APPOINTMENT: true; @SCHEDULER_TIME_INDICATOR_BACKGROUND_COLOR: @SCHEDULER_BASE_BORDER_COLOR; -@SCHEDULER_CURRENT_TIME_CELL_COLOR: @base-contrast-color; +@SCHEDULER_CURRENT_TIME_CELL_COLOR: @base-accent; @SCHEDULER_TIME_INDICATOR_COLOR: @SCHEDULER_CURRENT_TIME_CELL_COLOR; @SCHEDULER_FIRST_MONTH_CELL_BACKGROUND_COLOR: @base-bg; @@ -1422,7 +1422,7 @@ * @type color * @group editors.calendar */ -@calendar-cell-other-color: @base-contrast-color; +@calendar-cell-other-color: @base-accent; /** * @name 40. Background color * @type color @@ -1450,7 +1450,7 @@ * @type color * @group editors.calendar */ -@calendar-cell-active-bg: @base-contrast-color; +@calendar-cell-active-bg: @base-accent; /** * @name 80. Border color * @type color @@ -1609,7 +1609,7 @@ */ @form-group-border-color: @base-border-color; @form-field-required-color: saturate(darken(@base-text-color, 40.8%), 80%); -@form-field-mark-color: @base-contrast-color; +@form-field-mark-color: @base-accent; // Images @list-item-icon-toggle-delete-bg: url(images/widgets/generic/color-schemes/contrast/list/delete.png); @@ -1635,7 +1635,7 @@ @desktop-layout-menu-selected-bg: @base-inverted-bg; @desktop-layout-toolbar-border-color: @base-border-color; -@desktop-layout-menu-hover-bg: @base-contrast-color; +@desktop-layout-menu-hover-bg: @base-accent; @desktop-layout-copyright-color: @base-text-color; // Master-detail diff --git a/styles/widgets/generic/color-schemes/dark/generic.dark.less b/styles/widgets/generic/color-schemes/dark/generic.dark.less index 749e206e3e4d..a8ca40a88afb 100644 --- a/styles/widgets/generic/color-schemes/dark/generic.dark.less +++ b/styles/widgets/generic/color-schemes/dark/generic.dark.less @@ -844,7 +844,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; diff --git a/styles/widgets/generic/color-schemes/darkmoon/generic.darkmoon.less b/styles/widgets/generic/color-schemes/darkmoon/generic.darkmoon.less index 17c8e453df7c..122c117c8aa9 100644 --- a/styles/widgets/generic/color-schemes/darkmoon/generic.darkmoon.less +++ b/styles/widgets/generic/color-schemes/darkmoon/generic.darkmoon.less @@ -848,7 +848,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; @@ -1597,7 +1597,7 @@ * @type color * @group treelist */ -@treelist-selection-spin-icon-color: @treelist-spin-icon-color; +@treelist-selection-spin-icon-color: @base-bg; /** * @name 160. Highlighted text background color @@ -1791,14 +1791,14 @@ * @type color * @group scheduler */ -@SCHEDULER_APPOINTMENT_BASE_COLOR: #cbdaf2; +@SCHEDULER_APPOINTMENT_BASE_COLOR: #2cc9b4; /** * @name 40. Appointment text color * @type color * @group scheduler */ -@SCHEDULER_APPOINTMENT_TEXT_COLOR: @base-inverted-text-color; +@SCHEDULER_APPOINTMENT_TEXT_COLOR: #fff; @scheduler-appointment-focus-color: @SCHEDULER_APPOINTMENT_TEXT_COLOR; /** * @name 35. Start appointment color @@ -1844,7 +1844,7 @@ @SCHEDULER_TIME_INDICATOR_COLOR: lighten(@SCHEDULER_CURRENT_TIME_CELL_COLOR, 15%); -@SCHEDULER_DD_APPOINTMENT_HOVER_TEXT_COLOR: darken(@base-inverted-text-color, 20%); +@SCHEDULER_DD_APPOINTMENT_HOVER_TEXT_COLOR: #fff; @scheduler-popup-title-bg: @SCHEDULER_WORKSPACE_BACKGROUND_COLOR; diff --git a/styles/widgets/generic/color-schemes/darkviolet/generic.darkviolet.less b/styles/widgets/generic/color-schemes/darkviolet/generic.darkviolet.less index 89c9a7d2dbbc..12c7435e2ffc 100644 --- a/styles/widgets/generic/color-schemes/darkviolet/generic.darkviolet.less +++ b/styles/widgets/generic/color-schemes/darkviolet/generic.darkviolet.less @@ -853,7 +853,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; diff --git a/styles/widgets/generic/color-schemes/greenmist/generic.greenmist.less b/styles/widgets/generic/color-schemes/greenmist/generic.greenmist.less index 6fb1e3605de8..fd26c59b3a92 100644 --- a/styles/widgets/generic/color-schemes/greenmist/generic.greenmist.less +++ b/styles/widgets/generic/color-schemes/greenmist/generic.greenmist.less @@ -843,7 +843,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; diff --git a/styles/widgets/generic/color-schemes/light/generic.light.less b/styles/widgets/generic/color-schemes/light/generic.light.less index eff6809f114b..278af3650d20 100644 --- a/styles/widgets/generic/color-schemes/light/generic.light.less +++ b/styles/widgets/generic/color-schemes/light/generic.light.less @@ -843,7 +843,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; diff --git a/styles/widgets/generic/color-schemes/softblue/generic.softblue.less b/styles/widgets/generic/color-schemes/softblue/generic.softblue.less index d543ea1b6f2d..8c08b7ee51c1 100644 --- a/styles/widgets/generic/color-schemes/softblue/generic.softblue.less +++ b/styles/widgets/generic/color-schemes/softblue/generic.softblue.less @@ -848,7 +848,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; diff --git a/styles/widgets/generic/common.generic.less b/styles/widgets/generic/common.generic.less index 92c89a3b4f3f..806f232a0c18 100644 --- a/styles/widgets/generic/common.generic.less +++ b/styles/widgets/generic/common.generic.less @@ -2,6 +2,58 @@ font-family: "dx.generic@{GENERIC_COLOR_POSTFIX}@{GENERIC_SIZE_POSTFIX}"; } +.dx-theme-accent-as-text-color { + color: @base-accent; +} + +.dx-theme-accent-as-background-color { + background-color: @base-accent; + fill: @base-accent; +} + +.dx-theme-accent-as-border-color { + border-color: @base-accent; +} + +.dx-theme-text-color { + color: @base-text-color; +} + +.dx-theme-text-color-as-background-color { + background-color: @base-text-color; + fill: @base-text-color; +} + +.dx-theme-text-color-as-border-color { + border-color: @base-text-color; +} + +.dx-theme-background-color { + background-color: @base-bg; + fill: @base-bg; +} + +.dx-theme-background-color-as-text-color { + color: @base-bg; +} + +.dx-theme-background-color-as-border-color { + border-color: @base-bg; +} + +.dx-theme-border-color { + border-color: @base-border-color; +} + +.dx-theme-border-color-as-text-color { + color: @base-border-color; +} + +.dx-theme-border-color-as-background-color { + background-color: @base-border-color; + fill: @base-border-color; +} + .dx-base-typography() { color: @typography-color; font-weight: normal; diff --git a/testing/tests/DevExpress.viz.core/themes.tests.js b/testing/tests/DevExpress.viz.core/themes.tests.js index e18d2292a765..ec62037b4edc 100644 --- a/testing/tests/DevExpress.viz.core/themes.tests.js +++ b/testing/tests/DevExpress.viz.core/themes.tests.js @@ -161,8 +161,6 @@ QUnit.test("Patched properties on register theme", function(assert) { assert.deepEqual(theme.polar.commonAxisSettings.minorGrid.color, theme.axisColor, "axisColor"); assert.deepEqual(theme.polar.commonAxisSettings.tick.color, theme.axisColor, "axisColor"); assert.deepEqual(theme.polar.commonAxisSettings.minorTick.color, theme.axisColor, "axisColor"); - assert.deepEqual(theme.rangeSelector.scale.tick.color, theme.axisColor, "axisColor"); - assert.deepEqual(theme.rangeSelector.scale.minorTick.color, theme.axisColor, "axisColor"); //axisLabelColor assert.strictEqual(theme.gauge.scale.label.font.color, theme.axisLabelColor, "axisLabelColor");