From a00da70842d5c63c4c9f9d8265ec02d0a548ac57 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 19 Feb 2023 13:20:36 -0500 Subject: [PATCH] Adds theme colors for the new Graph features --- package.json | 160 ++++++++++++++++++++++++++++++++ src/webviews/apps/plus/graph/graph.scss | 47 ++++------ 2 files changed, 177 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 654d7f0..ff8a472 100644 --- a/package.json +++ b/package.json @@ -4233,6 +4233,166 @@ "dark": "#2ece9d", "highContrast": "#2ece9d" } + }, + { + "id": "gitlens.graphChangesColumnAddedColor", + "description": "Specifies the color for denoting lines added in the _Changes_ column on the _Commit Graph_", + "defaults": { + "light": "#2da44e", + "highContrastLight": "#2da44e", + "dark": "#347d39", + "highContrast": "#347d39" + } + }, + { + "id": "gitlens.graphChangesColumnDeletedColor", + "description": "Specifies the color for denoting lines deleted in the _Changes_ column on the _Commit Graph_", + "defaults": { + "light": "#cf222e", + "highContrastLight": "#cf222e", + "dark": "#c93c37", + "highContrast": "#c93c37" + } + }, + { + "id": "gitlens.graphMinimapMarkerHeadColor", + "description": "Specifies the color marking HEAD on the minimap of the _Commit Graph_", + "defaults": { + "light": "#04c814", + "highContrastLight": "#04c814", + "dark": "#05e617", + "highContrast": "#05e617" + } + }, + { + "id": "gitlens.graphScrollMarkerHeadColor", + "description": "Specifies the color marking HEAD on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#04c814", + "highContrastLight": "#04c814", + "dark": "#05e617", + "highContrast": "#05e617" + } + }, + { + "id": "gitlens.graphMinimapMarkerUpstreamColor", + "description": "Specifies the color marking HEAD's upstream on the minimap of the _Commit Graph_", + "defaults": { + "light": "#8cd993", + "highContrastLight": "#8cd993", + "dark": "#09ae17", + "highContrast": "#09ae17" + } + }, + { + "id": "gitlens.graphScrollMarkerUpstreamColor", + "description": "Specifies the color marking HEAD's upstream on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#8cd993", + "highContrastLight": "#8cd993", + "dark": "#09ae17", + "highContrast": "#09ae17" + } + }, + { + "id": "gitlens.graphMinimapMarkerHighlightsColor", + "description": "Specifies the color marking highlights (matches) on the minimap of the _Commit Graph_", + "defaults": { + "light": "#f5cc00", + "highContrastLight": "#f5cc00", + "dark": "#fbff0a", + "highContrast": "#fbff0a" + } + }, + { + "id": "gitlens.graphScrollMarkerHighlightsColor", + "description": "Specifies the color marking highlights (matches) on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#f5cc00", + "highContrastLight": "#f5cc00", + "dark": "#fbff0a", + "highContrast": "#fbff0a" + } + }, + { + "id": "gitlens.graphMinimapMarkerLocalBranchesColor", + "description": "Specifies the color marking local branches on the minimap of the _Commit Graph_", + "defaults": { + "light": "#3095e8", + "highContrastLight": "#3095e8", + "dark": "#3087cf", + "highContrast": "#3087cf" + } + }, + { + "id": "gitlens.graphScrollMarkerLocalBranchesColor", + "description": "Specifies the color marking local branches on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#3095e8", + "highContrastLight": "#3095e8", + "dark": "#3087cf", + "highContrast": "#3087cf" + } + }, + { + "id": "gitlens.graphMinimapMarkerRemoteBranchesColor", + "description": "Specifies the color marking remote branches on the minimap of the _Commit Graph_", + "defaults": { + "light": "#67ace4", + "highContrastLight": "#67ace4", + "dark": "#2b5e88", + "highContrast": "#2b5e88" + } + }, + { + "id": "gitlens.graphScrollMarkerRemoteBranchesColor", + "description": "Specifies the color marking remote branches on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#67ace4", + "highContrastLight": "#67ace4", + "dark": "#2b5e88", + "highContrast": "#2b5e88" + } + }, + { + "id": "gitlens.graphMinimapMarkerStashesColor", + "description": "Specifies the color marking stashes on the minimap of the _Commit Graph_", + "defaults": { + "light": "#e467e4", + "highContrastLight": "#e467e4", + "dark": "#b34db3", + "highContrast": "#b34db3" + } + }, + { + "id": "gitlens.graphScrollMarkerStashesColor", + "description": "Specifies the color marking stashes on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#e467e4", + "highContrastLight": "#e467e4", + "dark": "#b34db3", + "highContrast": "#b34db3" + } + }, + { + "id": "gitlens.graphMinimapMarkerTagsColor", + "description": "Specifies the color marking tags on the minimap of the _Commit Graph_", + "defaults": { + "light": "#d2a379", + "highContrastLight": "#d2a379", + "dark": "#6b562e", + "highContrast": "#6b562e" + } + }, + { + "id": "gitlens.graphScrollMarkerTagsColor", + "description": "Specifies the color marking tags on the scrollbar of the _Commit Graph_", + "defaults": { + "light": "#d2a379", + "highContrastLight": "#d2a379", + "dark": "#6b562e", + "highContrast": "#6b562e" + } } ], "commands": [ diff --git a/src/webviews/apps/plus/graph/graph.scss b/src/webviews/apps/plus/graph/graph.scss index 6d12aa9..c39fb0e 100644 --- a/src/webviews/apps/plus/graph/graph.scss +++ b/src/webviews/apps/plus/graph/graph.scss @@ -47,48 +47,37 @@ body { --color-graph-text-secondary: var(--color-graph-text-selected); --color-graph-text-disabled: var(--color-graph-text-selected); - --color-graph-stats-added: var(--vscode-gitDecoration-addedResourceForeground); - --color-graph-stats-deleted: var(--vscode-gitDecoration-deletedResourceForeground); + --color-graph-stats-added: var(--vscode-gitlens-graphChangesColumnAddedColor); + --color-graph-stats-deleted: var(--vscode-gitlens-graphChangesColumnDeletedColor); --color-graph-stats-files: var(--vscode-gitDecoration-modifiedResourceForeground); --color-graph-minimap-line0: var(--vscode-progressBar-background); --color-graph-minimap-focusLine: var(--vscode-foreground); --color-graph-minimap-visibleAreaBackground: var(--vscode-scrollbarSlider-background); - --color-graph-scroll-marker-head: hsl(125, 96%, 46%); - --color-graph-scroll-marker-highlights: hsl(61, 100%, 52%); - --color-graph-scroll-marker-local-branches: hsl(207, 62%, 50%); - --color-graph-scroll-marker-remote-branches: hsl(207, 52%, 35%); - --color-graph-scroll-marker-stashes: hsl(300, 40%, 50%); - --color-graph-scroll-marker-tags: hsl(39, 40%, 30%); - --color-graph-scroll-marker-upstream: hsl(125, 90%, 36%); - --color-graph-minimap-marker-upstream: hsl(125, 90%, 36%); - - &.vscode-light, - &.vscode-high-contrast-light { - --color-graph-scroll-marker-head: hsl(125, 96%, 40%); - --color-graph-scroll-marker-highlights: hsl(50, 100%, 48%); - --color-graph-scroll-marker-local-branches: hsl(207, 80%, 55%); - --color-graph-scroll-marker-remote-branches: hsl(207, 70%, 65%); - --color-graph-scroll-marker-stashes: hsl(300, 70%, 65%); - --color-graph-scroll-marker-tags: hsl(28, 50%, 65%); - --color-graph-scroll-marker-upstream: hsl(125, 50%, 70%); - --color-graph-minimap-marker-upstream: hsl(125, 50%, 70%); - } - - --color-graph-minimap-marker-head: var(--color-graph-scroll-marker-head); + --color-graph-minimap-marker-head: var(--vscode-gitlens-graphMinimapMarkerHeadColor); + --color-graph-scroll-marker-head: var(--vscode-gitlens-graphScrollMarkerHeadColor); + --color-graph-minimap-marker-upstream: var(--vscode-gitlens-graphMinimapMarkerUpstreamColor); + --color-graph-scroll-marker-upstream: var(--vscode-gitlens-graphScrollMarkerUpstreamColor); + --color-graph-minimap-marker-highlights: var(--vscode-gitlens-graphMinimapMarkerHighlightsColor); + --color-graph-scroll-marker-highlights: var(--vscode-gitlens-graphScrollMarkerHighlightsColor); + --color-graph-minimap-marker-local-branches: var(--vscode-gitlens-graphMinimapMarkerLocalBranchesColor); + --color-graph-scroll-marker-local-branches: var(--vscode-gitlens-graphScrollMarkerLocalBranchesColor); + --color-graph-minimap-marker-remote-branches: var(--vscode-gitlens-graphMinimapMarkerRemoteBranchesColor); + --color-graph-scroll-marker-remote-branches: var(--vscode-gitlens-graphScrollMarkerRemoteBranchesColor); + --color-graph-minimap-marker-stashes: var(--vscode-gitlens-graphMinimapMarkerStashesColor); + --color-graph-scroll-marker-stashes: var(--vscode-gitlens-graphScrollMarkerStashesColor); + --color-graph-minimap-marker-tags: var(--vscode-gitlens-graphMinimapMarkerTagsColor); + --color-graph-scroll-marker-tags: var(--vscode-gitlens-graphScrollMarkerTagsColor); + --color-graph-minimap-tip-headBackground: var(--color-graph-scroll-marker-head); --color-graph-minimap-tip-headBorder: var(--color-graph-scroll-marker-head); --color-graph-minimap-tip-headForeground: var(--vscode-editor-foreground, var(--vscode-foreground)); - --color-graph-minimap-marker-highlights: var(--color-graph-scroll-marker-highlights); - - --color-graph-minimap-marker-local-branches: var(--color-graph-scroll-marker-local-branches); --color-graph-minimap-tip-branchBackground: var(--color-graph-scroll-marker-local-branches); --color-graph-minimap-tip-branchBorder: var(--color-graph-scroll-marker-local-branches); --color-graph-minimap-tip-branchForeground: var(--vscode-editor-foreground, var(--vscode-foreground)); - --color-graph-minimap-marker-remote-branches: var(--color-graph-scroll-marker-remote-branches); --color-graph-minimap-tip-remoteBackground: var(--color-graph-scroll-marker-remote-branches); --color-graph-minimap-tip-remoteBorder: var(--color-graph-scroll-marker-remote-branches); --color-graph-minimap-tip-remoteForeground: var(--vscode-editor-foreground, var(--vscode-foreground)); @@ -96,12 +85,10 @@ body { --color-graph-scroll-marker-selection: var(--vscode-editorCursor-foreground); --color-graph-minimap-marker-selection: var(--color-graph-scroll-marker-selection); - --color-graph-minimap-marker-stashes: var(--color-graph-scroll-marker-stashes); --color-graph-minimap-tip-stashBackground: var(--color-graph-scroll-marker-stashes); --color-graph-minimap-tip-stashBorder: var(--color-graph-scroll-marker-stashes); --color-graph-minimap-tip-stashForeground: var(--vscode-editor-foreground, var(--vscode-foreground)); - --color-graph-minimap-marker-tags: var(--color-graph-scroll-marker-tags); --color-graph-minimap-tip-tagBackground: var(--color-graph-scroll-marker-tags); --color-graph-minimap-tip-tagBorder: var(--color-graph-scroll-marker-tags); --color-graph-minimap-tip-tagForeground: var(--vscode-editor-foreground, var(--vscode-foreground));