diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-all.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-all.png deleted file mode 100644 index 20646cf4a154..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-column.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-column.png deleted file mode 100644 index 1b1833a4d5c1..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-data.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-data.png deleted file mode 100644 index cbe8a2775fb0..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-filter.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-filter.png deleted file mode 100644 index ef936c5d812d..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-row.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-row.png deleted file mode 100644 index 9234f9c36a53..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/dimension.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/hierarchy.png b/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/dark/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-all.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-all.png deleted file mode 100644 index 20646cf4a154..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-column.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-column.png deleted file mode 100644 index 1b1833a4d5c1..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-data.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-data.png deleted file mode 100644 index cbe8a2775fb0..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-filter.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-filter.png deleted file mode 100644 index ef936c5d812d..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-row.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-row.png deleted file mode 100644 index 9234f9c36a53..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/dimension.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/hierarchy.png b/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/fluent/color-schemes/light/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-all.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-all.png deleted file mode 100644 index b6d584c41e55..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-column.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-column.png deleted file mode 100644 index a1f9951fc428..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-data.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-data.png deleted file mode 100644 index 168120a18739..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-filter.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-filter.png deleted file mode 100644 index 6436831c7980..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-row.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-row.png deleted file mode 100644 index 50c21868431f..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/dimension.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/hierarchy.png b/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/contrast/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-all.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-all.png deleted file mode 100644 index b6d584c41e55..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-column.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-column.png deleted file mode 100644 index a1f9951fc428..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-data.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-data.png deleted file mode 100644 index 168120a18739..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-filter.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-filter.png deleted file mode 100644 index 6436831c7980..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-row.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-row.png deleted file mode 100644 index 50c21868431f..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/dimension.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/dimension.png deleted file mode 100644 index 3e09507b9d83..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/hierarchy.png b/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/hierarchy.png deleted file mode 100644 index 165ed7f91682..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/dark/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-all.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-all.png deleted file mode 100644 index 20646cf4a154..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-column.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-column.png deleted file mode 100644 index 1b1833a4d5c1..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-data.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-data.png deleted file mode 100644 index cbe8a2775fb0..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-filter.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-filter.png deleted file mode 100644 index ef936c5d812d..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-row.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-row.png deleted file mode 100644 index 9234f9c36a53..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/dimension.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/hierarchy.png b/packages/devextreme/images/widgets/generic/color-schemes/light/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/generic/color-schemes/light/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-all.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-all.png deleted file mode 100644 index 20646cf4a154..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-column.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-column.png deleted file mode 100644 index 1b1833a4d5c1..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-data.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-data.png deleted file mode 100644 index cbe8a2775fb0..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-filter.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-filter.png deleted file mode 100644 index ef936c5d812d..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-row.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-row.png deleted file mode 100644 index 9234f9c36a53..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/dimension.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/hierarchy.png b/packages/devextreme/images/widgets/material/color-schemes/dark/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/dark/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-all.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-all.png deleted file mode 100644 index 20646cf4a154..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-all.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-column.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-column.png deleted file mode 100644 index 1b1833a4d5c1..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-column.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-data.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-data.png deleted file mode 100644 index cbe8a2775fb0..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-data.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-filter.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-filter.png deleted file mode 100644 index ef936c5d812d..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-filter.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-row.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-row.png deleted file mode 100644 index 9234f9c36a53..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/area-row.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/dimension.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/dimension.png deleted file mode 100644 index b3aba92a4182..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/dimension.png and /dev/null differ diff --git a/packages/devextreme/images/widgets/material/color-schemes/light/grid/hierarchy.png b/packages/devextreme/images/widgets/material/color-schemes/light/grid/hierarchy.png deleted file mode 100644 index e1d301207c15..000000000000 Binary files a/packages/devextreme/images/widgets/material/color-schemes/light/grid/hierarchy.png and /dev/null differ diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/const.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/const.ts index 39a7f8e1e2c1..f5f05330e362 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/const.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/const.ts @@ -44,9 +44,15 @@ export const CLASSES = { } as const; export const ICONS = { - measure: 'measure', + all: 'smalliconslayout', + column: 'columnfield', + row: 'rowfield', + filter: 'filter', + data: 'formula', + + measure: 'formula', hierarchy: 'hierarchy', - dimension: 'dimension', + dimension: 'detailslayout', } as const; export const SORTABLE_CONST = { diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts index 32ff995f6ed3..080e47ee040a 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts @@ -556,7 +556,7 @@ const FieldChooser = FieldChooserBase.inherit({ let render; $('').addClass(CLASSES.area.icon) - .addClass(`dx-area-icon-${area}`) + .addClass(`dx-icon-${ICONS[area]}`) .appendTo($fieldsHeaderContainer); $('') diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts index 2e3dfe6577bc..b21d05708860 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts @@ -16,8 +16,10 @@ import { name as clickEventName } from '@js/events/click'; import eventsEngine from '@js/events/core/events_engine'; import { addNamespace } from '@js/events/utils/index'; import localizationMessage from '@js/localization/message'; +import Button, { Properties } from '@js/ui/button'; import ContextMenu from '@js/ui/context_menu'; import Popup from '@js/ui/popup/ui.popup'; +import { current, isFluent } from '@js/ui/themes'; import Widget from '@js/ui/widget/ui.widget'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; @@ -878,35 +880,38 @@ const PivotGrid = (Widget as any).inherit({ this.$element().find('.dx-pivotgrid-toolbar').remove(); $toolbarContainer.prependTo($targetContainer); + const stylingMode = isFluent(current()) ? 'text' : 'contained'; if (this.option('fieldChooser.enabled')) { const $buttonElement = $(DIV) .appendTo($toolbarContainer) .addClass('dx-pivotgrid-field-chooser-button'); - const buttonOptions = { + const buttonOptions: Properties = { icon: 'columnchooser', hint: this.option('texts.showFieldChooser'), + stylingMode, onClick: () => { this.getFieldChooserPopup().show(); }, }; - this._createComponent($buttonElement, 'dxButton', buttonOptions); + this._createComponent($buttonElement, Button, buttonOptions); } if (this.option('export.enabled')) { const $buttonElement = $(DIV) .appendTo($toolbarContainer) .addClass('dx-pivotgrid-export-button'); - const buttonOptions = { + const buttonOptions: Properties = { icon: 'xlsxfile', hint: this.option('texts.exportToExcel'), + stylingMode, onClick: () => { this.exportTo(); }, }; - this._createComponent($buttonElement, 'dxButton', buttonOptions); + this._createComponent($buttonElement, Button, buttonOptions); } }, diff --git a/packages/devextreme/scss/widgets/base/pivotGrid/_common.scss b/packages/devextreme/scss/widgets/base/pivotGrid/_common.scss index d0f268be828e..87826aab0aca 100644 --- a/packages/devextreme/scss/widgets/base/pivotGrid/_common.scss +++ b/packages/devextreme/scss/widgets/base/pivotGrid/_common.scss @@ -223,12 +223,6 @@ flex-grow: 1; } } - - // stylelint-enable no-duplicate-selectors - - .dx-area-caption { - vertical-align: middle; - } } .dx-pivotgrid-action { diff --git a/packages/devextreme/scss/widgets/base/pivotGrid/_index.scss b/packages/devextreme/scss/widgets/base/pivotGrid/_index.scss index e13cb56620a3..3feafb9df223 100644 --- a/packages/devextreme/scss/widgets/base/pivotGrid/_index.scss +++ b/packages/devextreme/scss/widgets/base/pivotGrid/_index.scss @@ -16,13 +16,6 @@ $pivotgrid-field-area-text-color: null !default; $pivotgrid-data-area-color: null !default; $pivotgrid-grandtotalcolor: null !default; $pivotgrid-accent-color: null !default; -$pivotgrid-area-all-image: null !default; -$pivotgrid-area-filter-image: null !default; -$pivotgrid-area-row-image: null !default; -$pivotgrid-area-column-image: null !default; -$pivotgrid-area-data-image: null !default; -$pivotgrid-dimension-image: null !default; -$pivotgrid-hierarchy-image: null !default; $pivotgrid-empty-area-text-padding: null !default; $pivotgrid-button-top-padding: null !default; @@ -480,9 +473,6 @@ $pivotgrid-expand-icon-text-offset: 0; .dx-treeview-item .dx-icon { vertical-align: middle; - margin: 0 5px 1px 0; - - @include dx-icon-sizing(16px); } .dx-treeview-search { @@ -492,8 +482,6 @@ $pivotgrid-expand-icon-text-offset: 0; .dx-area-icon { display: inline-block; vertical-align: middle; - width: 16px; - height: 16px; } .dx-area { @@ -526,42 +514,6 @@ $pivotgrid-expand-icon-text-offset: 0; .dx-area-fields.dx-drag-target { border-color: $pivotgrid-accent-color; } - - .dx-area-icon-all { - background: $pivotgrid-area-all-image no-repeat center center; - } - - .dx-area-icon-filter { - background: $pivotgrid-area-filter-image no-repeat center center; - } - - .dx-area-icon-row { - background: $pivotgrid-area-row-image no-repeat center center; - } - - .dx-area-icon-column { - background: $pivotgrid-area-column-image no-repeat center center; - } - - .dx-area-icon-data { - background: $pivotgrid-area-data-image no-repeat center center; - } - - .dx-icon-measure { - background: $pivotgrid-area-data-image no-repeat center center; - } - - .dx-icon-dimension { - background: $pivotgrid-dimension-image no-repeat center center; - } - - .dx-icon-hierarchy { - background: $pivotgrid-hierarchy-image no-repeat center center; - - &::before { - content: none; - } - } } diff --git a/packages/devextreme/scss/widgets/fluent/pivotGrid/_colors.scss b/packages/devextreme/scss/widgets/fluent/pivotGrid/_colors.scss index 5fdb1fb101ec..1783473a7dd1 100644 --- a/packages/devextreme/scss/widgets/fluent/pivotGrid/_colors.scss +++ b/packages/devextreme/scss/widgets/fluent/pivotGrid/_colors.scss @@ -21,7 +21,7 @@ $pivotgrid-data-area-color: $base-text-color !default; * $name 20. Totals background color * $type color */ -$pivotgrid-totalcolor: color.change(darken($pivotgrid-area-background, 13.3%), $alpha: 0.2) !default; +$pivotgrid-totalcolor: $base-neutral-background1 !default; /** * $name 30. Grand totals background color @@ -38,32 +38,5 @@ $pivotgrid-accent-color: $base-accent !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; -$pivotgrid-area-all-image: null !default; -$pivotgrid-area-filter-image: null !default; -$pivotgrid-area-column-image: null !default; -$pivotgrid-area-row-image: null !default; -$pivotgrid-area-data-image: null !default; -$pivotgrid-dimension-image: null !default; -$pivotgrid-hierarchy-image: null !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-chevron-icon-color: $pivotgrid-area-color !default; - -@if $mode == "light" { - $pivotgrid-area-all-image: data-uri('images/widgets/fluent/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/fluent/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/fluent/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/fluent/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/fluent/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/fluent/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/fluent/color-schemes/light/grid/hierarchy.png') !default; -} - -@if $mode == "dark" { - $pivotgrid-area-all-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/fluent/color-schemes/dark/grid/hierarchy.png') !default; -} diff --git a/packages/devextreme/scss/widgets/fluent/pivotGrid/_index.scss b/packages/devextreme/scss/widgets/fluent/pivotGrid/_index.scss index bb858ca04e80..25cb0e476a31 100644 --- a/packages/devextreme/scss/widgets/fluent/pivotGrid/_index.scss +++ b/packages/devextreme/scss/widgets/fluent/pivotGrid/_index.scss @@ -28,13 +28,6 @@ $pivotgrid-data-area-color: $pivotgrid-data-area-color, $pivotgrid-grandtotalcolor: $pivotgrid-grandtotalcolor, $pivotgrid-accent-color: $pivotgrid-accent-color, - $pivotgrid-area-all-image: $pivotgrid-area-all-image, - $pivotgrid-area-filter-image: $pivotgrid-area-filter-image, - $pivotgrid-area-row-image: $pivotgrid-area-row-image, - $pivotgrid-area-column-image: $pivotgrid-area-column-image, - $pivotgrid-area-data-image: $pivotgrid-area-data-image, - $pivotgrid-dimension-image: $pivotgrid-dimension-image, - $pivotgrid-hierarchy-image: $pivotgrid-hierarchy-image, $pivotgrid-empty-area-text-padding: $pivotgrid-empty-area-text-padding, $pivotgrid-button-top-padding: $pivotgrid-button-top-padding, ); @@ -76,16 +69,22 @@ $fluent-pivotgridfieldchooser-field-min-height: 36px; } } + &.dx-pivotgridfieldchooser { + .dx-area-field.dx-area-box { + border-radius: 4px; + } + } + .dx-sort-up { - @include dx-icon-sizing($fluent-base-icon-size) + @include dx-icon-sizing($fluent-button-icon-size) } .dx-sort-down { - @include dx-icon-sizing($fluent-base-icon-size) + @include dx-icon-sizing($fluent-button-icon-size) } .dx-header-filter { - @include dx-icon-sizing($fluent-base-icon-size) + @include dx-icon-sizing($fluent-button-icon-size) } } @@ -190,21 +189,19 @@ $fluent-pivotgridfieldchooser-field-min-height: 36px; .dx-pivotgridfieldchooser { background-color: $pivotgrid-area-background; - .dx-area { - .dx-area-icon-filter { - background: none; - - @include dx-icon(filter); - - width: 14px; - height: 14px; - } + .dx-area-icon { + width: $fluent-button-icon-size; + height: $fluent-button-icon-size; + font-size: $fluent-button-icon-size; + } + .dx-area { .dx-area-caption { text-transform: uppercase; font-size: $fluent-pivotgrid-headers-font-size; font-weight: 500; color: $pivotgrid-area-color; + vertical-align: middle; } .dx-area-fields { @@ -237,14 +234,15 @@ $fluent-pivotgridfieldchooser-field-min-height: 36px; .dx-treeview-item { min-height: $fluent-pivotgridfieldchooser-field-min-height; padding: 9px 8px; - line-height: normal; - } - .dx-treeview-item-with-checkbox { - .dx-checkbox { - top: 9px; + .dx-icon { + margin: 0 5px -1px 0; + + @include dx-icon-sizing($fluent-button-icon-size); } + } + .dx-treeview-item-with-checkbox { .dx-treeview-item { padding-left: $fluent-treeview-item-with-checkbox-offset; } diff --git a/packages/devextreme/scss/widgets/generic/pivotGrid/_colors.scss b/packages/devextreme/scss/widgets/generic/pivotGrid/_colors.scss index bad1beeed598..f6dc3fb384e7 100644 --- a/packages/devextreme/scss/widgets/generic/pivotGrid/_colors.scss +++ b/packages/devextreme/scss/widgets/generic/pivotGrid/_colors.scss @@ -35,13 +35,6 @@ $pivotgrid-accent-color: null !default; $pivotgrid-drag-header-border-color: null !default; $pivotgrid-drag-header-first-shadow-color: null !default; $pivotgrid-drag-header-second-shadow-color: null !default; -$pivotgrid-area-all-image: null !default; -$pivotgrid-area-filter-image: null !default; -$pivotgrid-area-column-image: null !default; -$pivotgrid-area-row-image: null !default; -$pivotgrid-area-data-image: null !default; -$pivotgrid-dimension-image: null !default; -$pivotgrid-hierarchy-image: null !default; $pivotgrid-position-indicator-color: null !default; /** @@ -59,13 +52,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/light/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: lighten($base-icon-color, 3%) !default; } @@ -78,13 +64,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: $base-border-color !default; $pivotgrid-drag-header-first-shadow-color: $base-shadow-color !default; $pivotgrid-drag-header-second-shadow-color: $base-shadow-color !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/contrast/grid/hierarchy.png') !default; $pivotgrid-field-area-text-color: $pivotgrid-area-color !default; $pivotgrid-position-indicator-color: $base-accent !default; $pivotgrid-spin-icon-color: $base-icon-color !default; @@ -99,13 +78,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/dark/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/dark/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: darken($base-icon-color, 38%) !default; } @@ -119,13 +91,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/dark/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/dark/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: $base-icon-color !default; } @@ -139,13 +104,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/dark/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/dark/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/dark/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: $base-header-color !default; } @@ -159,13 +117,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/light/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: $base-icon-color !default; } @@ -179,13 +130,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/light/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: lighten($base-icon-color, 38.5%) !default; } @@ -199,13 +143,6 @@ $pivotgrid-spin-icon-color: null !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; - $pivotgrid-area-all-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/generic/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/generic/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/generic/color-schemes/light/grid/hierarchy.png') !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-spin-icon-color: $base-icon-color !default; } diff --git a/packages/devextreme/scss/widgets/generic/pivotGrid/_index.scss b/packages/devextreme/scss/widgets/generic/pivotGrid/_index.scss index 0839f3a380ad..8eb2a270af55 100644 --- a/packages/devextreme/scss/widgets/generic/pivotGrid/_index.scss +++ b/packages/devextreme/scss/widgets/generic/pivotGrid/_index.scss @@ -27,13 +27,6 @@ $pivotgrid-data-area-color: $pivotgrid-data-area-color, $pivotgrid-grandtotalcolor: $pivotgrid-grandtotalcolor, $pivotgrid-accent-color: $pivotgrid-accent-color, - $pivotgrid-area-all-image: $pivotgrid-area-all-image, - $pivotgrid-area-filter-image: $pivotgrid-area-filter-image, - $pivotgrid-area-row-image: $pivotgrid-area-row-image, - $pivotgrid-area-column-image: $pivotgrid-area-column-image, - $pivotgrid-area-data-image: $pivotgrid-area-data-image, - $pivotgrid-dimension-image: $pivotgrid-dimension-image, - $pivotgrid-hierarchy-image: $pivotgrid-hierarchy-image, $pivotgrid-empty-area-text-padding: $pivotgrid-empty-area-text-padding, $pivotgrid-button-top-padding: $pivotgrid-button-top-padding, ); @@ -91,6 +84,24 @@ .dx-pivotgridfieldchooser { background-color: $pivotgrid-area-background; + + .dx-treeview-item .dx-icon { + margin: 0 5px -1px 0; + + @include dx-icon-sizing($generic-base-icon-size); + } + + .dx-area-icon { + width: $generic-base-icon-size; + height: $generic-base-icon-size; + font-size: $generic-base-icon-size; + } + + .dx-area { + .dx-area-caption { + vertical-align: middle; + } + } } .dx-pivotgrid-fields-container { diff --git a/packages/devextreme/scss/widgets/material/pivotGrid/_colors.scss b/packages/devextreme/scss/widgets/material/pivotGrid/_colors.scss index ef36d86e5e21..7c54008b0c8a 100644 --- a/packages/devextreme/scss/widgets/material/pivotGrid/_colors.scss +++ b/packages/devextreme/scss/widgets/material/pivotGrid/_colors.scss @@ -37,36 +37,13 @@ $pivotgrid-accent-color: $base-accent !default; $pivotgrid-drag-header-border-color: color.change($pivotgrid-accent-color, $alpha: 0.5) !default; $pivotgrid-drag-header-first-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default; $pivotgrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default; -$pivotgrid-area-all-image: null !default; -$pivotgrid-area-filter-image: null !default; -$pivotgrid-area-column-image: null !default; -$pivotgrid-area-row-image: null !default; -$pivotgrid-area-data-image: null !default; -$pivotgrid-dimension-image: null !default; -$pivotgrid-hierarchy-image: null !default; $pivotgrid-position-indicator-color: gray !default; $pivotgrid-chevron-icon-color: $pivotgrid-area-color !default; @if $mode == "light" { $pivotgrid-field-area-box-background-color: darken($base-bg, 12%) !default; - - $pivotgrid-area-all-image: data-uri('images/widgets/material/color-schemes/light/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/material/color-schemes/light/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/material/color-schemes/light/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/material/color-schemes/light/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/material/color-schemes/light/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/material/color-schemes/light/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/material/color-schemes/light/grid/hierarchy.png') !default; } @if $mode == "dark" { $pivotgrid-field-area-box-background-color: lighten($base-bg, 12%) !default; - - $pivotgrid-area-all-image: data-uri('images/widgets/material/color-schemes/dark/grid/area-all.png') !default; - $pivotgrid-area-filter-image: data-uri('images/widgets/material/color-schemes/dark/grid/area-filter.png') !default; - $pivotgrid-area-column-image: data-uri('images/widgets/material/color-schemes/dark/grid/area-column.png') !default; - $pivotgrid-area-row-image: data-uri('images/widgets/material/color-schemes/dark/grid/area-row.png') !default; - $pivotgrid-area-data-image: data-uri('images/widgets/material/color-schemes/dark/grid/area-data.png') !default; - $pivotgrid-dimension-image: data-uri('images/widgets/material/color-schemes/dark/grid/dimension.png') !default; - $pivotgrid-hierarchy-image: data-uri('images/widgets/material/color-schemes/dark/grid/hierarchy.png') !default; } diff --git a/packages/devextreme/scss/widgets/material/pivotGrid/_index.scss b/packages/devextreme/scss/widgets/material/pivotGrid/_index.scss index 1919429790f4..c0f63c0b0a1f 100644 --- a/packages/devextreme/scss/widgets/material/pivotGrid/_index.scss +++ b/packages/devextreme/scss/widgets/material/pivotGrid/_index.scss @@ -28,13 +28,6 @@ $pivotgrid-data-area-color: $pivotgrid-data-area-color, $pivotgrid-grandtotalcolor: $pivotgrid-grandtotalcolor, $pivotgrid-accent-color: $pivotgrid-accent-color, - $pivotgrid-area-all-image: $pivotgrid-area-all-image, - $pivotgrid-area-filter-image: $pivotgrid-area-filter-image, - $pivotgrid-area-row-image: $pivotgrid-area-row-image, - $pivotgrid-area-column-image: $pivotgrid-area-column-image, - $pivotgrid-area-data-image: $pivotgrid-area-data-image, - $pivotgrid-dimension-image: $pivotgrid-dimension-image, - $pivotgrid-hierarchy-image: $pivotgrid-hierarchy-image, $pivotgrid-empty-area-text-padding: $pivotgrid-empty-area-text-padding, $pivotgrid-button-top-padding: $pivotgrid-button-top-padding, ); @@ -177,21 +170,19 @@ $material-pivotgridfieldchooser-field-min-height: 36px; .dx-pivotgridfieldchooser { background-color: $pivotgrid-area-background; - .dx-area { - .dx-area-icon-filter { - background: none; - - @include dx-icon(filter); - - width: 14px; - height: 14px; - } + .dx-area-icon { + width: $material-button-icon-size; + height: $material-button-icon-size; + font-size: $material-button-icon-size; + } + .dx-area { .dx-area-caption { text-transform: uppercase; font-size: $material-pivotgrid-headers-font-size; font-weight: 500; color: $pivotgrid-area-color; + vertical-align: bottom; } .dx-area-fields { @@ -234,6 +225,12 @@ $material-pivotgridfieldchooser-field-min-height: 36px; .dx-treeview-item { padding-left: $material-treeview-item-with-checkbox-offset; + + .dx-icon { + margin: 0 5px 2px 0; + + @include dx-icon-sizing($material-button-icon-size); + } } } diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/etalons/PivotGrid contextmenu width (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/etalons/PivotGrid contextmenu width (material-blue-light).png index 71c73268da91..5cfef2f1ed3b 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/etalons/PivotGrid contextmenu width (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/etalons/PivotGrid contextmenu width (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (generic-light).png index 4865e5ca37d9..18821058d42c 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (material-blue-light).png index 1584f2f34d6e..ce5cbe2bfd9b 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with invisible fields (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (generic-light).png index 6bb378a72894..697a427abb54 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (material-blue-light).png index 1a3c6b330a6c..8e33e6acffdf 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with three invisible fields (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (generic-light).png index 4865e5ca37d9..18821058d42c 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (material-blue-light).png index 1584f2f34d6e..ce5cbe2bfd9b 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/FieldChooser change dataField order with two invisible fields (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (generic-light).png index 8d97a89290de..926fc6b138db 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (material-blue-light).png index d31886431b79..6991328f484f 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_bottom (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (generic-light).png index 71a4e3395a47..35d1b1a6c1d1 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (material-blue-light).png index 8cc9819e0a46..e715bf41f95e 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_left (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (generic-light).png index 96ccc628de8b..ce31d9ebe994 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (material-blue-light).png index 6a336e2feefa..f2f4c71f2388 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_right (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (generic-light).png index d877c3f59c84..420757e62e62 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (material-blue-light).png index 2cd52f913863..65ec6ec5123e 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_row-area-item_dnd_top (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (generic-light).png index 4f4e18157bc3..569b70c43859 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (material-blue-light).png index 75c8b80a65e2..86d208f95043 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_bottom (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (generic-light).png index ff2d071a29bd..3cb9e8e7e323 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (material-blue-light).png index c3b607937553..9068add39a21 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_left (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (generic-light).png index a6a31f2252ab..ebeceed3301e 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (material-blue-light).png index 8a18b5c136bc..e6a4587dadb4 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_right (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (generic-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (generic-light).png index 20987ee4346a..2056d002523c 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (generic-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (material-blue-light).png index a213aea3a627..4cf730fc66c8 100644 Binary files a/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/pivotGrid/fieldChooser/etalons/field-chooser_tree-item_dnd_top (material-blue-light).png differ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js index 34075bc9fc95..fb36a4d93919 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js @@ -333,13 +333,13 @@ QUnit.module('dxPivotGridFieldChooser', { { text: '[Measures]', key: '[Measures]', path: '[Measures]', selected: true, expanded: false, isMeasure: true, items: [ - { index: 5, field: fields[5], selected: true, text: 'Field 6', key: 'field6', isDefault: undefined, isMeasure: true, icon: 'measure' } + { index: 5, field: fields[5], selected: true, text: 'Field 6', key: 'field6', isDefault: undefined, isMeasure: true, icon: 'formula' } ] }, { text: 'Dimension 1', key: 'Dimension 1', path: 'Dimension 1', selected: true, expanded: false, isMeasure: false, items: [ - { index: 0, field: fields[0], text: 'Field 1', key: 'field1', selected: true, isDefault: undefined, isMeasure: false, icon: 'dimension' }, + { index: 0, field: fields[0], text: 'Field 1', key: 'field1', selected: true, isDefault: undefined, isMeasure: false, icon: 'detailslayout' }, { index: 1, field: fields[1], text: 'Field 2', key: 'field2', selected: true, isDefault: undefined, isMeasure: undefined, icon: undefined } ] },