themes - more workbench css theme cleanup

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

@@ -9,10 +9,6 @@
 	padding: 5px 0;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.dropfeedback {
-	background-color: #403F3F;
-}
-
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label {
 	display: flex;
 	overflow: hidden;
@@ -25,8 +21,6 @@
 	background-repeat: no-repeat;
 	opacity: 0.6;
 	font-size: 15px;
-	color: white;
-	text-shadow: 0 1px 0 rgba(0, 0, 0, 0.8);
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
@@ -42,15 +36,6 @@
 	border-left: none !important; /* no focus feedback when using mouse */
 }
 
-.vs .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before,
-.vs-dark .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
-	border-left-color: #007ACC;
-}
-
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
-	border-left-color: #f38518;
-}
-
 .monaco-workbench > .activitybar.left > .content .monaco-action-bar .action-item .action-label:focus:before {
 	left: 1px;
 }
@@ -69,19 +54,37 @@
 	overflow: hidden;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar .action-label > .keybinding {
-	overflow: hidden;
-	text-overflow: hidden;
-	flex: 2 1 auto;
-	flex: 2 1 auto;
-	text-align: right;
-	opacity: 0.5;
-	padding: 0 2em 0 1em;
-	font-size: 0.8em;
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label,
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.active {
+	opacity: 1;
+}
+
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label:before {
+	content: "";
+	opacity: 0.6;
+	position: absolute;
+	top: 9px;
+	left: 9px;
+	height: 32px;
+	width: 32px;
+}
+
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:before,
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover .action-label:before {
+	opacity: 1;
+}
+
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar.global .action-item .action-label.active:before {
+	border: none;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar .action-label:hover {
-	text-decoration: none;
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:before,
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:hover:before {
+	outline: 1px solid;
+}
+
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:hover:before {
+	outline: 1px dashed;
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar .badge {
@@ -104,8 +107,11 @@
 	padding: 0 5px;
 	border-radius: 20px;
 	text-align: center;
-	color: white;
-	background-color: #007ACC;
+}
+
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content {
+	background: none;
+	border: 1px solid;
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active,
@@ -135,42 +141,40 @@
 	right: 0;
 }
 
-/* High Contrast Theming */
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label,
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.active {
-	opacity: 1;
+/* TODO@theme */
+
+.vs .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content,
+.vs-dark .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content,
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content {
+	color: white;
+	background-color: #007ACC;
 }
 
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-label:before {
-	content: "";
-	opacity: 0.6;
-	position: absolute;
-	top: 9px;
-	left: 9px;
-	height: 32px;
-	width: 32px;
+.vs .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before,
+.vs-dark .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
+	border-left-color: #007ACC;
 }
 
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:before,
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover .action-label:before {
-	opacity: 1;
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
+	border-left-color: #f38518;
+}
+
+.vs .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.dropfeedback,
+.vs-dark .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.dropfeedback,
+.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.dropfeedback {
+	background-color: #403F3F;
 }
 
 .hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:before,
 .hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label.active:hover:before {
-	outline: 1px solid #f38518;
+	outline-color: #f38518;
 }
 
 .hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:hover:before {
-	outline: 1px dashed #f38518;
-}
-
-.hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar.global .action-item .action-label.active:before {
-	border: none;
+	outline-color: #f38518;
 }
 
 .hc-black .monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content {
-	background: none;
 	background-color: #000;
-	border: 1px solid #6FC3DF;
+	border-color: #6FC3DF;
 }
\ No newline at end of file

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

@@ -16,6 +16,17 @@
 	background-color: inherit;
 }
 
+.hc-black .monaco-workbench > .part.activitybar.left .content {
+	box-sizing: border-box; /* helps showing the border when sidebar collapsed */
+	border-right: 1px solid;
+}
+
+.hc-black .monaco-workbench > .part.activitybar.right .content {
+	border-left: 1px solid;
+}
+
+/* TODO@theme */
+
 .vs .monaco-workbench > .activitybar > .content {
 	background-color: #2C2C2C;
 }
@@ -24,17 +35,14 @@
 	background-color: #333;
 }
 
-/* High Contrast Theming */
+.hc-black .monaco-workbench > .activitybar > .content {
+	background-color: #000;
+}
 
 .hc-black .monaco-workbench > .part.activitybar.left .content {
-	box-sizing: border-box; /* helps showing the border when sidebar collapsed */
-	border-right: 1px solid #6FC3DF;
+	border-right-color: #6FC3DF;
 }
 
 .hc-black .monaco-workbench > .part.activitybar.right .content {
-	border-left: 1px solid #6FC3DF;
-}
-
-.hc-black .monaco-workbench > .activitybar > .content {
-	background-color: #000;
+	border-left-color: #6FC3DF;
 }
\ No newline at end of file

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

@@ -17,14 +17,19 @@
 }
 
 .monaco-workbench > .part > .composite.title > .title-label span {
-	color: #6f6f6f;
 	text-transform: uppercase;
 }
 
+/* TODO@theme */
+
+.monaco-workbench > .part > .composite.title > .title-label span {
+	color: #6f6f6f;
+}
+
 .vs-dark .monaco-workbench > .part > .composite.title > .title-label span  {
 	color: #bbbbbb;
 }
 
 .hc-black .monaco-workbench > .part > .composite.title > .title-label span  {
 	color: #fff;
-}
+}
\ No newline at end of file

src/vs/workbench/browser/parts/panel/media/panelpart.css

@@ -13,15 +13,12 @@
 }
 
 .monaco-workbench > .part.panel .title {
-	border-top: 1px solid rgba(128, 128, 128, 0.35);
+	border-top-width: 1px;
+	border-top-style: solid;
 	padding-right: 0px;
 	height: 35px;
 }
 
