Skip to content

Commit a5ee0a3

Browse files
author
Benjamin Pasero
committed
css - put monaco-workbench first in selectors
1 parent c72fd79 commit a5ee0a3

14 files changed

Lines changed: 54 additions & 54 deletions

File tree

src/vs/workbench/browser/parts/activitybar/media/activityaction.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
}
102102

103103
/* Hides active elements in high contrast mode */
104-
.hc-black.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
104+
.monaco-workbench.hc-black .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
105105
display: none;
106106
}
107107

@@ -120,8 +120,8 @@
120120
}
121121

122122
/* Hides outline on HC as focus is handled by border */
123-
.hc-black.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
124-
.hc-black.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
123+
.monaco-workbench.hc-black .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
124+
.monaco-workbench.hc-black .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
125125
outline: none;
126126
}
127127

src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
text-overflow: clip;
212212
}
213213

214-
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
214+
.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
215215
text-overflow: ellipsis;
216216
}
217217

src/vs/workbench/browser/parts/editor/media/titlecontrol.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
background-repeat: no-repeat;
4141
}
4242

43-
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions .action-label,
44-
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
43+
.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .title-actions .action-label,
44+
.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
4545
line-height: initial;
4646
}
4747

src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
min-width: 16px;
7171
}
7272

73-
.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
74-
.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
75-
.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
76-
.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
73+
.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
74+
.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
75+
.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
76+
.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
7777
{
7878
background-image: var(--background-dark);
7979
}

src/vs/workbench/contrib/feedback/browser/media/feedback.css

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
}
116116

117117
/* Theming */
118-
.vs.monaco-workbench .feedback-form .feedback-alias,
119-
.vs.monaco-workbench .feedback-form .feedback-description {
118+
.monaco-workbench.vs .feedback-form .feedback-alias,
119+
.monaco-workbench.vs .feedback-form .feedback-description {
120120
font-family: inherit;
121121
border: 1px solid transparent;
122122
}
@@ -168,17 +168,17 @@
168168
background-color: #E51400;
169169
}
170170

