diff --git a/src/vs/editor/contrib/folding/folding.css b/src/vs/editor/contrib/folding/folding.css index 79511b6c0c1f2..df8421ef9c843 100644 --- a/src/vs/editor/contrib/folding/folding.css +++ b/src/vs/editor/contrib/folding/folding.css @@ -3,47 +3,23 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.monaco-editor .margin-view-overlays .folding { +.monaco-editor .margin-view-overlays .codicon { cursor: pointer; - background-repeat: no-repeat; - background-origin: border-box; - background-position: calc(50% + 2px) center; - background-size: auto calc(100% - 3px); opacity: 0; transition: opacity 0.5s; + display: flex; + align-items: center; + justify-content: center; + font-size: 140%; + margin-left: 2px; } -.monaco-editor .margin-view-overlays .folding { - background-image: url('tree-expanded-light.svg'); -} - -.monaco-editor.hc-black .margin-view-overlays .folding, -.monaco-editor.vs-dark .margin-view-overlays .folding { - background-image: url('tree-expanded-dark.svg'); -} - -.monaco-editor.hc-black .margin-view-overlays .folding { - background-image: url('tree-expanded-hc.svg'); -} - -.monaco-editor .margin-view-overlays:hover .folding, -.monaco-editor .margin-view-overlays .folding.alwaysShowFoldIcons { - opacity: 1; -} - -.monaco-editor .margin-view-overlays .folding.collapsed { - background-image: url('tree-collapsed-light.svg'); +.monaco-editor .margin-view-overlays:hover .codicon, +.monaco-editor .margin-view-overlays .codicon.codicon-chevron-right, +.monaco-editor .margin-view-overlays .codicon.alwaysShowFoldIcons { opacity: 1; } -.monaco-editor.vs-dark .margin-view-overlays .folding.collapsed { - background-image: url('tree-collapsed-dark.svg'); -} - -.monaco-editor.hc-black .margin-view-overlays .folding.collapsed { - background-image: url('tree-collapsed-hc.svg'); -} - .monaco-editor .inline-folded:after { color: grey; margin: 0.1em 0.2em 0 0.2em; @@ -51,4 +27,4 @@ display: inline; line-height: 1em; cursor: pointer; -} \ No newline at end of file +} diff --git a/src/vs/editor/contrib/folding/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts index 4b55e86f6fa98..44554ac130061 100644 --- a/src/vs/editor/contrib/folding/foldingDecorations.ts +++ b/src/vs/editor/contrib/folding/foldingDecorations.ts @@ -13,17 +13,17 @@ export class FoldingDecorationProvider implements IDecorationProvider { private static COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({ stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, afterContentClassName: 'inline-folded', - linesDecorationsClassName: 'folding collapsed' + linesDecorationsClassName: 'codicon codicon-chevron-right' }); private static EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({ stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, - linesDecorationsClassName: 'folding' + linesDecorationsClassName: 'codicon codicon-chevron-down' }); private static EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({ stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, - linesDecorationsClassName: 'folding alwaysShowFoldIcons' + linesDecorationsClassName: 'codicon codicon-chevron-down alwaysShowFoldIcons' }); public autoHideFoldingControls: boolean = true; diff --git a/src/vs/editor/contrib/folding/tree-collapsed-dark.svg b/src/vs/editor/contrib/folding/tree-collapsed-dark.svg deleted file mode 100644 index 243be1451cc80..0000000000000 --- a/src/vs/editor/contrib/folding/tree-collapsed-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/editor/contrib/folding/tree-collapsed-hc.svg b/src/vs/editor/contrib/folding/tree-collapsed-hc.svg deleted file mode 100644 index 40ba72b70868a..0000000000000 --- a/src/vs/editor/contrib/folding/tree-collapsed-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/editor/contrib/folding/tree-collapsed-light.svg b/src/vs/editor/contrib/folding/tree-collapsed-light.svg deleted file mode 100644 index 0d746558a4fa9..0000000000000 --- a/src/vs/editor/contrib/folding/tree-collapsed-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/editor/contrib/folding/tree-expanded-dark.svg b/src/vs/editor/contrib/folding/tree-expanded-dark.svg deleted file mode 100644 index 5570923e1753a..0000000000000 --- a/src/vs/editor/contrib/folding/tree-expanded-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/editor/contrib/folding/tree-expanded-hc.svg b/src/vs/editor/contrib/folding/tree-expanded-hc.svg deleted file mode 100644 index b370009330c04..0000000000000 --- a/src/vs/editor/contrib/folding/tree-expanded-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/editor/contrib/folding/tree-expanded-light.svg b/src/vs/editor/contrib/folding/tree-expanded-light.svg deleted file mode 100644 index 939ebc8b96953..0000000000000 --- a/src/vs/editor/contrib/folding/tree-expanded-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -