提交 9554695a 编写于 作者: M Martin Aeschlimann

Diff editor: avoid hardcoded modified-side shadow. Fixes #25625

上级 dcd784ee
...@@ -34,7 +34,7 @@ import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes'; ...@@ -34,7 +34,7 @@ import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes';
import Event, { Emitter } from 'vs/base/common/event'; import Event, { Emitter } from 'vs/base/common/event';
import * as editorOptions from 'vs/editor/common/config/editorOptions'; import * as editorOptions from 'vs/editor/common/config/editorOptions';
import { registerThemingParticipant, IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { registerThemingParticipant, IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
import { registerColor } from 'vs/platform/theme/common/colorRegistry'; import { registerColor, scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
import { Color, RGBA } from 'vs/base/common/color'; import { Color, RGBA } from 'vs/base/common/color';
import { OverviewRulerZone } from 'vs/editor/common/view/overviewZoneManager'; import { OverviewRulerZone } from 'vs/editor/common/view/overviewZoneManager';
import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer'; import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
...@@ -1979,4 +1979,8 @@ registerThemingParticipant((theme, collector) => { ...@@ -1979,4 +1979,8 @@ registerThemingParticipant((theme, collector) => {
if (removedOutline) { if (removedOutline) {
collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px dashed ${removedOutline}; }`); collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px dashed ${removedOutline}; }`);
} }
let shadow = theme.getColor(scrollbarShadow);
if (shadow) {
collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`);
}
}); });
\ No newline at end of file
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
.modified-in-monaco-diff-editor .slider.active { background: rgba(171, 171, 171, .4); } .modified-in-monaco-diff-editor .slider.active { background: rgba(171, 171, 171, .4); }
.modified-in-monaco-diff-editor.hc-black .slider.active { background: none; } .modified-in-monaco-diff-editor.hc-black .slider.active { background: none; }
.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px #DDD; }
.monaco-diff-editor.side-by-side.vs-dark .editor.modified { box-shadow: -6px 0 5px -5px black; }
/* ---------- Diff ---------- */ /* ---------- Diff ---------- */
.monaco-editor .insert-sign, .monaco-editor .delete-sign { .monaco-editor .insert-sign, .monaco-editor .delete-sign {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册