Skip to content

Commit 78f27b8

Browse files
authored
Remove redundant CSS rules (microsoft#165401)
Ref microsoft#165169 Ref microsoft#157564 After changing workspace trust and policy settings to use indicators, a bunch of CSS rules became redundant. This PR removes those CSS rules.
1 parent 708cd91 commit 78f27b8

File tree

3 files changed

+0
-32
lines changed

3 files changed

+0
-32
lines changed

src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -417,22 +417,6 @@
417417
-webkit-user-select: text;
418418
}
419419

420-
.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-untrusted > .setting-item-contents .setting-item-trust-description,
421-
.settings-editor > .settings-body .settings-tree-container .setting-item > .setting-item-contents .setting-item-policy-description {
422-
display: flex;
423-
font-weight: 600;
424-
margin: 6px 0 12px 0;
425-
}
426-
427-
.settings-editor > .settings-body .settings-tree-container .setting-item > .setting-item-contents .setting-item-policy-description[hidden] {
428-
display: none;
429-
}
430-
431-
.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-untrusted > .setting-item-contents .setting-item-trust-description > span,
432-
.settings-editor > .settings-body .settings-tree-container .setting-item > .setting-item-contents .setting-item-policy-description > span {
433-
padding-right: 5px;
434-
}
435-
436420
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-validation-message {
437421
display: none;
438422
}
@@ -472,14 +456,12 @@
472456
margin: 0px;
473457
}
474458

475-
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:focus,
476459
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:focus {
477460
outline: 1px solid -webkit-focus-ring-color;
478461
outline-offset: -1px;
479462
text-decoration: underline;
480463
}
481464

482-
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:hover,
483465
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:hover {
484466
cursor: pointer;
485467
text-decoration: underline;

src/vs/workbench/contrib/preferences/browser/settingsTree.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,9 +2285,6 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {
22852285
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-description { color: ${fgWithOpacity}; }`);
22862286
collector.addRule(`.settings-editor > .settings-body .settings-toc-container .monaco-list-row:not(.selected) { color: ${fgWithOpacity}; }`);
22872287

2288-
const disabledfgColor = new Color(new RGBA(foregroundColor.rgba.r, foregroundColor.rgba.g, foregroundColor.rgba.b, 0.7));
2289-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-untrusted > .setting-item-contents .setting-item-description { color: ${disabledfgColor}; }`);
2290-
22912288
// Hack for subpixel antialiasing
22922289
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-title .setting-item-overrides,
22932290
.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-title .setting-item-ignored { color: ${fgWithOpacity}; }`);
@@ -2338,7 +2335,6 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {
23382335

23392336
const focusBorderColor = theme.getColor(focusBorder);
23402337
if (focusBorderColor) {
2341-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:focus { outline-color: ${focusBorderColor} }`);
23422338
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:focus { outline-color: ${focusBorderColor} }`);
23432339
}
23442340
}));

src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
1414
import { IAction } from 'vs/base/common/actions';
1515
import { disposableTimeout } from 'vs/base/common/async';
1616
import { Codicon } from 'vs/base/common/codicons';
17-
import { Color, RGBA } from 'vs/base/common/color';
1817
import { Emitter, Event } from 'vs/base/common/event';
1918
import { KeyCode } from 'vs/base/common/keyCodes';
2019
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
@@ -49,21 +48,14 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
4948

5049
const link = theme.getColor(textLinkForeground);
5150
if (link) {
52-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a { color: ${link}; }`);
53-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a > code { color: ${link}; }`);
5451
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a { color: ${link}; }`);
5552
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a > code { color: ${link}; }`);
5653
collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a { color: ${link}; }`);
5754
collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a > code { color: ${link}; }`);
58-
59-
const disabledfgColor = new Color(new RGBA(link.rgba.r, link.rgba.g, link.rgba.b, 0.8));
60-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-untrusted > .setting-item-contents .setting-item-markdown a { color: ${disabledfgColor}; }`);
6155
}
6256

6357
const activeLink = theme.getColor(textLinkActiveForeground);
6458
if (activeLink) {
65-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:hover, .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:active { color: ${activeLink}; }`);
66-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:hover > code, .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-trust-description a:active > code { color: ${activeLink}; }`);
6759
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:hover, .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:active { color: ${activeLink}; }`);
6860
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:hover > code, .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown a:active > code { color: ${activeLink}; }`);
6961
collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a:hover, .monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown a:active { color: ${activeLink}; }`);
@@ -120,8 +112,6 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
120112
if (codeTextForegroundColor) {
121113
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item .setting-item-markdown code { color: ${codeTextForegroundColor} }`);
122114
collector.addRule(`.monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown code { color: ${codeTextForegroundColor} }`);
123-
const disabledfgColor = new Color(new RGBA(codeTextForegroundColor.rgba.r, codeTextForegroundColor.rgba.g, codeTextForegroundColor.rgba.b, 0.8));
124-
collector.addRule(`.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-untrusted > .setting-item-contents .setting-item-description .setting-item-markdown code { color: ${disabledfgColor} }`);
125115
}
126116

127117
const modifiedItemIndicatorColor = theme.getColor(modifiedItemIndicator);

0 commit comments

Comments
 (0)