diff --git a/projects/angular/src/data/datagrid/_datagrid.clarity.scss b/projects/angular/src/data/datagrid/_datagrid.clarity.scss index d6d3cc20ea..abfb2e37cb 100644 --- a/projects/angular/src/data/datagrid/_datagrid.clarity.scss +++ b/projects/angular/src/data/datagrid/_datagrid.clarity.scss @@ -1207,31 +1207,71 @@ display: flex; align-items: center; - &.active { - .column-toggle--action { - cds-icon, - clr-icon { - @include css-var(color, clr-color-action-600, $clr-color-action-600, $clr-use-custom-properties); - } - } - } - .column-toggle--action { // I'm overriding .btn/.btn-link here but am not confident this is the correct way to do it. min-width: $clr_baselineRem_0_75; - padding-left: 0; - padding-right: 0; - - cds-icon, - clr-icon { - @include css-var(color, clr-color-neutral-600, $clr-color-neutral-600, $clr-use-custom-properties); - } + padding-left: $clr_baselineRem_6px; + padding-right: $clr_baselineRem_6px; + text-transform: capitalize; + @include css-var( + border-color, + clr-datagrid-column-toggle-border-color, + $clr-datagrid-column-toggle-border-color, + $clr-use-custom-properties + ); + @include css-var( + background-color, + clr-datagrid-column-toggle-fill-color, + $clr-datagrid-column-toggle-fill-color, + $clr-use-custom-properties + ); + @include css-var( + color, + clr-datagrid-column-toggle-text-color, + $clr-datagrid-column-toggle-text-color, + $clr-use-custom-properties + ); &:hover { - cds-icon, - clr-icon { - @include css-var(color, clr-color-action-600, $clr-color-action-600, $clr-use-custom-properties); - } + @include css-var( + border-color, + clr-datagrid-column-toggle-border-hover-color, + $clr-datagrid-column-toggle-border-hover-color, + $clr-use-custom-properties + ); + @include css-var( + background-color, + clr-datagrid-column-toggle-fill-hover-color, + $clr-datagrid-column-toggle-fill-hover-color, + $clr-use-custom-properties + ); + @include css-var( + color, + clr-datagrid-column-toggle-text-hover-color, + $clr-datagrid-column-toggle-text-hover-color, + $clr-use-custom-properties + ); + } + &:active { + box-shadow: none; + @include css-var( + border-color, + clr-datagrid-column-toggle-border-active-color, + $clr-datagrid-column-toggle-border-active-color, + $clr-use-custom-properties + ); + @include css-var( + background-color, + clr-datagrid-column-toggle-fill-active-color, + $clr-datagrid-column-toggle-fill-active-color, + $clr-use-custom-properties + ); + @include css-var( + color, + clr-datagrid-column-toggle-text-active-color, + $clr-datagrid-column-toggle-text-active-color, + $clr-use-custom-properties + ); } } diff --git a/projects/angular/src/data/datagrid/_properties.datagrid.scss b/projects/angular/src/data/datagrid/_properties.datagrid.scss index b7d143ac26..9361cf1553 100644 --- a/projects/angular/src/data/datagrid/_properties.datagrid.scss +++ b/projects/angular/src/data/datagrid/_properties.datagrid.scss @@ -39,6 +39,16 @@ --clr-datagrid-placeholder-font-size: #{$clr-h5-font-size}; --clr-datagrid-pagination-btn-disabled-opacity: #{$clr-datagrid-pagination-btn-disabled-opacity}; + + --clr-datagrid-column-toggle-border-color: var(--clr-color-neutral-600); + --clr-datagrid-column-toggle-fill-color: var(--clr-color-neutral-50); + --clr-datagrid-column-toggle-text-color: var(--clr-color-neutral-700); + --clr-datagrid-column-toggle-border-hover-color: var(--clr-color-neutral-700); + --clr-datagrid-column-toggle-fill-hover-color: var(--clr-color-neutral-0); + --clr-datagrid-column-toggle-text-hover-color: var(--clr-color-neutral-1000); + --clr-datagrid-column-toggle-border-active-color: var(--clr-color-neutral-700); + --clr-datagrid-column-toggle-fill-active-color: var(--clr-color-neutral-100); + --clr-datagrid-column-toggle-text-active-color: var(--clr-color-neutral-700); } } } diff --git a/projects/angular/src/data/datagrid/_variables.datagrid.scss b/projects/angular/src/data/datagrid/_variables.datagrid.scss index f977bd8062..0f282ad09c 100644 --- a/projects/angular/src/data/datagrid/_variables.datagrid.scss +++ b/projects/angular/src/data/datagrid/_variables.datagrid.scss @@ -41,3 +41,14 @@ $clr-datagrid-detail-caret-icon-open-icon-color: $clr-color-neutral-0; // Placeholder $clr-datagrid-placeholder-color: $clr-color-neutral-500 !default; $clr-datagrid-placeholder-font-size: $clr-h5-font-size !default; + +// Column Toggle +$clr-datagrid-column-toggle-border-color: $clr-color-neutral-600 !default; +$clr-datagrid-column-toggle-fill-color: $clr-color-neutral-50 !default; +$clr-datagrid-column-toggle-text-color: $clr-color-neutral-700 !default; +$clr-datagrid-column-toggle-border-hover-color: $clr-color-neutral-700 !default; +$clr-datagrid-column-toggle-fill-hover-color: $clr-color-neutral-0 !default; +$clr-datagrid-column-toggle-text-hover-color: $clr-color-neutral-1000 !default; +$clr-datagrid-column-toggle-border-active-color: $clr-color-neutral-700 !default; +$clr-datagrid-column-toggle-fill-active-color: $clr-color-neutral-100 !default; +$clr-datagrid-column-toggle-text-active-color: $clr-color-neutral-700 !default; diff --git a/projects/angular/src/data/datagrid/datagrid-column-toggle.ts b/projects/angular/src/data/datagrid/datagrid-column-toggle.ts index 082508c7d2..3c256a710a 100644 --- a/projects/angular/src/data/datagrid/datagrid-column-toggle.ts +++ b/projects/angular/src/data/datagrid/datagrid-column-toggle.ts @@ -28,15 +28,14 @@ import { ColumnsService } from './providers/columns.service';