diff --git a/src/sql/base/browser/ui/panel/media/panel.css b/src/sql/base/browser/ui/panel/media/panel.css index e1eacf2d5e..1df983cdf5 100644 --- a/src/sql/base/browser/ui/panel/media/panel.css +++ b/src/sql/base/browser/ui/panel/media/panel.css @@ -37,12 +37,19 @@ panel { .tabbedPanel .tabList .tab .tabLabel { text-transform: uppercase; - margin-left: 16px; - margin-right: 16px; font-size: 11px; padding-bottom: 4px; } +.tabbedPanel .tabList .tab-header { + padding-left: 10px; + padding-right: 10px; +} + +.tabbedPanel .tabList .actions-container { + margin-right: 8px; +} + .tabbedPanel .composite.title .title-actions .action-label { display: block; height: 35px; diff --git a/src/sql/media/icons/close-dark.svg b/src/sql/media/icons/close-dark.svg deleted file mode 100644 index ce0e589640..0000000000 --- a/src/sql/media/icons/close-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/sql/media/icons/close.svg b/src/sql/media/icons/close.svg index fde34404d4..0b34352b2d 100644 --- a/src/sql/media/icons/close.svg +++ b/src/sql/media/icons/close.svg @@ -1 +1 @@ - \ No newline at end of file +close_small \ No newline at end of file diff --git a/src/sql/media/icons/close_inverse.svg b/src/sql/media/icons/close_inverse.svg new file mode 100644 index 0000000000..6a79188955 --- /dev/null +++ b/src/sql/media/icons/close_inverse.svg @@ -0,0 +1 @@ +close_small_inverse \ No newline at end of file diff --git a/src/sql/media/icons/common-icons.css b/src/sql/media/icons/common-icons.css index 6dae2faa12..6d2b78484a 100644 --- a/src/sql/media/icons/common-icons.css +++ b/src/sql/media/icons/common-icons.css @@ -104,13 +104,16 @@ background-position: 2px center; } -.vs .icon.close { - background-image: url('close.svg'); +.vs .icon.close, +.vs .icon.remove { + background: url('close.svg') center center no-repeat !important; } .vs-dark .icon.close, -.hc-black .icon.close { - background-image: url('close-dark.svg'); +.hc-black .icon.close, +.vs-dark .icon.remove, +.hc-black .icon.remove { + background: url('close_inverse.svg') center center no-repeat !important; } .vs .icon.filter { @@ -122,14 +125,6 @@ background: url("filter_inverse.svg") center center no-repeat !important; } -.vs .icon.remove { - background: url("remove.svg") center center no-repeat !important; -} - -.vs-dark .icon.remove, -.hc-black .icon.remove { - background: url("remove_inverse.svg") center center no-repeat !important; -} .vs .icon.warning-badge, .vs-dark .icon.warning-badge, diff --git a/src/sql/media/icons/pin.svg b/src/sql/media/icons/pin.svg index 8f28228fa0..0b87f622b3 100644 --- a/src/sql/media/icons/pin.svg +++ b/src/sql/media/icons/pin.svg @@ -1 +1 @@ -pin \ No newline at end of file +pin_small \ No newline at end of file diff --git a/src/sql/media/icons/pin_inverse.svg b/src/sql/media/icons/pin_inverse.svg index 932c9cd0a7..7dc4f6ce28 100644 --- a/src/sql/media/icons/pin_inverse.svg +++ b/src/sql/media/icons/pin_inverse.svg @@ -1 +1 @@ -pin_inverse \ No newline at end of file +pin_small_inverse \ No newline at end of file diff --git a/src/sql/media/icons/remove.svg b/src/sql/media/icons/remove.svg deleted file mode 100644 index b8d1d94e26..0000000000 --- a/src/sql/media/icons/remove.svg +++ /dev/null @@ -1 +0,0 @@ -close_16x16 \ No newline at end of file diff --git a/src/sql/media/icons/remove_inverse.svg b/src/sql/media/icons/remove_inverse.svg deleted file mode 100644 index 13449c366c..0000000000 --- a/src/sql/media/icons/remove_inverse.svg +++ /dev/null @@ -1 +0,0 @@ -close_inverse_16x16 \ No newline at end of file diff --git a/src/sql/media/icons/unpin.svg b/src/sql/media/icons/unpin.svg index 68d31cb4e1..907f0c6ec1 100644 --- a/src/sql/media/icons/unpin.svg +++ b/src/sql/media/icons/unpin.svg @@ -1 +1 @@ -unpin \ No newline at end of file +unpin_small \ No newline at end of file diff --git a/src/sql/media/icons/unpin_inverse.svg b/src/sql/media/icons/unpin_inverse.svg index 84049b27fd..8b1f69e89f 100644 --- a/src/sql/media/icons/unpin_inverse.svg +++ b/src/sql/media/icons/unpin_inverse.svg @@ -1 +1 @@ -unpin_inverse \ No newline at end of file +unpin_small_inverse \ No newline at end of file diff --git a/src/sql/media/overwriteVsIcons.css b/src/sql/media/overwriteVsIcons.css new file mode 100644 index 0000000000..b438bdf707 --- /dev/null +++ b/src/sql/media/overwriteVsIcons.css @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +/* Overwrite close editor action icon */ +.vs .monaco-workbench .close-editor-action { + background: url('icons/close.svg') center center no-repeat !important; + background-size: 10px !important; +} + +.vs-dark .monaco-workbench .close-editor-action, +.hc-black .monaco-workbench .close-editor-action { + background: url('icons/close_inverse.svg') center center no-repeat !important; +} \ No newline at end of file diff --git a/src/sql/parts/dashboard/common/dashboardPage.css b/src/sql/parts/dashboard/common/dashboardPage.css index bd5f4a72a0..6e107d3689 100644 --- a/src/sql/parts/dashboard/common/dashboardPage.css +++ b/src/sql/parts/dashboard/common/dashboardPage.css @@ -13,3 +13,13 @@ dashboard-page .monaco-scrollable-element { height: 100%; width: 100%; } + +dashboard-page .dashboard-panel .tab-header .action-item .action-label.unpin, +dashboard-page .dashboard-panel .tab-header .action-item .action-label.pin { + padding: 6px; + margin-right: 5px; +} + +dashboard-page .dashboard-panel .tab-header .action-item .action-label.close { + padding: 5px; +} diff --git a/src/sql/parts/query/common/query.contribution.ts b/src/sql/parts/query/common/query.contribution.ts index a1cbc756b9..f483f87c9a 100644 --- a/src/sql/parts/query/common/query.contribution.ts +++ b/src/sql/parts/query/common/query.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; - +import 'vs/css!sql/media/overwriteVsIcons'; import { Registry } from 'vs/platform/registry/common/platform'; import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; @@ -85,24 +85,24 @@ let actionRegistry = Registry.as(Extensions.WorkbenchA // Query Actions actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - RunQueryKeyboardAction, - RunQueryKeyboardAction.ID, - RunQueryKeyboardAction.LABEL, - { primary: KeyCode.F5 } - ), - RunQueryKeyboardAction.LABEL - ); + new SyncActionDescriptor( + RunQueryKeyboardAction, + RunQueryKeyboardAction.ID, + RunQueryKeyboardAction.LABEL, + { primary: KeyCode.F5 } + ), + RunQueryKeyboardAction.LABEL +); actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - RunCurrentQueryKeyboardAction, - RunCurrentQueryKeyboardAction.ID, - RunCurrentQueryKeyboardAction.LABEL, - { primary:KeyMod.CtrlCmd | KeyCode.F5 } - ), - RunCurrentQueryKeyboardAction.LABEL - ); + new SyncActionDescriptor( + RunCurrentQueryKeyboardAction, + RunCurrentQueryKeyboardAction.ID, + RunCurrentQueryKeyboardAction.LABEL, + { primary: KeyMod.CtrlCmd | KeyCode.F5 } + ), + RunCurrentQueryKeyboardAction.LABEL +); actionRegistry.registerWorkbenchAction( new SyncActionDescriptor( @@ -114,23 +114,23 @@ actionRegistry.registerWorkbenchAction( ); actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - CancelQueryKeyboardAction, - CancelQueryKeyboardAction.ID, - CancelQueryKeyboardAction.LABEL, - { primary: KeyMod.Alt | KeyCode.PauseBreak } - ), - CancelQueryKeyboardAction.LABEL - ); + new SyncActionDescriptor( + CancelQueryKeyboardAction, + CancelQueryKeyboardAction.ID, + CancelQueryKeyboardAction.LABEL, + { primary: KeyMod.Alt | KeyCode.PauseBreak } + ), + CancelQueryKeyboardAction.LABEL +); actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - RefreshIntellisenseKeyboardAction, - RefreshIntellisenseKeyboardAction.ID, - RefreshIntellisenseKeyboardAction.LABEL - ), + new SyncActionDescriptor( + RefreshIntellisenseKeyboardAction, + RefreshIntellisenseKeyboardAction.ID, RefreshIntellisenseKeyboardAction.LABEL - ); + ), + RefreshIntellisenseKeyboardAction.LABEL +); // Grid actions @@ -139,7 +139,7 @@ actionRegistry.registerWorkbenchAction( ToggleQueryResultsKeyboardAction, ToggleQueryResultsKeyboardAction.ID, ToggleQueryResultsKeyboardAction.LABEL, - { primary:KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R }, + { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R }, QueryEditorVisibleCondition ), ToggleQueryResultsKeyboardAction.LABEL @@ -299,7 +299,7 @@ for (let i = 0; i < 9; i++) { const queryIndex = i + 1; let settingKey = `sql.query.shortcut${queryIndex}`; let defaultVal = i < initialShortcuts.length ? initialShortcuts[i].name : ''; - let defaultPrimary = i < initialShortcuts.length ? initialShortcuts[i].primary : null; + let defaultPrimary = i < initialShortcuts.length ? initialShortcuts[i].primary : null; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: `workbench.action.query.shortcut${queryIndex}`, diff --git a/src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css b/src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css index 28b6166d0f..bdf8f0b80a 100644 --- a/src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css +++ b/src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css @@ -39,9 +39,11 @@ } .server-explorer-viewlet .monaco-action-bar .action-label { - margin-right: 0; + margin-right: 0.3em; margin-left: 0.3em; line-height: 15px; + width: 10px !important; + height: 10px !important; } /* Add space beneath the button */