From c6c863cd84c94c6b21a4b3d7a0ffe452eb423e46 Mon Sep 17 00:00:00 2001 From: Aditya Bist Date: Tue, 17 Sep 2019 14:10:38 -0700 Subject: [PATCH] commiter work (#7244) * fix incorrect css and removed redundant css warnings * add gulp step to check all files * added files file * revert build to hygiene job * keep css changes only --- build/gulpfile.sql.js | 1 - .../base/browser/ui/taskbar/media/icons.css | 12 ++--- src/sql/media/objectTypes/objecttypes.css | 50 ++++--------------- .../jobManagement/browser/jobActions.ts | 2 +- .../browser/widgets/explorer/explorerTree.ts | 2 +- .../browser/media/jobHistory.css | 9 ---- .../parts/query/browser/media/notabstitle.css | 9 ---- 7 files changed, 15 insertions(+), 70 deletions(-) diff --git a/build/gulpfile.sql.js b/build/gulpfile.sql.js index 2eca57f0c3..f4c141d4db 100644 --- a/build/gulpfile.sql.js +++ b/build/gulpfile.sql.js @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; - const gulp = require('gulp'); const util = require('./lib/util'); const tsfmt = require('typescript-formatter'); diff --git a/src/sql/base/browser/ui/taskbar/media/icons.css b/src/sql/base/browser/ui/taskbar/media/icons.css index 6eed96081b..c9a41d0a31 100644 --- a/src/sql/base/browser/ui/taskbar/media/icons.css +++ b/src/sql/base/browser/ui/taskbar/media/icons.css @@ -60,19 +60,13 @@ background-repeat: no-repeat; } -.vs .icon.estimatedQueryPlan { - background-image: url('query-plan.svg'); -} - -.vs-dark .icon.estimatedQueryPlan, -.hc-black .icon.estimatedQueryPlan { - background-image: url('query-plan-inverse.svg'); -} - +.vs .icon.estimatedQueryPlan, .vs .icon.actualQueryPlan { background-image: url('query-plan.svg'); } +.vs-dark .icon.estimatedQueryPlan, +.hc-black .icon.estimatedQueryPlan, .vs-dark .icon.actualQueryPlan, .hc-black .icon.actualQueryPlan { background-image: url('query-plan-inverse.svg'); diff --git a/src/sql/media/objectTypes/objecttypes.css b/src/sql/media/objectTypes/objecttypes.css index fcf9d9c498..06ea1fec5f 100644 --- a/src/sql/media/objectTypes/objecttypes.css +++ b/src/sql/media/objectTypes/objecttypes.css @@ -9,18 +9,6 @@ background: url("Table.svg") center center no-repeat; } -.vs .icon.stored-procedure, -.vs-dark .icon.stored-procedure, -.hc-black .icon.stored-procedure { - background: url("StoredProcedure.svg") center center no-repeat; -} - -.vs .icon.view, -.vs-dark .icon.view, -.hc-black .icon.view { - background: url("View.svg") center center no-repeat; -} - .vs .icon.aggregatefunction, .vs-dark .icon.aggregatefunction, .hc-black .icon.aggregatefunction { @@ -155,7 +143,13 @@ .vs .icon.defaulticon, .vs-dark .icon.defaulticon, -.hc-black .icon.defaulticon { +.hc-black .icon.defaulticon, +.vs .icon.filegroup, +.vs-dark .icon.filegroup, +.hc-black .icon.filegroup, +.vs .icon.historytable, +.vs-dark .icon.historytable, +.hc-black .icon.historytable { background: url("DefaultIcon.svg") center center no-repeat; } @@ -214,10 +208,7 @@ .vs .icon.key_primarykey, .vs-dark .icon.key_primarykey, -.hc-black .icon.key_primarykey { - background: url("Key_PrimaryKey.svg") center center no-repeat; -} - +.hc-black .icon.key_primarykey, .vs .icon.index_primarykey, .vs-dark .icon.index_primarykey, .hc-black .icon.index_primarykey { @@ -226,14 +217,11 @@ .vs .icon.key_uniquekey, .vs-dark .icon.key_uniquekey, -.hc-black .icon.key_uniquekey { - background: url("Key_UniqueKey.svg") center center no-repeat; -} - +.hc-black .icon.key_uniquekey, .vs .icon.index_uniquekey, .vs-dark .icon.index_uniquekey, .hc-black .icon.index_uniquekey { - background: url("Key_UniqueKey.svg") center center no-repeat; + background: url("Key_UniqueKey.svg") center center no-repeat; } .vs .icon.masterkey, @@ -637,21 +625,3 @@ .hc-black .icon.xmlschemacollection { background: url("XmlSchemaCollection.svg") center center no-repeat; } - -.vs .icon.filegroup, -.vs-dark .icon.filegroup, -.hc-black .icon.filegroup { - background: url("DefaultIcon.svg") center center no-repeat; -} - -.vs .icon.securitypolicie, -.vs-dark .icon.securitypolicie, -.hc-black .icon.securitypolicie { - background: url("DefaultIcon.svg") center center no-repeat; -} - -.vs .icon.historytable, -.vs-dark .icon.historytable, -.hc-black .icon.historytable { - background: url("DefaultIcon.svg") center center no-repeat; -} \ No newline at end of file diff --git a/src/sql/platform/jobManagement/browser/jobActions.ts b/src/sql/platform/jobManagement/browser/jobActions.ts index 3360c484cf..47274e1203 100644 --- a/src/sql/platform/jobManagement/browser/jobActions.ts +++ b/src/sql/platform/jobManagement/browser/jobActions.ts @@ -180,7 +180,7 @@ export class OpenMaterializedNotebookAction extends Action { constructor( @ICommandService private _commandService: ICommandService ) { - super(OpenMaterializedNotebookAction.ID, OpenMaterializedNotebookAction.LABEL, 'open'); + super(OpenMaterializedNotebookAction.ID, OpenMaterializedNotebookAction.LABEL, 'openNotebook'); } public run(context: any): Promise { diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts index ad6cb4b266..7700f19c4e 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts @@ -220,7 +220,7 @@ export class ExplorerRenderer implements tree.IRenderer { templateData.icon.className = 'icon scalarvaluedfunction'; break; case MetadataType.SProc: - templateData.icon.className = 'icon stored-procedure'; + templateData.icon.className = 'icon storedprocedure'; break; case MetadataType.Table: templateData.icon.className = 'icon table'; diff --git a/src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css b/src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css index c71ac95a80..b0122ad1fc 100644 --- a/src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css +++ b/src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css @@ -160,15 +160,6 @@ input#accordion:checked ~ .accordion-content, background-image: url("new_inverse.svg"); } -.vs .action-label.icon.opennotebook { - background-image: url("open_notebook.svg"); -} - -.vs-dark .action-label.icon.opennotebook, -.hc-black .action-label.icon.newStepIcon { - background-image: url("open_notebook_inverse.svg"); -} - jobhistory-component .hc-black .icon.edit, jobhistory-component .vs-dark .icon.edit, notebookhistory-component .hc-black .icon.edit, diff --git a/src/sql/workbench/parts/query/browser/media/notabstitle.css b/src/sql/workbench/parts/query/browser/media/notabstitle.css index deec5a1e4d..a4ca1dcd5d 100644 --- a/src/sql/workbench/parts/query/browser/media/notabstitle.css +++ b/src/sql/workbench/parts/query/browser/media/notabstitle.css @@ -36,12 +36,3 @@ .hc-black .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.dirty .title-actions .close-editor-action { background: url('close-dirty-inverse.svg') center center no-repeat; } - -.vs .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.dirty .title-actions .close-editor-action:hover { - background: url('close.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.dirty .title-actions .close-editor-action:hover, -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.dirty .title-actions .close-editor-action:hover { - background: url('close-inverse.svg') center center no-repeat; -} \ No newline at end of file