Move all Mac inline titlebar CSS into mac only scopes in CSS, allow r…

…esizing the activity bar when full screen

src/vs/workbench/browser/media/part.css

@@ -11,24 +11,33 @@
 
 .monaco-workbench > .part > .title,
 .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title {
-	height: 36px;
+	height: 35px;
 	display: flex;
 	box-sizing:	border-box;
 	overflow: hidden;
 }
 
+.monaco-workbench.mac > .part > .title,
+.monaco-workbench.mac > .part.editor > .content > .one-editor-silo > .container > .title {
+	height: 36px;
+}
+
 .monaco-workbench > .part > .title {
 	padding-left: 8px;
 	padding-right: 8px;
 }
 
 .monaco-workbench > .part > .title > .title-label {
-	line-height: 36px;
+	line-height: 35px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
+.monaco-workbench.mac > .part > .title > .title-label {
+	line-height: 36px;
+}
+
 .monaco-workbench > .part > .title > .title-label {
 	padding-left: 12px;
 }
@@ -50,15 +59,23 @@
 	padding-left: 5px;
 }
 
+.monaco-workbench.mac > .part > .title > .title-actions {
+	height: 36px;
+}
+
 .monaco-workbench > .part > .title > .title-actions .action-label {
 	display: block;
-	height: 36px;
+	height: 35px;
 	width: 28px;
 	background-size: 16px;
 	background-position: center center;
 	background-repeat: no-repeat;
 }
 
+.monaco-workbench.mac > .part > .title > .title-actions .action-label {
+	height: 36px;
+}
+
 .monaco-workbench > .part > .title > .title-actions .action-label .label {
 	display: none;
 }
@@ -70,11 +87,15 @@
 .monaco-workbench > .part > .content  .progress-container {
 	position: absolute;
 	left: 0;
-	top: 34px; /* at the bottom of the 35px height title container */
+	top: 33px; /* at the bottom of the 35px height title container */
 	z-index: 5; /* on top of things */
 	height: 2px;
 }
 
+.monaco-workbench.mac > .part > .content  .progress-container {
+	top: 34px
+}
+
 .monaco-workbench > .part > .content  .progress-container .progress-bit {
 	height: 2px;
 }

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

@@ -17,14 +17,18 @@
 	margin-right: 0;
 	padding: 0 0 0 50px;
 	box-sizing: border-box;
-	background-position: center center;
+	background-position: 9px center;
 	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.mac > .activitybar > .content .monaco-action-bar .action-label {
+	background-position: center center;
+}
+
 .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
 	content: "";
 	position: absolute;

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

@@ -9,11 +9,16 @@
 	background-size: 32px;
 }
 
-.monaco-workbench > .part.activitybar {
+.monaco-workbench > .part.activitybar, .monaco-workbench.mac.fullscreen > .part.activitybar {
 	z-index: 20;
+	min-width: 50px;
+	width: 50px;
+	transition: width 0.2s ease-out;
+}
+
+.monaco-workbench.mac > .part.activitybar {
 	min-width: 76px;
 	width: 76px;
-	transition: width 0.2s ease-out;
 	-webkit-app-region: drag;
 }
 
@@ -25,12 +30,16 @@
 	height: 100%;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar {
-	text-align: left;
+.monaco-workbench.mac > .activitybar > .content {
+	padding-top: 28px;
 }
 
-.monaco-workbench > .activitybar > .content .monaco-action-bar .actions-container {
-	padding-top: 28px;
+.monaco-workbench.mac.fullscreen > .activitybar > .content {
+	padding-top: 0px;
+}
+
+.monaco-workbench > .activitybar > .content .monaco-action-bar {
+	text-align: left;
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar.position-top {

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

@@ -48,6 +48,9 @@
 .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .tabs-container {
 	display: flex;
 	height: 35px;
+}
+
+.monaco-workbench.mac > .part.editor > .content > .one-editor-silo > .container > .title .tabs-container {
 	-webkit-app-region: drag;
 }
 
@@ -68,11 +71,15 @@
 	overflow: hidden;
 	white-space: nowrap;
 	cursor: pointer;
-	margin-top: 9px;
-	height: 26px;
+	height: 35px;
 	box-sizing: border-box;
 	border: 1px solid transparent;
 	padding-left: 10px;
+}
+
+.monaco-workbench.mac > .part.editor > .content > .one-editor-silo > .container > .title .tabs-container > .tab {
+	margin-top: 9px;
+	height: 26px;
 	-webkit-app-region: no-drag;
 }
 
@@ -226,5 +233,8 @@
 .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions {
 	flex: initial;
 	padding-left: 4px;
+}
+
+.monaco-workbench.mac > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions {
 	-webkit-app-region: drag;
-}
+}

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

@@ -9,6 +9,9 @@
 
 .monaco-workbench > .part > .composite.title {
 	display: flex;
+}
+
+.monaco-workbench.mac > .part > .composite.title {
 	-webkit-app-region: drag;
 }
 

src/vs/workbench/electron-browser/integration.ts

@@ -133,12 +133,16 @@ export class ElectronIntegration {
 		ipc.on('vscode:enterFullScreen', (event) => {
 			this.partService.joinCreation().then(() => {
 				this.partService.addClass('fullscreen');
+				// We need to re-layout the sidebar as the activitybar's width can change between
+				// fullscreen and window'd modes on macOS.
+				this.partService.setSideBarPosition(this.partService.getSideBarPosition());
 			});
 		});
 
 		ipc.on('vscode:leaveFullScreen', (event) => {
 			this.partService.joinCreation().then(() => {
 				this.partService.removeClass('fullscreen');
+				this.partService.setSideBarPosition(this.partService.getSideBarPosition());
 			});
 		});