Skip to content

Commit 4452e1b

Browse files
Update and remove unused CSS variables to match new style definition
This commit updates the CSS variables of the vscode-trace-extension to match the new CSS definition of the traceviewer-base package. This commit also removes CSS variables that are not used in both of the vscode and theia trace extensions. Signed-off-by: Hoang Thuan Pham <hoang.pham@calian.ca>
1 parent 6d04877 commit 4452e1b

File tree

2 files changed

+39
-46
lines changed

2 files changed

+39
-46
lines changed
Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
:root {
2-
--theia-layout-color0: #1d1d1d;
3-
--theia-layout-color1: #252526;
4-
--theia-layout-color2: #333333;
5-
--theia-layout-color3: #383838;
6-
--theia-layout-color4: #383838;
7-
--theia-list-hoverBackground: var(--vscode-list-hoverBackground);
8-
--theia-selection-background: var(--vscode-list-activeSelectionBackground);
9-
--theia-ui-font-color2: var(--vscode-editor-foreground);
10-
--theia-ui-button-color: var(--vscode-button-background);
11-
--theia-accent-color3: var(--vscode-button-background);
12-
--theia-menu-background: var(--vscode-menu-background);
13-
--theia-menu-foreground: var(--vscode-menu-foreground);
14-
--theia-menu-selectionBackground: var(--vscode-menubar-selectionBackground);
15-
--theia-menu-selectionForeground: var(--vscode-menubar-selectionForeground);
16-
--theia-menu-selectionBorder: var(--vscode-menubar-selectionBorder);
17-
--theia-widget-shadow: var(--vscode-widget-shadow);
18-
--theia-menu-border: var(--vscode-dropdown-border);
19-
--theia-ui-font-color0: var(--vscode-editor-foreground);
20-
--theia-editor-background: var(--vscode-editor-background);
21-
--theia-tree-inactiveIndentGuidesStroke: var(--vscode-tree-indentGuidesStroke);
22-
--theia-input-background: var(--vscode-input-background);
23-
--theia-input-placeholder-foreground: var(--vscode-input-placeholderForeground);
24-
--theia-ui-font-family: var(--vscode-editor-fontFamily);
25-
--theia-statusBar-background: var(--vscode-statusBar-background);
26-
--theia-statusBar-foreground: var(--vscode-statusBar-foreground);
27-
--theia-ui-font-size1: var(--vscode-font-size);
28-
--theia-editorWidget-background: var(--vscode-editorWidget-background);
29-
--theia-ui-padding: 6px;
30-
--trace-extension-list-line-height: 16px;
31-
--theia-secondaryButton-foreground: var(--vscode-input-background);
32-
--theia-layout-color4: var(--vscode-editorWidget-background);
33-
--theia-foreground: var(--vscode-editorWidget-foreground);
2+
/* vs-code variables */
343
--vscode-editor-foreground: var(--vscode-foreground);
35-
--theia-secondaryButton-foreground: var(--vscode-button-secondaryForeground);
36-
--theia-secondaryButton-background: var(--vscode-button-secondaryBackground);
37-
--theia-sideBar-foreground: var(--vscode-sideBarTitle-foreground);
4+
5+
/* mapped CSS variables from traceviewer-react-components */
6+
--trace-viewer-list-hoverBackground: var(--vscode-list-hoverBackground);
7+
--trace-viewer-selection-background: var(--vscode-list-activeSelectionBackground);
8+
--trace-viewer-ui-font-color2: var(--vscode-editor-foreground);
9+
--trace-viewer-ui-button-color: var(--vscode-button-background);
10+
--trace-viewer-menu-background: var(--vscode-menu-background);
11+
--trace-viewer-menu-foreground: var(--vscode-menu-foreground);
12+
--trace-viewer-menu-selectionBackground: var(--vscode-menubar-selectionBackground);
13+
--trace-viewer-menu-selectionForeground: var(--vscode-menubar-selectionForeground);
14+
--trace-viewer-menu-selectionBorder: var(--vscode-menubar-selectionBorder);
15+
--trace-viewer-widget-shadow: var(--vscode-widget-shadow);
16+
--trace-viewer-menu-border: var(--vscode-dropdown-border);
17+
--trace-viewer-ui-font-color0: var(--vscode-editor-foreground);
18+
--trace-viewer-editor-background: var(--vscode-editor-background);
19+
--trace-viewer-tree-inactiveIndentGuidesStroke: var(--vscode-tree-indentGuidesStroke);
20+
--trace-viewer-input-background: var(--vscode-input-background);
21+
--trace-viewer-input-placeholder-foreground: var(--vscode-input-placeholderForeground);
22+
--trace-viewer-ui-font-family: var(--vscode-editor-fontFamily);
23+
--trace-viewer-statusBar-background: var(--vscode-statusBar-background);
24+
--trace-viewer-statusBar-foreground: var(--vscode-statusBar-foreground);
25+
--trace-viewer-ui-font-size1: var(--vscode-font-size);
26+
--trace-viewer-editorWidget-background: var(--vscode-editorWidget-background);
27+
--trace-viewer-ui-padding: 6px;
28+
--trace-viewer-list-line-height: 16px;
29+
--trace-viewer-layout-color4: var(--vscode-editorWidget-background);
30+
--trace-viewer-foreground: var(--vscode-editorWidget-foreground);
3831
}

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8473,9 +8473,9 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
84738473
integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
84748474

