Merge pull request microsoft#158377 from microsoft/joh/reduced-bear

jrieken · web-flow · commit 028186209f6b · 2022-08-18T14:28:32.000+02:00
Add command to open merge editor from conflicting files
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -46,6 +46,7 @@
 }
 
 .monaco-action-bar .action-label {
+	display: flex;
 	font-size: 11px;
 	padding: 3px;
 	border-radius: 5px;

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`.monaco-action-bar .action-label {`
	`49`	`+ display: flex;`
`49`	`50`	`font-size: 11px;`
`50`	`51`	`padding: 3px;`
`51`	`52`	`border-radius: 5px;`