Skip to content

feat(data-grid): use codicon chevrons for group and tree controls #820

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

Draft
lukecotter wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(data-grid): use codicon chevrons for group and tree controls #820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 69 additions & 0 deletions log-viewer/src/tabulator/style/DataGrid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ $footerBorderColor: transparent; //footer border color
$footerSeparatorColor: transparent; //footer bottom separator color
$footerActiveColor: #d00 !default; //footer bottom active text color

$codicon-chevron-right: '\eab6';
$codicon-chevron-down: '\eab4';

@mixin codicon-chevron {
font-family: 'codicon';
font-size: 14px;
line-height: 16px;
}

// Demote upstream tabulator styles (and our scss-mixin partials that build
// on them) into a cascade layer so any unlayered rule — at any specificity —
// wins. The neutralising overrides for upstream's hard-coded colours go
Expand Down Expand Up @@ -97,6 +106,27 @@ $footerActiveColor: #d00 !default; //footer bottom active text color
background-color: $rowHoverBackground;
}

.tabulator-arrow {
width: 16px;
height: 16px;
margin-right: 4px;
border: none;
text-align: center;

&::before {
@include codicon-chevron;
content: $codicon-chevron-right;
}
}

&.tabulator-group-visible .tabulator-arrow {
border: none; // override upstream's more-specific expanded-state border

&::before {
content: $codicon-chevron-down;
}
}

// Neutralise upstream `.tabulator-row.tabulator-group span { color: #d00 }`
// so plain text in group headers inherits the theme foreground. Lives in
// the same layer as the rule it's overriding — that keeps it out of the
Expand All @@ -108,6 +138,45 @@ $footerActiveColor: #d00 !default; //footer bottom active text color
}
}

.tabulator-row .tabulator-cell .tabulator-data-tree-control {
height: 16px;
width: 16px;
margin-right: 0;
border: none;
border-radius: 0;
background: transparent;
text-indent: 0; // cancel the name cell's hanging indent so the glyph stays in the control box

@media (hover: hover) and (pointer: fine) {
&:hover {
background: transparent;
}
}

.tabulator-data-tree-control-expand,
.tabulator-data-tree-control-collapse {
height: auto;
width: auto;
background: transparent;

&::after {
content: none;
}

&::before {
@include codicon-chevron;
}
}

.tabulator-data-tree-control-expand::before {
content: $codicon-chevron-right;
}

.tabulator-data-tree-control-collapse::before {
content: $codicon-chevron-down;
}
}

.datagrid-code-text {
font-family: monospace;
font-weight: var(--vscode-font-weight, normal);
Expand Down