提交 cdf32b2c 编写于 作者: R Rob Lourens

Settings editor - replace selection indicator bar with outline. Also fix header margin

上级 fcbf17e4
...@@ -4,15 +4,16 @@ ...@@ -4,15 +4,16 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
.settings-editor { .settings-editor {
padding: 11px 0px 0px 27px; padding-top: 11px;
margin: auto; margin: auto;
} }
/* header styling */ /* header styling */
.settings-editor > .settings-header { .settings-editor > .settings-header {
padding: 0px 10px 0px 0px; padding-left: 15px;
padding-right: 5px;
max-width: 800px; max-width: 800px;
box-sizing: border-box;
margin: auto; margin: auto;
} }
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
white-space: nowrap; white-space: nowrap;
margin-right: 10px; margin-right: 10px;
margin-left: 2px; margin-left: 2px;
opacity: 0.7;
} }
.settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper { .settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper {
...@@ -129,16 +131,6 @@ ...@@ -129,16 +131,6 @@
min-height: 75px; min-height: 75px;
} }
.settings-editor > .settings-body > .settings-tree-container .monaco-tree-row .content::before {
content: ' ';
display: inline-block;
position: absolute;
width: 5px;
left: -9px;
top: 2px;
bottom: 10px;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.odd:not(.focused):not(.selected):not(:hover), .settings-editor > .settings-body > .settings-tree-container .setting-item.odd:not(.focused):not(.selected):not(:hover),
.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(:focus) .setting-item.focused.odd:not(.selected):not(:hover), .settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(:focus) .setting-item.focused.odd:not(.selected):not(:hover),
.settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(.focused) .setting-item.focused.odd:not(.selected):not(:hover) { .settings-editor > .settings-body > .settings-tree-container .monaco-tree:not(.focused) .setting-item.focused.odd:not(.selected):not(:hover) {
...@@ -153,7 +145,7 @@ ...@@ -153,7 +145,7 @@
.settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-right { .settings-editor > .settings-body > .settings-tree-container .setting-item > .setting-item-right {
min-width: 180px; min-width: 180px;
margin: 21px 10px 0px; margin: 21px 10px 0px 5px;
} }
.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title { .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-title {
...@@ -184,14 +176,6 @@ ...@@ -184,14 +176,6 @@
opacity: 0.7; opacity: 0.7;
} }
.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-key {
margin-left: 10px;
font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
font-size: 90%;
opacity: 0.8;
display: none;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description { .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-description {
opacity: 0.7; opacity: 0.7;
margin-top: 3px; margin-top: 3px;
...@@ -229,20 +213,6 @@ ...@@ -229,20 +213,6 @@
height: 26px; height: 26px;
} }
.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-value-checkbox {
position: relative;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-value-checkbox::after {
content: ' ';
display: block;
height: 3px;
width: 18px;
position: absolute;
top: 15px;
left: -3px;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-reset-button.monaco-button { .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-reset-button.monaco-button {
text-align: left; text-align: left;
display: block; display: block;
...@@ -293,10 +263,6 @@ ...@@ -293,10 +263,6 @@
overflow: visible; overflow: visible;
} }
.settings-editor .settings-body {
margin-left: -15px;
}
.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label { .settings-editor > .settings-body > .settings-tree-container .settings-group-title-label {
margin: 0px; margin: 0px;
padding: 5px 0px; padding: 5px 0px;
......
...@@ -21,7 +21,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti ...@@ -21,7 +21,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { WorkbenchTree } from 'vs/platform/list/browser/listService'; import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { ILogService } from 'vs/platform/log/common/log'; import { ILogService } from 'vs/platform/log/common/log';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry'; import { editorBackground, foreground, listActiveSelectionBackground, listInactiveSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
import { attachButtonStyler, attachStyler } from 'vs/platform/theme/common/styler'; import { attachButtonStyler, attachStyler } from 'vs/platform/theme/common/styler';
import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
...@@ -215,14 +215,14 @@ export class SettingsEditor2 extends BaseEditor { ...@@ -215,14 +215,14 @@ export class SettingsEditor2 extends BaseEditor {
}); });
this._register(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { this._register(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
const activeListBackground = theme.getColor('list.activeSelectionBackground'); const activeBorderColor = theme.getColor(listActiveSelectionBackground);
if (activeListBackground) { if (activeBorderColor) {
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree.focused .monaco-tree-row.focused .content::before { background-color: ${activeListBackground}; }`); collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree:focus .monaco-tree-row.focused {outline: solid 1px ${activeBorderColor}; outline-offset: -1px; }`);
} }
const inactiveListBackground = theme.getColor('list.inactiveSelectionBackground'); const inactiveBorderColor = theme.getColor(listInactiveSelectionBackground);
if (inactiveListBackground) { if (inactiveBorderColor) {
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree .monaco-tree-row.focused .content::before { background-color: ${inactiveListBackground}; }`); collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-tree .monaco-tree-row.focused {outline: solid 1px ${inactiveBorderColor}; outline-offset: -1px; }`);
} }
})); }));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册