171-
.vs-dark.monaco-workbench .feedback-form h3 {
171+
.monaco-workbench.vs-dark .feedback-form h3 {
172172
font-weight: normal;
173173
font-size: 1.2em;
174174
}
175175

176-
.vs-dark.monaco-workbench .feedback-form .sentiment:hover {
176+
.monaco-workbench.vs-dark .feedback-form .sentiment:hover {
177177
background-color: rgba(30,30,30,0.8);
178178
}
179179

180-
.vs-dark.monaco-workbench .feedback-form .feedback-alias,
181-
.vs-dark.monaco-workbench .feedback-form .feedback-description {
180+
.monaco-workbench.vs-dark .feedback-form .feedback-alias,
181+
.monaco-workbench.vs-dark .feedback-form .feedback-description {
182182
font-family: inherit;
183183
}
184184

@@ -195,29 +195,29 @@
195195
}
196196

197197
/* High Contrast Theming */
198-
.hc-black.monaco-workbench .feedback-form {
198+
.monaco-workbench.hc-black .feedback-form {
199199
outline: 2px solid #6fc3df;
200200
outline-offset: -2px;
201201
}
202202

203-
.hc-black.monaco-workbench .feedback-form .feedback-alias,
204-
.hc-black.monaco-workbench .feedback-form .feedback-description {
203+
.monaco-workbench.hc-black .feedback-form .feedback-alias,
204+
.monaco-workbench.hc-black .feedback-form .feedback-description {
205205
font-family: inherit;
206206
}
207207

208-
.hc-black.monaco-workbench .feedback-form .content .contactus {
208+
.monaco-workbench.hc-black .feedback-form .content .contactus {
209209
padding: 10px;
210210
float: right;
211211
}
212212

213-
.hc-black.monaco-workbench .feedback-form .form-buttons .send,
214-
.hc-black.monaco-workbench .feedback-form .form-buttons .send.in-progress,
215-
.hc-black.monaco-workbench .feedback-form .form-buttons .send.success {
213+
.monaco-workbench.hc-black .feedback-form .form-buttons .send,
214+
.monaco-workbench.hc-black .feedback-form .form-buttons .send.in-progress,
215+
.monaco-workbench.hc-black .feedback-form .form-buttons .send.success {
216216
background-color: #0C141F;
217217
color: #D4D4D4;
218218
border: 1px solid #6FC3DF;
219219
}
220220

221-
.hc-black.monaco-workbench .feedback-form .form-buttons .send:hover {
221+
.monaco-workbench.hc-black .feedback-form .form-buttons .send:hover {
222222
background-color: #0C141F;
223223
}

src/vs/workbench/contrib/files/browser/media/explorerviewlet.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@
9595
}
9696

9797
/* High Contrast Theming */
98-
.hc-black.monaco-workbench .explorer-viewlet .explorer-item {
98+
.monaco-workbench.hc-black .explorer-viewlet .explorer-item {
9999
line-height: 20px;
100100
}

src/vs/workbench/contrib/files/browser/views/media/openeditors.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
overflow: hidden;
8282
}
8383

84-
.hc-black.monaco-workbench .open-editors .open-editor,
85-
.hc-black.monaco-workbench .open-editors .editor-group {
84+
.monaco-workbench.hc-black .open-editors .open-editor,
85+
.monaco-workbench.hc-black .open-editors .editor-group {
8686
line-height: 20px;
8787
}

src/vs/workbench/contrib/search/browser/media/searchview.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@
282282
white-space: pre;
283283
}
284284

285-
.hc-black.monaco-workbench .search-view .replaceMatch,
286-
.hc-black.monaco-workbench .search-view .findInFileMatch {
285+
.monaco-workbench.hc-black .search-view .replaceMatch,
286+
.monaco-workbench.hc-black .search-view .findInFileMatch {
287287
background: none !important;
288288
box-sizing: border-box;
289289
}
@@ -309,9 +309,9 @@
309309

310310
/* High Contrast Theming */
311311

312-
.hc-black.monaco-workbench .search-view .foldermatch,
313-
.hc-black.monaco-workbench .search-view .filematch,
314-
.hc-black.monaco-workbench .search-view .linematch {
312+
.monaco-workbench.hc-black .search-view .foldermatch,
313+
.monaco-workbench.hc-black .search-view .filematch,
314+
.monaco-workbench.hc-black .search-view .linematch {
315315
line-height: 20px;
316316
}
317317

src/vs/workbench/contrib/terminal/browser/media/terminal.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
outline: none;
120120
}
121121

122-
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
123-
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before {
122+
.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm.focus::before,
123+
.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm:focus::before {
124124
display: block;
125125
content: "";
126126
border: 1px solid;
@@ -132,8 +132,8 @@
132132
z-index: 10;
133133
}
134134

135-
.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
136-
.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
135+
.monaco-workbench.hc-black .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
136+
.monaco-workbench.hc-black .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
137137
right: 0;
138138
}
139139

@@ -147,8 +147,8 @@
147147
opacity: 0 !important;
148148
}
149149

150-
.vs-dark.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
151-
.hc-black.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
150+
.monaco-workbench.vs-dark.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
151+
.monaco-workbench.hc-black.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
152152
cursor: -webkit-image-set(url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAL0lEQVQoz2NgCD3x//9/BhBYBWdhgFVAiVW4JBFKGIa4AqD0//9D3pt4I4tAdAMAHTQ/j5Zom30AAAAASUVORK5CYII=') 1x, url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVRIx2NgYGBY/R8I/vx5eelX3n82IJ9FxGf6tksvf/8FiTMQAcAGQMDvSwu09abffY8QYSAScNk45G198eX//yev73/4///701eh//kZSARckrNBRvz//+8+6ZohwCzjGNjdgQxkAg7B9WADeBjIBqtJCbhRA0YNoIkBSNmaPEMoNmA0FkYNoFKhapJ6FGyAH3nauaSmPfwI0v/3OukVi0CIZ+F25KrtYcx/CTIy0e+rC7R1Z4KMICVTQQ14feVXIbR695u14+Ir4gwAAD49E54wc1kWAAAAAElFTkSuQmCC') 2x) 5 8, text;
153153
}
154154

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,8 +1484,8 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
14841484
const border = theme.getColor(activeContrastBorder);
14851485
if (border) {
14861486
collector.addRule(`
1487-
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
1488-
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
1487+
.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm.focus::before,
1488+
.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
14891489
);
14901490
}
14911491

0 commit comments

Comments
 (0)