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

Jump to bottom

make collapsedText theme-able #173203

Merged
merged 6 commits into from
Jun 25, 2024
Merged

make collapsedText theme-able #173203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5163976
make collapsedText theme-able
mtbaqer Feb 2, 2023
5371262
Merge branch 'main' into make-collapsed-text-theme-able
aeschli Jun 5, 2024
f4534bd
Merge branch 'main' into pr/mtbaqer/173203
aeschli Jun 25, 2024
6a2f2c5
add to known variables
aeschli Jun 25, 2024
e897e8e
Merge branch 'main' into make-collapsed-text-theme-able
aeschli Jun 25, 2024
50c7681
fix merge
aeschli Jun 25, 2024
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
1 change: 1 addition & 0 deletions build/lib/stylelint/vscode-known-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
"--vscode-dropdown-foreground",
"--vscode-dropdown-listBackground",
"--vscode-editor-background",
"--vscode-editor-collapsedText",
"--vscode-editor-findMatchBackground",
"--vscode-editor-findMatchBorder",
"--vscode-editor-findMatchForeground",
Expand Down
3 changes: 1 addition & 2 deletions src/vs/editor/contrib/folding/browser/folding.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

.monaco-editor .inline-folded:after {
color: grey;
color: var(--vscode-editor-collapsedText);
margin: 0.1em 0.2em 0 0.2em;
content: "\22EF"; /* ellipses unicode character */
display: inline;
Expand All @@ -49,4 +49,3 @@
.monaco-editor .cldr.codicon.codicon-folding-manual-collapsed {
color: var(--vscode-editorGutter-foldingControlForeground) !important;
}

1 change: 1 addition & 0 deletions src/vs/editor/contrib/folding/browser/foldingDecorations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { themeColorFromId } from 'vs/platform/theme/common/themeService';
import { ThemeIcon } from 'vs/base/common/themables';

const foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize('foldBackgroundBackground', "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
registerColor('editor.collapsedText', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize('collapsedTextColor', "Color of the collapsed text after the first line of a folded range."));
registerColor('editorGutter.foldingControlForeground', iconForeground, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));

export const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize('foldingExpandedIcon', 'Icon for expanded ranges in the editor glyph margin.'));
Expand Down
Loading