diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts index 6ab333bf1e4..fbffb5d002f 100644 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts @@ -326,7 +326,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution { ); // Generate CSS to show the icon in the activity bar - const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${cssClass}`; + const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${cssClass}`; createCSSRule(iconClass, `-webkit-mask: url('${icon}') no-repeat 50% 50%`); } diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 2fe84cf2ba5..2144bb90f7e 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -175,7 +175,7 @@ export class PlaceHolderViewletActivityAction extends ViewletActivityAction { ) { super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService); - const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`; // Generate Placeholder CSS to show the icon in the activity bar + const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${this.class}`; // Generate Placeholder CSS to show the icon in the activity bar DOM.createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%`); } @@ -271,9 +271,9 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { const activeForegroundColor = theme.getColor(ACTIVITY_BAR_FOREGROUND); if (activeForegroundColor) { collector.addRule(` - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active .action-label, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:focus .action-label, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover .action-label { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.active .action-label, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:focus .action-label, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:hover .action-label { background-color: ${activeForegroundColor} !important; } `); @@ -283,7 +283,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { const outline = theme.getColor(activeContrastBorder); if (outline) { collector.addRule(` - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:before { content: ""; position: absolute; top: 9px; @@ -292,26 +292,26 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { width: 32px; } - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:hover:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:hover:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.active:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.active:hover:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.checked:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.checked:hover:before { outline: 1px solid; } - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:hover:before { outline: 1px dashed; } - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:focus:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:focus:before { border-left-color: ${outline}; } - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:hover:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:hover:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.active:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.active:hover:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.checked:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item.checked:hover:before, + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:hover:before { outline-color: ${outline}; } `); @@ -322,7 +322,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { const focusBorderColor = theme.getColor(focusBorder); if (focusBorderColor) { collector.addRule(` - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:focus:before { + .monaco-workbench .activitybar > .content .monaco-action-bar .action-item:focus:before { border-left-color: ${focusBorderColor}; } `); diff --git a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css index 066987b790b..1190f855b69 100644 --- a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css @@ -54,7 +54,7 @@ background-image: none; } -.windows > .monaco-workbench > .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before { +.windows > .monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before { content: '\\'; } diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css index 7cf772fb7b0..9d27545f44b 100644 --- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css +++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css @@ -64,7 +64,7 @@ margin-top: 7px; } -.mac > .monaco-workbench > .part > .title > .title-actions .start-debug-action-item { +.mac > .monaco-workbench .part > .title > .title-actions .start-debug-action-item { border-radius: 4px; } diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css index 75a18c03da3..a24da657f52 100644 --- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css +++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css @@ -228,21 +228,21 @@ .monaco-workbench .part.editor > .content .welcomePage .linux-only { display: none; } -.mac > .monaco-workbench > .part.editor > .content .welcomePage .mac-only { +.mac > .monaco-workbench .part.editor > .content .welcomePage .mac-only { display: initial; } -.windows > .monaco-workbench > .part.editor > .content .welcomePage .windows-only { +.windows > .monaco-workbench .part.editor > .content .welcomePage .windows-only { display: initial; } -.linux > .monaco-workbench > .part.editor > .content .welcomePage .linux-only { +.linux > .monaco-workbench .part.editor > .content .welcomePage .linux-only { display: initial; } -.mac > .monaco-workbench > .part.editor > .content .welcomePage li.mac-only { +.mac > .monaco-workbench .part.editor > .content .welcomePage li.mac-only { display: list-item; } -.windows > .monaco-workbench > .part.editor > .content .welcomePage li.windows-only { +.windows > .monaco-workbench .part.editor > .content .welcomePage li.windows-only { display: list-item; } -.linux > .monaco-workbench > .part.editor > .content .welcomePage li.linux-only { +.linux > .monaco-workbench .part.editor > .content .welcomePage li.linux-only { display: list-item; } diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css index c83ac377cae..2194a2a98c7 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css @@ -123,13 +123,13 @@ .monaco-workbench .part.editor > .content .walkThroughContent .linux-only { display: none; } -.mac > .monaco-workbench > .part.editor > .content .walkThroughContent .mac-only { +.mac > .monaco-workbench .part.editor > .content .walkThroughContent .mac-only { display: initial; } -.windows > .monaco-workbench > .part.editor > .content .walkThroughContent .windows-only { +.windows > .monaco-workbench .part.editor > .content .walkThroughContent .windows-only { display: initial; } -.linux > .monaco-workbench > .part.editor > .content .walkThroughContent .linux-only { +.linux > .monaco-workbench .part.editor > .content .walkThroughContent .linux-only { display: initial; }