Skip to content
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

Adding colors vscode-editorStickyScroll-border and vscode-editorStickyScroll-shadow #200239

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Adding colors vscode-editorStickyScroll-border and vscode-editorStickyScroll-shadow #200239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef33618
adding two more colors
aiday-mar Dec 7, 2023
52bffab
rewording text and making the border color null
aiday-mar Dec 8, 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
4 changes: 3 additions & 1 deletion build/lib/stylelint/vscode-known-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@
"--vscode-editorPane-background",
"--vscode-editorRuler-foreground",
"--vscode-editorStickyScroll-background",
"--vscode-editorStickyScroll-border",
"--vscode-editorStickyScroll-shadow",
"--vscode-editorStickyScrollHover-background",
"--vscode-editorSuggestWidget-background",
"--vscode-editorSuggestWidget-border",
Expand Down Expand Up @@ -795,4 +797,4 @@
"--zoom-factor",
"--test-bar-width"
]
}
}
7 changes: 3 additions & 4 deletions src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@
text-align: right;
}

.monaco-editor.hc-black .sticky-widget,
.monaco-editor.hc-light .sticky-widget {
border-bottom: 1px solid var(--vscode-contrastBorder);
.monaco-editor .sticky-widget {
border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
}

.monaco-editor .sticky-line-content:hover {
Expand All @@ -62,7 +61,7 @@

.monaco-editor .sticky-widget {
width: 100%;
box-shadow: var(--vscode-scrollbar-shadow) 0 3px 2px -2px;
box-shadow: var(--vscode-editorStickyScroll-shadow) 0 3px 2px -2px;
z-index: 4;
background-color: var(--vscode-editorStickyScroll-background);
}
Expand Down
6 changes: 4 additions & 2 deletions src/vs/platform/theme/common/colorRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,10 @@ export const editorForeground = registerColor('editor.foreground', { light: '#33
/**
* Sticky scroll
*/
export const editorStickyScrollBackground = registerColor('editorStickyScroll.background', { light: editorBackground, dark: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, nls.localize('editorStickyScrollBackground', "Sticky scroll background color for the editor"));
export const editorStickyScrollHoverBackground = registerColor('editorStickyScrollHover.background', { dark: '#2A2D2E', light: '#F0F0F0', hcDark: null, hcLight: Color.fromHex('#0F4A85').transparent(0.1) }, nls.localize('editorStickyScrollHoverBackground', "Sticky scroll on hover background color for the editor"));
export const editorStickyScrollBackground = registerColor('editorStickyScroll.background', { light: editorBackground, dark: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, nls.localize('editorStickyScrollBackground', "Background color of sticky scroll in the editor"));
export const editorStickyScrollHoverBackground = registerColor('editorStickyScrollHover.background', { dark: '#2A2D2E', light: '#F0F0F0', hcDark: null, hcLight: Color.fromHex('#0F4A85').transparent(0.1) }, nls.localize('editorStickyScrollHoverBackground', "Background color of sticky scroll on hover in the editor"));
export const editorStickyScrollBorder = registerColor('editorStickyScroll.border', { dark: null, light: null, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('editorStickyScrollBorder', "Border color of sticky scroll in the editor"));
export const editorStickyScrollShadow = registerColor('editorStickyScroll.shadow', { dark: scrollbarShadow, light: scrollbarShadow, hcDark: scrollbarShadow, hcLight: scrollbarShadow }, nls.localize('editorStickyScrollShadow', " Shadow color of sticky scroll in the editor"));

/**
* Editor widgets
Expand Down
Loading