diff --git a/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_index.scss b/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_index.scss index 2aac04c12df..86cc54af372 100644 --- a/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_index.scss +++ b/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_index.scss @@ -13,9 +13,19 @@ padding: ($cardview-header-item-padding-vertical - $cardview-header-item-border-width) $cardview-header-item-padding-horizontal; min-width: fit-content; user-select: none; + display: grid; + grid-auto-flow: column; + align-self: center; + gap: 5px; &:hover { background-color: $cardview-header-item-hovered-background-color; border: solid $cardview-header-item-border-width $cardview-header-item-hovered-border-color; } } + +.dx-cardview-header-item-sorting { + display: grid; + grid-auto-flow: column; + align-self: center; +} diff --git a/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_variables.scss b/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_variables.scss index 8dfadf79f82..1ef277cc885 100644 --- a/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_variables.scss +++ b/packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_variables.scss @@ -6,5 +6,5 @@ $cardview-header-item-hovered-border-color: null !default; $cardview-header-item-border-width: null !default; $cardview-header-item-border-radius: null !default; -$cardview-header-item-padding-horizontal: 12px !default; +$cardview-header-item-padding-horizontal: 8px !default; $cardview-header-item-padding-vertical: 6px !default; diff --git a/packages/devextreme/js/__internal/grids/new/card_view/header_panel/item.tsx b/packages/devextreme/js/__internal/grids/new/card_view/header_panel/item.tsx index caaa0e80e0e..87f87b82046 100644 --- a/packages/devextreme/js/__internal/grids/new/card_view/header_panel/item.tsx +++ b/packages/devextreme/js/__internal/grids/new/card_view/header_panel/item.tsx @@ -10,6 +10,7 @@ export const CLASSES = { container: 'dx-cardview-header-item-sorting', order: 'dx-cardview-header-item-sorting-order', }, + icon: 'dx-icon', }; // TODO: extract icons to separate component @@ -26,8 +27,8 @@ const ICONS = { ), - sortUp: , - sortDown: , + sortUp:
, + sortDown:
, }; interface SortIconProps { @@ -38,17 +39,17 @@ interface SortIconProps { function SortIcon(props: SortIconProps): JSX.Element { return ( - +
{props.sortOrder === 'asc' && ICONS.sortUp} {props.sortOrder === 'desc' && ICONS.sortDown} { props.showSortIndex && ( - +
{props.sortIndex} - +
) } -
+
); }