From 03f31a865a89b6c0539d689e851723693ccae9a1 Mon Sep 17 00:00:00 2001
From: Alan Ren <alanren@microsoft.com>
Date: Fri, 18 Jun 2021 18:33:25 -0700
Subject: [PATCH] use more specific css selectors (#15826)

---
 src/sql/base/browser/ui/taskbar/media/taskbar.css        | 9 +++------
 .../contrib/dashboard/browser/core/dashboardPage.css     | 2 +-
 .../contrib/notebook/browser/cellViews/cellToolbar.css   | 6 +++---
 .../contrib/notebook/browser/cellViews/code.css          | 9 +++------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/sql/base/browser/ui/taskbar/media/taskbar.css b/src/sql/base/browser/ui/taskbar/media/taskbar.css
index a334fd2c29..d982ca7dfd 100644
--- a/src/sql/base/browser/ui/taskbar/media/taskbar.css
+++ b/src/sql/base/browser/ui/taskbar/media/taskbar.css
@@ -50,18 +50,15 @@
 
 .carbon-taskbar .monaco-action-bar .action-item .codicon.action-label {
 	width: 100%;
+	background-repeat: no-repeat;
+	background-position: 0% 50%;
+	padding-left: 15px;
 }
 
 .carbon-taskbar .action-item.more {
 	padding-right: 15px;
 }
 
-.carbon-taskbar .action-label {
-	background-repeat: no-repeat;
-	background-position: 0% 50%;
-	padding-left: 15px;
-}
-
 .carbon-taskbar .action-item-label {
 	display: flex;
 	padding-right: 5px;
diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css
index 5887ae6dd5..1f49a6d8d4 100644
--- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css
+++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css
@@ -32,7 +32,7 @@ dashboard-page .default-tab-icon {
 	background-image: url("media/default.svg");
 }
 
-dashboard-page .actions-container .action-item .action-label{
+dashboard-page .carbon-taskbar .monaco-action-bar .actions-container .action-item .action-label{
 	padding-left: 20px;
 	padding-right: 5px;
 	background-size: 16px;
diff --git a/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.css b/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.css
index a055d84f4e..dea639dbd5 100644
--- a/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.css
+++ b/src/sql/workbench/contrib/notebook/browser/cellViews/cellToolbar.css
@@ -32,7 +32,7 @@ cell-toolbar-component ul.actions-container li.action-item {
 cell-toolbar-component ul.actions-container li:last-child {
 	margin-right: 0;
 }
-cell-toolbar-component .carbon-taskbar .action-label {
+cell-toolbar-component .carbon-taskbar.monaco-toolbar .monaco-action-bar .codicon.action-label {
 	padding: 0;
 }
 cell-toolbar-component .monaco-action-bar .action-label {
@@ -41,8 +41,8 @@ cell-toolbar-component .monaco-action-bar .action-label {
 cell-toolbar-component ul.actions-container li a.masked-icon {
 	display: flex;
 }
-cell-toolbar-component ul.actions-container li a.masked-icon,
-cell-toolbar-component ul.actions-container li a.masked-icon:before {
+cell-toolbar-component .carbon-taskbar.monaco-toolbar .monaco-action-bar ul.actions-container li a.masked-icon,
+cell-toolbar-component .carbon-taskbar.monaco-toolbar .monaco-action-bar ul.actions-container li a.masked-icon:before {
 	height: 24px;
 	width: 29px;
 }
diff --git a/src/sql/workbench/contrib/notebook/browser/cellViews/code.css b/src/sql/workbench/contrib/notebook/browser/cellViews/code.css
index 67f98aec08..79e74be391 100644
--- a/src/sql/workbench/contrib/notebook/browser/cellViews/code.css
+++ b/src/sql/workbench/contrib/notebook/browser/cellViews/code.css
@@ -35,9 +35,11 @@ code-component .toolbar .carbon-taskbar {
 	margin-top: 5px;
 }
 
-code-component .toolbar .codicon {
+code-component .toolbar .carbon-taskbar.monaco-toolbar .monaco-action-bar .codicon.action-label {
 	height: 20px;
 	padding-bottom: 10px;
+	background-size: 20px;
+	width: 40px;
 }
 
 .notebook-cell:not(.active):hover code-component .toolbarIconRun {
@@ -78,11 +80,6 @@ code-component .monaco-editor .decorationsOverviewRuler {
 	background-color: rgba(255, 255, 0, 0.2)
 }
 
-code-component .carbon-taskbar .codicon {
-	background-size: 20px;
-	width: 40px;
-}
-
 code-component .carbon-taskbar .codicon.hideIcon {
 	width: 0px;
 	padding-left: 0px;