Revert "Enhance action label styling for high-contrast themes" (microsoft#269546)

Co-authored-by: Benjamin Pasero <benjamin.pasero@gmail.com>

Author: mrleemurray

src/vs/workbench/browser/parts/compositeBarActions.ts

@@ -158,7 +158,6 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 	protected badge!: HTMLElement;
 	protected override readonly options: ICompositeBarActionViewItemOptions;
 
-	private labelContainer: HTMLElement | undefined;
 	private badgeContent: HTMLElement | undefined;
 	private readonly badgeDisposable = this._register(new MutableDisposable<DisposableStore>());
 	private mouseUpTimeout: Timeout | undefined;
@@ -396,33 +395,13 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 	protected override updateLabel(): void {
 		this.label.className = 'action-label';
 
-		if (this.compositeBarActionItem?.classNames) {
+		if (this.compositeBarActionItem.classNames) {
 			this.label.classList.add(...this.compositeBarActionItem.classNames);
 		}
 
 		if (!this.options.icon) {
 			this.label.textContent = this.action.label;
 		}
-
-		const hasUriIcon = this.compositeBarActionItem?.classNames?.includes('uri-icon');
-		if (hasUriIcon && !this.labelContainer) {
-			this.addHighContrastContainer();
-		} else if (!hasUriIcon && this.labelContainer) {
-			this.removeHighContrastContainer();
-		}
-	}
-
-	private addHighContrastContainer(): void {
-		this.labelContainer = $('.action-label-hc-container');
-		this.label.replaceWith(this.labelContainer);
-		this.labelContainer.appendChild(this.label);
-	}
-
-	private removeHighContrastContainer(): void {
-		if (this.labelContainer) {
-			this.labelContainer.replaceWith(this.label);
-			this.labelContainer = undefined;
-		}
 	}
 
 	private updateTitle(): void {

src/vs/workbench/browser/parts/media/paneCompositePart.css

@@ -319,40 +319,16 @@
 	border-top-width: 2px;
 }
 
-/* Apply outline to action-label for non-uri-icon elements */
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label:not(.uri-icon),
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label:not(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label:not(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label:not(.uri-icon) {
-	outline: var(--vscode-contrastActiveBorder, unset) solid 1px !important;
-}
-
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label:not(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label:not(.uri-icon) {
-	outline: var(--vscode-contrastActiveBorder, unset) dashed 1px !important;
-}
-
-/* Apply outline to action-label-hc-container wrapper for uri-icon elements to avoid masking issues */
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label-hc-container:has(.uri-icon),
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label-hc-container:has(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label-hc-container:has(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label-hc-container:has(.uri-icon) {
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label,
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label,
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label {
 	outline: var(--vscode-contrastActiveBorder, unset) solid 1px !important;
-	outline-offset: 2px;
 }
 
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label-hc-container:has(.uri-icon),
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label-hc-container:has(.uri-icon) {
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label,
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.checked):hover .action-label {
 	outline: var(--vscode-contrastActiveBorder, unset) dashed 1px !important;
-	outline-offset: 2px;
-}
-
-/* Style the wrapper to match the label dimensions for uri-icons */
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label-hc-container,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label-hc-container {
-	display: flex;
-	align-items: center;
-	justify-content: center;
 }
 
 /** Empty Pane Message **/