Skip to content

fix: adjust filter bar colour #1666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsmmcken merged 2 commits into from
Dec 5, 2023
Merged

fix: adjust filter bar colour #1666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b09b91
fix: adjust filter bar colour
dsmmcken Dec 4, 2023
277946e
hsl accent colours
dsmmcken Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/components/src/theme/theme-dark/theme-dark-semantic-grid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/* Row */
--dh-color-grid-row-0-bg: var(--dh-color-gray-300);
--dh-color-grid-row-1-bg: var(--dh-color-gray-100);
--dh-color-grid-row-hover-bg: var(--dh-color-highlight-hover);
--dh-color-grid-row-hover-bg: var(--dh-color-gray-400);
--dh-color-grid-row-hover-bg-selected: var(
--dh-color-highlight-selected-hover
);
Expand Down Expand Up @@ -49,12 +49,19 @@
--dh-color-grid-string-null: var(--dh-color-gray-600);

/* Filter Bar */
--dh-color-grid-filter-bar-active-bg: var(--dh-color-accent-300);
--dh-color-grid-filter-bar-active-bg: hsla(
var(--dh-color-accent-700-hsl),
0.5
);
--dh-color-grid-filter-bar-active: var(--dh-color-accent-600);
--dh-color-grid-filter-bar-expanded-bg: var(--dh-color-gray-200);
--dh-color-grid-filter-bar-expanded-active-bg: var(--dh-color-accent-100);
--dh-color-grid-filter-bar-expanded-active-cell-bg: var(
--dh-color-accent-200
--dh-color-grid-filter-bar-expanded-active-bg: hsla(
var(--dh-color-accent-1000-hsl),
0.19
);
--dh-color-grid-filter-bar-expanded-active-cell-bg: hsla(
var(--dh-color-accent-700-hsl),
0.32
);
--dh-color-grid-filter-bar-separator: var(--dh-color-gray-600);
--dh-color-grid-filter-bar-error: var(--dh-color-visual-negative);
Expand Down
15 changes: 15 additions & 0 deletions packages/components/src/theme/theme-dark/theme-dark-semantic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,21 @@
--dh-color-foreground-hsl: var(--dh-color-white-hsl);

--dh-color-accent-hsl: var(--dh-color-blue-600-hsl);
--dh-color-accent-100-hsl: var(--dh-color-blue-100-hsl);
Comment thread
dsmmcken marked this conversation as resolved.
--dh-color-accent-200-hsl: var(--dh-color-blue-200-hsl);
--dh-color-accent-300-hsl: var(--dh-color-blue-300-hsl);
--dh-color-accent-400-hsl: var(--dh-color-blue-400-hsl);
--dh-color-accent-500-hsl: var(--dh-color-blue-500-hsl);
--dh-color-accent-600-hsl: var(--dh-color-blue-600-hsl);
--dh-color-accent-700-hsl: var(--dh-color-blue-700-hsl);
--dh-color-accent-800-hsl: var(--dh-color-blue-800-hsl);
--dh-color-accent-900-hsl: var(--dh-color-blue-900-hsl);
--dh-color-accent-1000-hsl: var(--dh-color-blue-1000-hsl);
--dh-color-accent-1100-hsl: var(--dh-color-blue-1100-hsl);
--dh-color-accent-1200-hsl: var(--dh-color-blue-1200-hsl);
--dh-color-accent-1300-hsl: var(--dh-color-blue-1300-hsl);
--dh-color-accent-1400-hsl: var(--dh-color-blue-1400-hsl);

--dh-color-info-hsl: var(--dh-color-cyan-1000-hsl);
--dh-color-neutral-hsl: var(--dh-color-gray-500-hsl);
--dh-color-notice-hsl: var(--dh-color-yellow-1000-hsl);
Expand Down
24 changes: 20 additions & 4 deletions packages/iris-grid/src/FilterInputField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,29 @@
}

&.iris-grid-has-filter {
// same as filter-bar-expanded-active-bg
background: scale-color($primary, $saturation: -75%, $lightness: -60%);
// This is a hack to get the filter bar inputs to match the canvas rendered equivalent
// --dh-color-filter-bar-expanded-active-bg relies on transparency of being drawn overtop of
// the grid background. Since we can't do that here, we need to mimic the effect by stacking
// backgrounds using a single color linear gradients as a hack. Performance is not an issue
// since it only applies to the selected filter bar cell.
background: linear-gradient(
Comment thread
dsmmcken marked this conversation as resolved.
var(--dh-color-grid-filter-bar-expanded-active-bg) 100%,
var(--dh-color-grid-filter-bar-expanded-active-bg)
),
linear-gradient(var(--dh-color-grid-bg) 100%, var(--dh-color-grid-bg));
}

&.active {
//same as filter-bar-expanded-active-cell-bg
background: scale-color($primary, $saturation: -50%, $lightness: -40%);
// the canvas color to mimic here is based on the above, with yet another color stacked on top in
background: linear-gradient(
var(--dh-color-grid-filter-bar-expanded-active-cell-bg) 100%,
var(--dh-color-grid-filter-bar-expanded-active-cell-bg)
),
linear-gradient(
var(--dh-color-grid-filter-bar-expanded-active-bg) 100%,
var(--dh-color-grid-filter-bar-expanded-active-bg)
),
linear-gradient(var(--dh-color-grid-bg) 100%, var(--dh-color-grid-bg));
}

&:focus {
Expand Down
⚡