84758475
timeline-chart@next:
8476-
version "0.3.0-next.20230419183309.9e0527f.0"
8477-
resolved "https://registry.yarnpkg.com/timeline-chart/-/timeline-chart-0.3.0-next.20230419183309.9e0527f.0.tgz#fcd6fe2b75d62c13a6f3d90c16ce250659e05383"
8478-
integrity sha512-vAjzxcubaLYeN3TXl9MQH3SYdFj2qedVPcOK/nnUE5iqE7oe8T9fcu3fSbV0E3g9hTh/VNo1gGk0KmKbMVMPFQ==
8476+
version "0.3.0-next.20230605172112.5d40c37.0"
8477+
resolved "https://registry.yarnpkg.com/timeline-chart/-/timeline-chart-0.3.0-next.20230605172112.5d40c37.0.tgz#331fce2968c573dff5fa107d4ac6e90a3519ad53"
8478+
integrity sha512-nbH1xV8hQMvTK/A5XXLfuOba5D/PGGxLcv4n80xNo1HzRsgWt/IQ3WWFg3vgb74npKGTfGY1C6OJnsJkevJ6wg==
84798479
dependencies:
84808480
"@types/lodash.throttle" "^4.1.4"
84818481
glob "^7.1.6"
@@ -8550,17 +8550,17 @@ tr46@~0.0.3:
85508550
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
85518551
integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
85528552

8553-
traceviewer-base@0.2.0-next.20230424153016.14a2611.0+14a2611, traceviewer-base@next:
8554-
version "0.2.0-next.20230424153016.14a2611.0"
8555-
resolved "https://registry.yarnpkg.com/traceviewer-base/-/traceviewer-base-0.2.0-next.20230424153016.14a2611.0.tgz#d1ffec51133fa89fa6fc54d44559f936a72389df"
8556-
integrity sha512-SEq50fX6OkDT2egfJ+zUmZQ9VPsWq9oUrmAigIoybww5V1tmN75MfhUNcRwvSGEyHJt+6gz0k8WUlI2v/B6PFQ==
8553+
traceviewer-base@0.2.0-next.20230530201437.d794599.0+d794599, traceviewer-base@next:
8554+
version "0.2.0-next.20230530201437.d794599.0"
8555+
resolved "https://registry.yarnpkg.com/traceviewer-base/-/traceviewer-base-0.2.0-next.20230530201437.d794599.0.tgz#e4a6f263dc2149c467037a7d9915498512fc94fc"
8556+
integrity sha512-/yO49yzgjYaMTYA6ef/hiSnh64d3/zhQM7sKerik/wlYbiKJo4mNk7iRtmnMO9+xrjXMk5DQC2SiGUuQF93IJg==
85578557
dependencies:
85588558
tsp-typescript-client next
85598559

85608560
traceviewer-react-components@next:
8561-
version "0.2.0-next.20230424153016.14a2611.0"
8562-
resolved "https://registry.yarnpkg.com/traceviewer-react-components/-/traceviewer-react-components-0.2.0-next.20230424153016.14a2611.0.tgz#b383770a6f3624f9baaebfd337187d2fdb95c6dd"
8563-
integrity sha512-0fqYILr7TbPbhoWHe6R6ULzPX9TEcNYCW3FajHYUZ38Z7KywqgQizd2JPEaVpKDxWlmHpZntNBfxxTOspCvhJA==
8561+
version "0.2.0-next.20230530201437.d794599.0"
8562+
resolved "https://registry.yarnpkg.com/traceviewer-react-components/-/traceviewer-react-components-0.2.0-next.20230530201437.d794599.0.tgz#823764fa37d0305815a7d6a72d2ad980b5704f4a"
8563+
integrity sha512-vwChLG1pXs3cwoRYFtum28e190x+0qiPpG/U1rWp0+gP0eqCqPkLPBOSJIbAXxe73gSVnNo9dtVdPklGGGTw5A==
85648564
dependencies:
85658565
"@fortawesome/fontawesome-svg-core" "^1.2.17"
85668566
"@fortawesome/free-solid-svg-icons" "^5.8.1"
@@ -8580,7 +8580,7 @@ traceviewer-react-components@next:
85808580
semantic-ui-css "^2.4.1"
85818581
semantic-ui-react "^0.86.0"
85828582
timeline-chart next
8583-
traceviewer-base "0.2.0-next.20230424153016.14a2611.0+14a2611"
8583+
traceviewer-base "0.2.0-next.20230530201437.d794599.0+d794599"
85848584
tsp-typescript-client next
85858585

85868586
trim-newlines@^1.0.0:

0 commit comments

Comments
 (0)