From 5ff0b530ba59ff90d527af057c5a74559658fa6f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 25 Oct 2019 12:45:32 +0200 Subject: [PATCH] web - cleanup vendor specific CSS rules --- .../ui/breadcrumbs/breadcrumbsWidget.css | 2 ++ src/vs/base/browser/ui/button/button.css | 3 +-- src/vs/base/browser/ui/checkbox/checkbox.css | 13 ++-------- .../ui/codiconLabel/codicon/codicon.css | 4 +--- src/vs/base/browser/ui/dialog/dialog.css | 2 ++ src/vs/base/browser/ui/inputbox/inputBox.css | 24 ++++--------------- src/vs/base/browser/ui/list/list.css | 13 ++++------ src/vs/base/browser/ui/menu/menu.css | 24 ++++--------------- .../browser/ui/progressbar/progressbar.css | 15 ------------ .../browser/ui/selectBox/selectBoxCustom.css | 12 ++-------- src/vs/base/parts/tree/browser/tree.css | 10 ++------ .../processExplorer/media/processExplorer.css | 2 -- src/vs/code/electron-browser/proxy/auth.html | 4 +--- .../browser/viewParts/lines/viewLines.css | 7 ++---- .../browser/widget/media/diffReview.css | 7 ++---- .../contrib/codelens/codelensWidget.css | 3 +-- .../contrib/colorPicker/colorPicker.css | 4 +++- src/vs/editor/contrib/find/findWidget.css | 18 +------------- .../gotoError/media/gotoErrorWidget.css | 3 ++- src/vs/editor/contrib/hover/hover.css | 5 +--- .../referenceSearch/media/peekViewWidget.css | 4 ---- .../editor/contrib/suggest/media/suggest.css | 5 +--- .../browser/inspectTokens/inspectTokens.css | 5 +--- .../api/browser/viewsExtensionPoint.ts | 7 +++++- src/vs/workbench/browser/media/style.css | 6 ++++- .../parts/activitybar/activitybarActions.ts | 7 +++++- .../activitybar/media/activitybarpart.css | 2 ++ .../notifications/media/notificationsList.css | 1 + .../parts/titlebar/media/titlebarpart.css | 1 + .../browser/parts/views/media/views.css | 4 +++- src/vs/workbench/browser/style.ts | 10 ++++++-- .../inspectTMScopes/inspectTMScopes.css | 1 + .../contrib/comments/browser/media/review.css | 10 ++------ .../debug/browser/media/debugHover.css | 2 ++ .../debug/browser/media/exceptionWidget.css | 1 + .../contrib/debug/browser/media/repl.css | 1 + .../browser/media/extensionEditor.css | 4 ++++ .../browser/media/extensionsViewlet.css | 1 + .../preferences/browser/media/preferences.css | 2 ++ .../browser/media/settingsEditor2.css | 4 ++++ .../contrib/remote/browser/remoteViewlet.css | 1 + .../search/browser/media/searchview.css | 2 +- .../terminal/browser/media/scrollbar.css | 3 +-- .../terminal/browser/media/terminal.css | 2 ++ .../contrib/terminal/browser/media/xterm.css | 1 - .../walkThrough/browser/walkThroughPart.css | 1 + .../browser/media/progressService.css | 1 + 47 files changed, 97 insertions(+), 167 deletions(-) diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css index 37620bc42d3..952d709ce77 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css @@ -5,6 +5,8 @@ .monaco-breadcrumbs { user-select: none; + -webkit-user-select: none; + -ms-user-select: none; display: flex; flex-direction: row; flex-wrap: nowrap; diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css index 814e52d0826..69299e332fb 100644 --- a/src/vs/base/browser/ui/button/button.css +++ b/src/vs/base/browser/ui/button/button.css @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ .monaco-text-button { - -moz-box-sizing: border-box; box-sizing: border-box; display: inline-block; width: 100%; @@ -21,4 +20,4 @@ .monaco-button.disabled { opacity: 0.4; cursor: default; -} \ No newline at end of file +} diff --git a/src/vs/base/browser/ui/checkbox/checkbox.css b/src/vs/base/browser/ui/checkbox/checkbox.css index 26f48b88c02..fa9aa082d39 100644 --- a/src/vs/base/browser/ui/checkbox/checkbox.css +++ b/src/vs/base/browser/ui/checkbox/checkbox.css @@ -13,19 +13,10 @@ height: 20px; border: 1px solid transparent; padding: 1px; - - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - + box-sizing: border-box; + user-select: none; -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; -ms-user-select: none; - user-select: none; } .monaco-custom-checkbox:hover, diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css index d0ac316d547..3b31162bf97 100644 --- a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css +++ b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css @@ -16,13 +16,11 @@ text-align: center; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + user-select: none; -webkit-user-select: none; - -moz-user-select: none; -ms-user-select: none; - user-select: none; } - .codicon-add:before { content: "\ea60" } .codicon-plus:before { content: "\ea60" } .codicon-gist-new:before { content: "\ea60" } diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css index 83d8d7eca66..41509c8017b 100644 --- a/src/vs/base/browser/ui/dialog/dialog.css +++ b/src/vs/base/browser/ui/dialog/dialog.css @@ -123,6 +123,8 @@ text-overflow: ellipsis; padding-left: 20px; user-select: text; + -webkit-user-select: text; + -ms-user-select: text; word-wrap: break-word; /* never overflow long words, but break to next line */ white-space: normal; } diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css index 939d0cb5f01..e8d3fe87529 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.css +++ b/src/vs/base/browser/ui/inputbox/inputBox.css @@ -7,11 +7,7 @@ position: relative; display: block; padding: 0; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; line-height: auto !important; /* Customizable */ @@ -37,11 +33,7 @@ .monaco-inputbox > .wrapper > .input { display: inline-block; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; width: 100%; height: 100%; line-height: inherit; @@ -78,11 +70,7 @@ width: 100%; top: 0; left: 0; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; white-space: pre-wrap; visibility: hidden; word-wrap: break-word; @@ -99,11 +87,7 @@ overflow: hidden; text-align: left; width: 100%; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; padding: 0.4em; font-size: 12px; line-height: 17px; diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css index 1c1fa4c8223..e9b3295224d 100644 --- a/src/vs/base/browser/ui/list/list.css +++ b/src/vs/base/browser/ui/list/list.css @@ -11,12 +11,9 @@ } .monaco-list.mouse-support { + user-select: none; -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: -moz-none; -ms-user-select: none; - -o-user-select: none; - user-select: none; } .monaco-list > .monaco-scrollable-element { @@ -36,10 +33,7 @@ .monaco-list-row { position: absolute; - -moz-box-sizing: border-box; - -o-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; overflow: hidden; width: 100%; } @@ -124,6 +118,7 @@ .monaco-list-type-filter > .controls > .filter { -webkit-appearance: none; + -moz-appearance: none; width: 16px; height: 16px; background: url("media/no-filter-light.svg"); @@ -191,4 +186,4 @@ .monaco-list-type-filter.dragging { cursor: grabbing; -} \ No newline at end of file +} diff --git a/src/vs/base/browser/ui/menu/menu.css b/src/vs/base/browser/ui/menu/menu.css index 32c354f3735..77ed4987228 100644 --- a/src/vs/base/browser/ui/menu/menu.css +++ b/src/vs/base/browser/ui/menu/menu.css @@ -15,7 +15,6 @@ .monaco-menu .monaco-action-bar.vertical .action-item { padding: 0; transform: none; - display: -ms-flexbox; display: flex; } @@ -24,9 +23,7 @@ } .monaco-menu .monaco-action-bar.vertical .action-menu-item { - -ms-flex: 1 1 auto; flex: 1 1 auto; - display: -ms-flexbox; display: flex; height: 2em; align-items: center; @@ -34,7 +31,6 @@ } .monaco-menu .monaco-action-bar.vertical .action-label { - -ms-flex: 1 1 auto; flex: 1 1 auto; text-decoration: none; padding: 0 1em; @@ -46,7 +42,6 @@ .monaco-menu .monaco-action-bar.vertical .keybinding, .monaco-menu .monaco-action-bar.vertical .submenu-indicator { display: inline-block; - -ms-flex: 2 1 auto; flex: 2 1 auto; padding: 0 1em; text-align: right; @@ -56,8 +51,8 @@ .monaco-menu .monaco-action-bar.vertical .submenu-indicator { height: 100%; - -webkit-mask: url('submenu.svg') no-repeat 90% 50%/13px 13px; mask: url('submenu.svg') no-repeat 90% 50%/13px 13px; + -webkit-mask: url('submenu.svg') no-repeat 90% 50%/13px 13px; } .monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding, @@ -67,11 +62,7 @@ .monaco-menu .monaco-action-bar.vertical .action-label:not(.separator) { display: inline-block; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; margin: 0; } @@ -80,7 +71,6 @@ overflow: visible; } - .monaco-menu .monaco-action-bar.vertical .action-item .monaco-submenu { position: absolute; } @@ -104,8 +94,8 @@ .monaco-menu .monaco-action-bar.vertical .menu-item-check { position: absolute; visibility: hidden; - -webkit-mask: url('check.svg') no-repeat 50% 56%/15px 15px; mask: url('check.svg') no-repeat 50% 56%/15px 15px; + -webkit-mask: url('check.svg') no-repeat 50% 56%/15px 15px; width: 1em; height: 100%; } @@ -119,10 +109,6 @@ .context-view.monaco-menu-container { outline: 0; border: none; - -webkit-animation: fadeIn 0.083s linear; - -o-animation: fadeIn 0.083s linear; - -moz-animation: fadeIn 0.083s linear; - -ms-animation: fadeIn 0.083s linear; animation: fadeIn 0.083s linear; } @@ -215,11 +201,11 @@ .menubar .toolbar-toggle-more { display: inline-block; padding: 0; - -webkit-mask: url('ellipsis.svg') no-repeat 50% 55%/14px 14px; mask: url('ellipsis.svg') no-repeat 50% 55%/14px 14px; + -webkit-mask: url('ellipsis.svg') no-repeat 50% 55%/14px 14px; } .menubar.compact .toolbar-toggle-more { - -webkit-mask: url('menu.svg') no-repeat 50% 55%/16px 16px; mask: url('menu.svg') no-repeat 50% 55%/16px 16px; + -webkit-mask: url('menu.svg') no-repeat 50% 55%/16px 16px; } diff --git a/src/vs/base/browser/ui/progressbar/progressbar.css b/src/vs/base/browser/ui/progressbar/progressbar.css index f926530cec4..5d1e8b3f762 100644 --- a/src/vs/base/browser/ui/progressbar/progressbar.css +++ b/src/vs/base/browser/ui/progressbar/progressbar.css @@ -35,18 +35,6 @@ animation-duration: 4s; animation-iteration-count: infinite; animation-timing-function: linear; - -ms-animation-name: progress; - -ms-animation-duration: 4s; - -ms-animation-iteration-count: infinite; - -ms-animation-timing-function: linear; - -webkit-animation-name: progress; - -webkit-animation-duration: 4s; - -webkit-animation-iteration-count: infinite; - -webkit-animation-timing-function: linear; - -moz-animation-name: progress; - -moz-animation-duration: 4s; - -moz-animation-iteration-count: infinite; - -moz-animation-timing-function: linear; will-change: transform; } @@ -58,6 +46,3 @@ * 100%: 50 * 100 - 50 (do not overflow): 4950% */ @keyframes progress { from { transform: translateX(0%) scaleX(1) } 50% { transform: translateX(2500%) scaleX(3) } to { transform: translateX(4950%) scaleX(1) } } -@-ms-keyframes progress { from { transform: translateX(0%) scaleX(1) } 50% { transform: translateX(2500%) scaleX(3) } to { transform: translateX(4950%) scaleX(1) } } -@-webkit-keyframes progress { from { transform: translateX(0%) scaleX(1) } 50% { transform: translateX(2500%) scaleX(3) } to { transform: translateX(4950%) scaleX(1) } } -@-moz-keyframes progress { from { transform: translateX(0%) scaleX(1) } 50% { transform: translateX(2500%) scaleX(3) } to { transform: translateX(4950%) scaleX(1) } } \ No newline at end of file diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css index 7bc3f55b13e..b717cde73f6 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css @@ -16,11 +16,7 @@ .monaco-select-box-dropdown-container { display: none; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; } .monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown * { @@ -55,11 +51,7 @@ padding-right: 1px; width: 100%; overflow: hidden; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; } .monaco-select-box-dropdown-container > .select-box-details-pane { diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/vs/base/parts/tree/browser/tree.css index d421aab787f..3e709334db6 100644 --- a/src/vs/base/parts/tree/browser/tree.css +++ b/src/vs/base/parts/tree/browser/tree.css @@ -6,12 +6,9 @@ height: 100%; width: 100%; white-space: nowrap; + user-select: none; -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: -moz-none; -ms-user-select: none; - -o-user-select: none; - user-select: none; position: relative; } @@ -32,10 +29,7 @@ } .monaco-tree .monaco-tree-rows > .monaco-tree-row { - -moz-box-sizing: border-box; - -o-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; cursor: pointer; overflow: hidden; width: 100%; diff --git a/src/vs/code/electron-browser/processExplorer/media/processExplorer.css b/src/vs/code/electron-browser/processExplorer/media/processExplorer.css index 4c59f4df167..69b0b9a35c9 100644 --- a/src/vs/code/electron-browser/processExplorer/media/processExplorer.css +++ b/src/vs/code/electron-browser/processExplorer/media/processExplorer.css @@ -29,8 +29,6 @@ body { padding: 0; height: 100%; width: 100%; - -webkit-touch-callout: none; - -webkit-user-select: none; user-select: none; color: #cccccc; } diff --git a/src/vs/code/electron-browser/proxy/auth.html b/src/vs/code/electron-browser/proxy/auth.html index a6b932662ae..d02876abb94 100644 --- a/src/vs/code/electron-browser/proxy/auth.html +++ b/src/vs/code/electron-browser/proxy/auth.html @@ -12,8 +12,6 @@ height: 100%; width: 100%; overflow: hidden; - -webkit-touch-callout: none; - -webkit-user-select: none; user-select: none; } @@ -117,4 +115,4 @@ - \ No newline at end of file + diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.css b/src/vs/editor/browser/viewParts/lines/viewLines.css index fee7f696501..b6b58faacb6 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLines.css +++ b/src/vs/editor/browser/viewParts/lines/viewLines.css @@ -17,12 +17,9 @@ .monaco-editor.no-user-select .lines-content, .monaco-editor.no-user-select .view-line, .monaco-editor.no-user-select .view-lines { + user-select: none; -webkit-user-select: none; -ms-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - user-select: none; } .monaco-editor .view-lines { @@ -45,4 +42,4 @@ float: none; min-height: inherit; margin-left: inherit; -}*/ \ No newline at end of file +}*/ diff --git a/src/vs/editor/browser/widget/media/diffReview.css b/src/vs/editor/browser/widget/media/diffReview.css index 4cf9f7b83a4..f8db5bb1c67 100644 --- a/src/vs/editor/browser/widget/media/diffReview.css +++ b/src/vs/editor/browser/widget/media/diffReview.css @@ -10,12 +10,9 @@ .monaco-diff-editor .diff-review { position: absolute; + user-select: none; -webkit-user-select: none; -ms-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - user-select: none; } .monaco-diff-editor .diff-review-summary { @@ -67,4 +64,4 @@ .monaco-diff-editor.hc-black .action-label.icon.close-diff-review, .monaco-diff-editor.vs-dark .action-label.icon.close-diff-review { background: url('close-dark.svg') center center no-repeat; -} \ No newline at end of file +} diff --git a/src/vs/editor/contrib/codelens/codelensWidget.css b/src/vs/editor/contrib/codelens/codelensWidget.css index 90319b63c7a..e266cf8b6a8 100644 --- a/src/vs/editor/contrib/codelens/codelensWidget.css +++ b/src/vs/editor/contrib/codelens/codelensWidget.css @@ -11,10 +11,9 @@ .monaco-editor .codelens-decoration > span, .monaco-editor .codelens-decoration > a { - -moz-user-select: none; + user-select: none; -webkit-user-select: none; -ms-user-select: none; - user-select: none; white-space: nowrap; vertical-align: sub; } diff --git a/src/vs/editor/contrib/colorPicker/colorPicker.css b/src/vs/editor/contrib/colorPicker/colorPicker.css index d1d83d46b2b..123ada78476 100644 --- a/src/vs/editor/contrib/colorPicker/colorPicker.css +++ b/src/vs/editor/contrib/colorPicker/colorPicker.css @@ -6,6 +6,8 @@ .colorpicker-widget { height: 190px; user-select: none; + -webkit-user-select: none; + -ms-user-select: none; } .monaco-editor .colorpicker-hover:focus { @@ -115,4 +117,4 @@ .colorpicker-body .strip .overlay { height: 150px; pointer-events: none; -} \ No newline at end of file +} diff --git a/src/vs/editor/contrib/find/findWidget.css b/src/vs/editor/contrib/find/findWidget.css index 0cc3472b692..0138ff51933 100644 --- a/src/vs/editor/contrib/find/findWidget.css +++ b/src/vs/editor/contrib/find/findWidget.css @@ -48,7 +48,6 @@ /* Find widget when replace is toggled on */ .monaco-editor .find-widget.replaceToggled > .replace-part { display: flex; - display: -webkit-flex; } .monaco-editor .find-widget.visible { @@ -75,7 +74,6 @@ margin: 4px 0 0 17px; font-size: 12px; display: flex; - display: -webkit-flex; } .monaco-editor .find-widget > .find-part .monaco-inputbox, @@ -111,7 +109,6 @@ .monaco-editor .find-widget .monaco-findInput { vertical-align: middle; display: flex; - display: -webkit-flex; flex:1; } @@ -127,7 +124,6 @@ .monaco-editor .find-widget .matchesCount { display: flex; - display: -webkit-flex; flex: initial; margin: 0 0 0 3px; padding: 2px 0 0 2px; @@ -142,7 +138,6 @@ width: 20px; height: 20px; display: flex; - display: -webkit-flex; flex: initial; margin-left: 3px; background-position: center center; @@ -174,11 +169,7 @@ left: 3px; width: 18px; height: 100%; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; } .monaco-editor .find-widget .button.toggle.disabled { @@ -231,7 +222,6 @@ .monaco-editor .find-widget > .replace-part > .monaco-findInput { position: relative; display: flex; - display: -webkit-flex; vertical-align: middle; flex: auto; flex-grow: 0; @@ -269,12 +259,6 @@ } .monaco-editor .findMatch { - -webkit-animation-duration: 0; - -webkit-animation-name: inherit !important; - -moz-animation-duration: 0; - -moz-animation-name: inherit !important; - -ms-animation-duration: 0; - -ms-animation-name: inherit !important; animation-duration: 0; animation-name: inherit !important; } diff --git a/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css b/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css index 6680fb166cd..ee02594a087 100644 --- a/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css +++ b/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css @@ -29,8 +29,9 @@ .monaco-editor .marker-widget .descriptioncontainer { position: absolute; white-space: pre; - -webkit-user-select: text; user-select: text; + -webkit-user-select: text; + -ms-user-select: text; padding: 8px 12px 0px 20px; } diff --git a/src/vs/editor/contrib/hover/hover.css b/src/vs/editor/contrib/hover/hover.css index 49a1a6b0f4f..3e34dec5e19 100644 --- a/src/vs/editor/contrib/hover/hover.css +++ b/src/vs/editor/contrib/hover/hover.css @@ -8,12 +8,9 @@ position: absolute; overflow: hidden; z-index: 50; + user-select: text; -webkit-user-select: text; -ms-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; box-sizing: initial; animation: fadein 100ms linear; line-height: 1.5em; diff --git a/src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css b/src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css index 1614f3d3e40..3c13476a594 100644 --- a/src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css +++ b/src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ .monaco-editor .peekview-widget .head { - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; display: flex; } diff --git a/src/vs/editor/contrib/suggest/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css index 23cdc3ef285..a58882341b8 100644 --- a/src/vs/editor/contrib/suggest/media/suggest.css +++ b/src/vs/editor/contrib/suggest/media/suggest.css @@ -68,12 +68,9 @@ } .monaco-editor .suggest-widget .monaco-list { + user-select: none; -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: -moz-none; -ms-user-select: none; - -o-user-select: none; - user-select: none; } /** Styles for each row in the list element **/ diff --git a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css index 78b1b178c84..1685c5b9833 100644 --- a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css +++ b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.css @@ -5,12 +5,9 @@ .monaco-editor .tokens-inspect-widget { z-index: 50; + user-select: text; -webkit-user-select: text; -ms-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; padding: 10px; } diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts index 6554feee2d6..0f1fe0a1eee 100644 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts @@ -366,7 +366,12 @@ class ViewsExtensionHandler implements IWorkbenchContribution { // Generate CSS to show the icon in the activity bar const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${cssClass}`; - createCSSRule(iconClass, `-webkit-mask: ${asCSSUrl(icon)} no-repeat 50% 50%; -webkit-mask-size: 24px;`); + createCSSRule(iconClass, ` + mask: ${asCSSUrl(icon)} no-repeat 50% 50%; + mask-size: 24px; + -webkit-mask: ${asCSSUrl(icon)} no-repeat 50% 50%; + -webkit-mask-size: 24px;` + ); } return viewContainer; diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css index d7271d7084f..8dc1327029b 100644 --- a/src/vs/workbench/browser/media/style.css +++ b/src/vs/workbench/browser/media/style.css @@ -37,6 +37,7 @@ body { overflow: hidden; font-size: 11px; user-select: none; + -webkit-user-select: none; } body.web { @@ -109,15 +110,18 @@ body.web { .monaco-workbench.monaco-font-aliasing-antialiased { -webkit-font-smoothing: antialiased; + -moz-font-smoothing: antialiased; } .monaco-workbench.monaco-font-aliasing-none { -webkit-font-smoothing: none; + -moz-font-smoothing: none; } @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { .monaco-workbench.monaco-font-aliasing-auto { -webkit-font-smoothing: antialiased; + -moz-font-smoothing: antialiased; } } @@ -162,8 +166,8 @@ body.web { .monaco-workbench.linux .monaco-menu .monaco-action-bar.vertical .submenu-indicator { height: 100%; - -webkit-mask-size: 10px 10px; mask-size: 10px 10px; + -webkit-mask-size: 10px 10px; } .monaco-workbench .monaco-menu .action-item { diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index ecc12cb224b..bd8425e0555 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -174,7 +174,12 @@ export class PlaceHolderViewletActivityAction extends ViewletActivityAction { if (iconUrl) { const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${this.class}`; // Generate Placeholder CSS to show the icon in the activity bar - DOM.createCSSRule(iconClass, `-webkit-mask: ${DOM.asCSSUrl(iconUrl)} no-repeat 50% 50%; -webkit-mask-size: 24px;`); + DOM.createCSSRule(iconClass, ` + mask: ${DOM.asCSSUrl(iconUrl)} no-repeat 50% 50%; + mask-size: 24px; + -webkit-mask: ${DOM.asCSSUrl(iconUrl)} no-repeat 50% 50%; + -webkit-mask-size: 24px; + `); } } diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css index 9e60e8367ca..9afde58f0ad 100644 --- a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css +++ b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css @@ -24,10 +24,12 @@ } .monaco-workbench .activitybar > .content > .composite-bar > .monaco-action-bar .action-label.toggle-more { + mask: url('ellipsis-activity-bar.svg') no-repeat 50% 50%; -webkit-mask: url('ellipsis-activity-bar.svg') no-repeat 50% 50%; } .monaco-workbench .activitybar .global-activity .monaco-action-bar .action-label.update-activity { + mask: url('settings-activity-bar.svg') no-repeat 50% 50%; -webkit-mask: url('settings-activity-bar.svg') no-repeat 50% 50%; } diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css index 8150f9673ea..4c19594cc87 100644 --- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css +++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css @@ -51,6 +51,7 @@ text-overflow: ellipsis; flex: 1; /* let the message always grow */ user-select: text; + -webkit-user-select: text; } .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a:focus { diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css index 992ecca3013..2f312f55819 100644 --- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css +++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css @@ -12,6 +12,7 @@ align-items: center; justify-content: center; user-select: none; + -webkit-user-select: none; zoom: 1; /* prevent zooming */ line-height: 22px; height: 22px; diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css index 31c7c5b6e7b..080bace62b6 100644 --- a/src/vs/workbench/browser/parts/views/media/views.css +++ b/src/vs/workbench/browser/parts/views/media/views.css @@ -45,7 +45,8 @@ .monaco-workbench .tree-explorer-viewlet-tree-view .message { display: flex; padding: 4px 12px 0px 18px; - user-select: text + user-select: text; + -webkit-user-select: text; } .monaco-workbench .tree-explorer-viewlet-tree-view .message p { @@ -108,6 +109,7 @@ width: 16px; height: 22px; -webkit-font-smoothing: antialiased; + -moz-font-smoothing: antialiased; } .customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-description-container { diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts index 54164146cd0..9443f0b0851 100644 --- a/src/vs/workbench/browser/style.ts +++ b/src/vs/workbench/browser/style.ts @@ -34,8 +34,14 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { // Input placeholder const placeholderForeground = theme.getColor(inputPlaceholderForeground); if (placeholderForeground) { - collector.addRule(`.monaco-workbench input::-webkit-input-placeholder { color: ${placeholderForeground}; }`); - collector.addRule(`.monaco-workbench textarea::-webkit-input-placeholder { color: ${placeholderForeground}; }`); + collector.addRule(` + .monaco-workbench input::-moz-placeholder, + .monaco-workbench input::-webkit-input-placeholder { color: ${placeholderForeground}; } + `); + collector.addRule(` + .monaco-workbench textarea::-moz-placeholder, + .monaco-workbench textarea::-webkit-input-placeholder { color: ${placeholderForeground}; } + `); } // List highlight diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.css b/src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.css index 234ad747b75..a28c0560783 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.css +++ b/src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.css @@ -6,6 +6,7 @@ .tm-inspect-widget { z-index: 50; user-select: text; + -webkit-user-select: text; padding: 10px; } diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css index 1691c242876..e81390dc06b 100644 --- a/src/vs/workbench/contrib/comments/browser/media/review.css +++ b/src/vs/workbench/contrib/comments/browser/media/review.css @@ -78,6 +78,7 @@ .monaco-editor .review-widget .body .review-comment .review-comment-contents { padding-left: 20px; user-select: text; + -webkit-user-select: text; width: 100%; overflow: hidden; } @@ -134,6 +135,7 @@ width: 16px; height: 12px; -webkit-font-smoothing: antialiased; + -moz-font-smoothing: antialiased; display: inline-block; margin-top: 3px; margin-right: 4px; @@ -274,10 +276,6 @@ text-align: left; width: 100%; box-sizing: border-box; - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; padding: 0.4em; font-size: 12px; line-height: 17px; @@ -362,10 +360,6 @@ } .monaco-editor .review-widget .head { - -webkit-box-sizing: border-box; - -o-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; display: flex; height: 100%; diff --git a/src/vs/workbench/contrib/debug/browser/media/debugHover.css b/src/vs/workbench/contrib/debug/browser/media/debugHover.css index 26be5424399..9a405382bf6 100644 --- a/src/vs/workbench/contrib/debug/browser/media/debugHover.css +++ b/src/vs/workbench/contrib/debug/browser/media/debugHover.css @@ -10,6 +10,7 @@ animation-duration: 0.15s; animation-name: fadeIn; user-select: text; + -webkit-user-select: text; word-break: break-all; padding: 4px 5px; } @@ -38,6 +39,7 @@ .monaco-editor .debug-hover-widget .debug-hover-tree .monaco-list-row .monaco-tl-contents { user-select: text; + -webkit-user-select: text; } /* Disable tree highlight in debug hover tree. */ diff --git a/src/vs/workbench/contrib/debug/browser/media/exceptionWidget.css b/src/vs/workbench/contrib/debug/browser/media/exceptionWidget.css index 14e674738d5..df149d3b430 100644 --- a/src/vs/workbench/contrib/debug/browser/media/exceptionWidget.css +++ b/src/vs/workbench/contrib/debug/browser/media/exceptionWidget.css @@ -11,6 +11,7 @@ padding: 6px 10px; white-space: pre-wrap; user-select: text; + -webkit-user-select: text; } .monaco-editor .zone-widget .zone-widget-container.exception-widget .title { diff --git a/src/vs/workbench/contrib/debug/browser/media/repl.css b/src/vs/workbench/contrib/debug/browser/media/repl.css index e7befa20952..9b6b7dccecc 100644 --- a/src/vs/workbench/contrib/debug/browser/media/repl.css +++ b/src/vs/workbench/contrib/debug/browser/media/repl.css @@ -13,6 +13,7 @@ .repl .repl-tree .monaco-tl-contents { user-select: text; + -webkit-user-select: text; } .repl .repl-tree.word-wrap .monaco-tl-contents { diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css index 6f0bca9e298..b5f3dd73b7c 100644 --- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css +++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css @@ -54,6 +54,7 @@ padding-left: 20px; overflow: hidden; user-select: text; + -webkit-user-select: text; } .extension-editor > .header > .details > .title { @@ -77,6 +78,7 @@ padding: 0px 4px; border-radius: 4px; user-select: text; + -webkit-user-select: text; white-space: nowrap; } @@ -98,6 +100,7 @@ padding: 0px 4px; border-radius: 4px; user-select: none; + -webkit-user-select: none; } .extension-editor > .header > .details > .subtitle { @@ -219,6 +222,7 @@ position: relative; overflow: hidden; user-select: text; + -webkit-user-select: text; } .extension-editor > .body > .content.loading { diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css index 4100bc4ea42..3e28dd8df8d 100644 --- a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css +++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css @@ -21,6 +21,7 @@ padding: 4px; border: 1px solid transparent; -webkit-appearance: textfield; + -moz-appearance: textfield; } .extensions-viewlet > .extensions { diff --git a/src/vs/workbench/contrib/preferences/browser/media/preferences.css b/src/vs/workbench/contrib/preferences/browser/media/preferences.css index 17fc5e4cece..73c3859d0f3 100644 --- a/src/vs/workbench/contrib/preferences/browser/media/preferences.css +++ b/src/vs/workbench/contrib/preferences/browser/media/preferences.css @@ -139,6 +139,7 @@ .monaco-editor .settings-header-widget .title-container { display: flex; user-select: none; + -webkit-user-select: none; } .vs .monaco-editor .settings-header-widget .title-container { @@ -170,6 +171,7 @@ cursor: pointer; font-weight: bold; user-select: none; + -webkit-user-select: none; display: flex; } diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css index eedd0bb68f6..ae1c27ba95e 100644 --- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css +++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css @@ -345,6 +345,7 @@ .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-category { font-weight: 600; user-select: text; + -webkit-user-select: text; } .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-category { @@ -354,11 +355,13 @@ .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-deprecation-message { margin-top: 3px; user-select: text; + -webkit-user-select: text; } .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-description { margin-top: -1px; user-select: text; + -webkit-user-select: text; } .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-deprecation-message { @@ -393,6 +396,7 @@ .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-number input[type=number]::-webkit-inner-spin-button { /* Hide arrow button that shows in type=number fields */ -webkit-appearance: none !important; + -moz-appearance: none !important; } .settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-description-markdown * { diff --git a/src/vs/workbench/contrib/remote/browser/remoteViewlet.css b/src/vs/workbench/contrib/remote/browser/remoteViewlet.css index 3d83e98d7ce..3e5659d7e72 100644 --- a/src/vs/workbench/contrib/remote/browser/remoteViewlet.css +++ b/src/vs/workbench/contrib/remote/browser/remoteViewlet.css @@ -21,6 +21,7 @@ width: 16px; height: 22px; -webkit-font-smoothing: antialiased; + -moz-font-smoothing: antialiased; } .remote-help-content .monaco-list .monaco-list-row .monaco-tl-twistie { diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css index 4afd6f8aa3f..60b35d5ce92 100644 --- a/src/vs/workbench/contrib/search/browser/media/searchview.css +++ b/src/vs/workbench/contrib/search/browser/media/searchview.css @@ -66,7 +66,6 @@ .search-view .search-widget .replace-input { position: relative; display: flex; - display: -webkit-flex; vertical-align: middle; width: auto !important; } @@ -157,6 +156,7 @@ margin-bottom: 0px; padding-bottom: 4px; user-select: text; + -webkit-user-select: text; } .search-view .foldermatch, diff --git a/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css b/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css index 0d28e3564d1..4543d4c8993 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css +++ b/src/vs/workbench/contrib/terminal/browser/media/scrollbar.css @@ -5,7 +5,6 @@ .monaco-workbench .panel.integrated-terminal .xterm-viewport { /* Use the hack presented in http://stackoverflow.com/a/38748186/1156119 to get opacity transitions working on the scrollbar */ - -webkit-background-clip: text; background-clip: text; -webkit-text-fill-color: transparent; transition: background-color 800ms linear; @@ -38,4 +37,4 @@ .monaco-workbench .panel.integrated-terminal .xterm .xterm-viewport::-webkit-scrollbar-thumb:window-inactive { background-color: inherit; -} \ No newline at end of file +} diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css index d50dd4b9253..b47f72fdf8c 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css +++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css @@ -10,6 +10,7 @@ flex-direction: column; background-color: transparent!important; user-select: initial; + -webkit-user-select: initial; position: relative; } @@ -104,6 +105,7 @@ bottom: 0; left: 0; user-select: none; + -webkit-user-select: none; } .monaco-workbench .panel.integrated-terminal .monaco-split-view2.vertical .split-view-view:not(:last-child) .xterm { /* When vertical and NOT the bottom terminal, align to the top instead to prevent the output jumping around erratically */ diff --git a/src/vs/workbench/contrib/terminal/browser/media/xterm.css b/src/vs/workbench/contrib/terminal/browser/media/xterm.css index bde4034f5b8..712baa284f6 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/xterm.css +++ b/src/vs/workbench/contrib/terminal/browser/media/xterm.css @@ -43,7 +43,6 @@ font-feature-settings: "liga" 0; position: relative; user-select: none; - -ms-user-select: none; -webkit-user-select: none; } diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css index 0d4122ccdff..3ccb4957f44 100644 --- a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css +++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css @@ -8,6 +8,7 @@ padding: 10px 20px; line-height: 22px; user-select: initial; + -webkit-user-select: initial; } .monaco-workbench .part.editor > .content .walkThroughContent img { diff --git a/src/vs/workbench/services/progress/browser/media/progressService.css b/src/vs/workbench/services/progress/browser/media/progressService.css index afaec2e7d57..4cf8a37994b 100644 --- a/src/vs/workbench/services/progress/browser/media/progressService.css +++ b/src/vs/workbench/services/progress/browser/media/progressService.css @@ -12,6 +12,7 @@ } .monaco-workbench .progress-badge > .badge-content::before { + mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4="); -webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4="); width: 14px; height: 14px; -- GitLab