-.hc-black .monaco-workbench > .part.panel .title {
-	border-top-color: #6FC3DF;
-}
-
 /** Panel Switcher */
 
 .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar {
@@ -40,40 +37,13 @@
 	padding-bottom: 4px; /* puts the bottom border down */
 }
 
-.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
-	color: #424242;
-	opacity: 0.75;
-}
-
-.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
-	color: #e7e7e7;
-	opacity: 0.5;
-}
-
-.hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
-	color: #fff;
-}
-
-.monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item:hover .action-label,
-.monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
-	opacity: 1;
-}
-
 .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
 	border-bottom: 1px solid;
 }
 
-.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
-	border-bottom-color: #ccceda;
-}
-
-.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
-	border-bottom-color: #404047;
-}
-
 .hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked,
 .hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:hover {
-	outline: 1px solid #f38518;
+	outline: 1px solid;
 	border-bottom: none;
 	padding-bottom: 0;
 	outline-offset: 3px;
@@ -85,12 +55,12 @@
 
 .vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus,
 .vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus {
-	border-bottom: 1px solid #007ACC;
+	border-bottom: 1px solid;
 	outline: none !important;
 }
 
 .hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus {
-	border-bottom: 1px solid #f38518;
+	border-bottom: 1px solid;
 	outline: none !important;
 }
 
@@ -103,4 +73,59 @@
 .vs-dark .monaco-workbench .hide-panel-action,
 .hc-black .monaco-workbench .hide-panel-action {
 	background: url('close-inverse.svg') center center no-repeat;
+}
+
+/** TODO@theme */
+
+.vs .monaco-workbench > .part.panel .title,
+.vs-dark .monaco-workbench > .part.panel .title {
+	border-top-color: rgba(128, 128, 128, 0.35);
+}
+
+.hc-black .monaco-workbench > .part.panel .title {
+	border-top-color: #6FC3DF;
+}
+
+.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
+	color: rgba(66, 66, 66, 0.75);
+}
+
+.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
+	color: rgba(231, 231, 231, 0.5);
+}
+
+.hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
+	color: #fff;
+}
+
+.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item:hover .action-label,
+.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
+	color: rgb(66, 66, 66);
+}
+
+.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item:hover .action-label,
+.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
+	color: rgb(231, 231, 231);
+}
+
+.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
+	border-bottom-color: #ccceda;
+}
+
+.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked {
+	border-bottom-color: #404047;
+}
+
+.hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label.checked,
+.hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:hover {
+	outline-color: #f38518;
+}
+
+.vs .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus,
+.vs-dark .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus {
+	border-bottom-color: #007ACC;
+}
+
+.hc-black .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label:focus {
+	border-bottom-color: #f38518;
 }
\ No newline at end of file

src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css

@@ -3,14 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench > .sidebar > .title > .title-actions {
-	background-color: rgb(243, 243, 243);
-}
-
-.vs-dark .monaco-workbench > .sidebar > .title > .title-actions {
-	background-color: rgb(37, 37, 38);
-}
-
 .monaco-workbench > .sidebar > .content {
 	overflow: hidden;
 }
@@ -60,7 +52,16 @@
 	height: 16px;
 }
 
-/* High Contrast Theming */
+/* TODO@theme */
+
+.vs .monaco-workbench > .sidebar > .title > .title-actions {
+	background-color: rgb(243, 243, 243);
+}
+
+.vs-dark .monaco-workbench > .sidebar > .title > .title-actions {
+	background-color: rgb(37, 37, 38);
+}
+
 .hc-black .monaco-workbench > .sidebar.left {
 	border-right: 1px solid #6FC3DF;
 }

src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css

@@ -62,7 +62,7 @@
 	text-decoration: none;
 }
 
-/* Theming */
+/* TODO@theme */
 
 .vs .monaco-workbench > .part.statusbar,
 .vs-dark .monaco-workbench > .part.statusbar,

src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

@@ -30,7 +30,7 @@
 	zoom: 1; /* prevent zooming */
 }
 
-/* Theming */
+/* TODO@theme */
 
 .vs .monaco-workbench > .part.titlebar {
 	background: #ddd;
@@ -38,7 +38,8 @@
 }
 
 .vs .monaco-workbench > .part.titlebar.blurred {
-	opacity: 0.6;
+	background: rgba(221, 221, 221, 0.6);
+	color: rgba(51, 51, 51, 0.6);
 }
 
 .vs-dark .monaco-workbench > .part.titlebar {
@@ -46,8 +47,9 @@
 	color: #ccc;
 }
 
-.vs-dark .monaco-workbench > .part.titlebar.blurred > .window-title {
-	opacity: 0.6;
+.vs-dark .monaco-workbench > .part.titlebar.blurred {
+	background: rgba(60, 60, 60, 0.6);
+	color: rgba(204, 204, 204, 0.6);
 }
 
 .hc-black .monaco-workbench > .part.titlebar {