From 579e6bf0cb4d51122e58295fcc8ec8e2a4ac2f1e Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Tue, 6 Feb 2018 19:13:14 -0500 Subject: [PATCH] Fix additional regressions in master (#621) --- extensions/theme-defaults/package.json | 36 +- .../theme-defaults/themes/dark_defaults.json | 14 - .../theme-defaults/themes/dark_plus.json | 158 -------- extensions/theme-defaults/themes/dark_vs.json | 355 ----------------- .../theme-defaults/themes/light_defaults.json | 14 - .../theme-defaults/themes/light_plus.json | 159 -------- .../theme-defaults/themes/light_vs.json | 374 ------------------ src/sql/media/actionBarLabel.css | 6 +- .../viewlet/serverTreeView.ts | 6 +- src/sql/workbench/update/releaseNotes.ts | 2 +- 10 files changed, 10 insertions(+), 1114 deletions(-) delete mode 100644 extensions/theme-defaults/themes/dark_defaults.json delete mode 100644 extensions/theme-defaults/themes/dark_plus.json delete mode 100644 extensions/theme-defaults/themes/dark_vs.json delete mode 100644 extensions/theme-defaults/themes/light_defaults.json delete mode 100644 extensions/theme-defaults/themes/light_plus.json delete mode 100644 extensions/theme-defaults/themes/light_vs.json diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json index 7a48ad6ece..8549eb073f 100644 --- a/extensions/theme-defaults/package.json +++ b/extensions/theme-defaults/package.json @@ -1,7 +1,7 @@ { "name": "theme-defaults", - "displayName": "Default Themes", - "description": "The default light and dark themes (Plus and Visual Studio)", + "displayName": "High Contrast Theme", + "description": "High Contrast theme", "categories": [ "Themes" ], "version": "0.1.10", "publisher": "vscode", @@ -9,42 +9,10 @@ "contributes": { "themes": [ { - "id": "Default Dark+", - "label": "Dark+ (default dark)", - "uiTheme": "vs-dark", - "path": "./themes/dark_plus.json" - }, - { - "id": "Default Light+", - "label": "Light+ (default light)", - "uiTheme": "vs", - "path": "./themes/light_plus.json" - }, - { - "id": "Visual Studio Dark", - "label": "Dark (Visual Studio)", - "uiTheme": "vs-dark", - "path": "./themes/dark_vs.json" - }, - { - "id": "Visual Studio Light", - "label": "Light (Visual Studio)", - "uiTheme": "vs", - "path": "./themes/light_vs.json" - }, - { - "id": "Default High Contrast", "label": "High Contrast", "uiTheme": "hc-black", "path": "./themes/hc_black.json" } - ], - "iconThemes": [ - { - "id": "vs-minimal", - "label": "Minimal (Visual Studio Code)", - "path": "./fileicons/vs_minimal-icon-theme.json" - } ] } } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/dark_defaults.json b/extensions/theme-defaults/themes/dark_defaults.json deleted file mode 100644 index e15677c62c..0000000000 --- a/extensions/theme-defaults/themes/dark_defaults.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Dark Default Colors", - "colors": { - "editor.background": "#1E1E1E", - "editor.foreground": "#D4D4D4", - "editor.inactiveSelectionBackground": "#3A3D41", - "editorIndentGuide.background": "#404040", - "editor.selectionHighlightBackground": "#ADD6FF26", - "list.dropBackground": "#383B3D", - "activityBarBadge.background": "#007ACC", - "sideBarTitle.foreground": "#BBBBBB" - } -} \ No newline at end of file diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json deleted file mode 100644 index fe868c9a37..0000000000 --- a/extensions/theme-defaults/themes/dark_plus.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Dark+ (default dark)", - "include": "./dark_vs.json", - "tokenColors": [ - { - "name": "Function declarations", - "scope": [ - "entity.name.function", - "support.function", - "support.constant.handlebars" - ], - "settings": { - "foreground": "#DCDCAA" - } - }, - { - "name": "Types declaration and references", - "scope": [ - "meta.return-type", - "support.class", - "support.type", - "entity.name.type", - "entity.name.class", - "storage.type.cs", - "storage.type.generic.cs", - "storage.type.modifier.cs", - "storage.type.variable.cs", - "storage.type.annotation.java", - "storage.type.generic.java", - "storage.type.java", - "storage.type.object.array.java", - "storage.type.primitive.array.java", - "storage.type.primitive.java", - "storage.type.token.java", - "storage.type.groovy", - "storage.type.annotation.groovy", - "storage.type.parameters.groovy", - "storage.type.generic.groovy", - "storage.type.object.array.groovy", - "storage.type.primitive.array.groovy", - "storage.type.primitive.groovy" - ], - "settings": { - "foreground": "#4EC9B0" - } - }, - { - "name": "Types declaration and references, TS grammar specific", - "scope": [ - "meta.type.cast.expr", - "meta.type.new.expr", - "support.constant.math", - "support.constant.dom", - "support.constant.json", - "entity.other.inherited-class" - ], - "settings": { - "foreground": "#4EC9B0" - } - }, - { - "name": "Control flow keywords", - "scope": "keyword.control", - "settings": { - "foreground": "#C586C0" - } - }, - { - "name": "Variable and parameter name", - "scope": [ - "variable", - "meta.definition.variable.name", - "support.variable" - ], - "settings": { - "foreground": "#9CDCFE" - } - }, - { - "name": "Object keys, TS grammar specific", - "scope": [ - "meta.object-literal.key" - ], - "settings": { - "foreground": "#9CDCFE" - } - }, - { - "name": "CSS property value", - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#CE9178" - } - }, - { - "name": "Regular expression groups", - "scope": [ - "punctuation.definition.group.regexp", - "punctuation.definition.group.assertion.regexp", - "punctuation.definition.character-class.regexp", - "punctuation.character.set.begin.regexp", - "punctuation.character.set.end.regexp", - "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp" - ], - "settings": { - "foreground": "#CE9178" - } - }, - { - "scope": [ - "constant.character.character-class.regexp", - "constant.other.character-class.set.regexp", - "constant.other.character-class.regexp", - "constant.character.set.regexp" - ], - "settings": { - "foreground": "#d16969" - } - }, - { - "scope": [ - "keyword.operator.or.regexp", - "keyword.control.anchor.regexp" - ], - "settings": { - "foreground": "#DCDCAA" - } - }, - { - "scope": "keyword.operator.quantifier.regexp", - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "constant.character", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "constant.character.escape", - "settings": { - "foreground": "#d7ba7d" - } - } - ] -} \ No newline at end of file diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json deleted file mode 100644 index 2059bf263f..0000000000 --- a/extensions/theme-defaults/themes/dark_vs.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Dark (Visual Studio)", - "include": "./dark_defaults.json", - "tokenColors": [ - { - "scope": [ - "meta.embedded", - "source.groovy.embedded" - ], - "settings": { - "foreground": "#D4D4D4" - } - }, - { - "scope": "emphasis", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "strong", - "settings": { - "fontStyle": "bold" - } - }, - { - "scope": "header", - "settings": { - "foreground": "#000080" - } - }, - { - "scope": "comment", - "settings": { - "foreground": "#608b4e" - } - }, - { - "scope": "constant.language", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": [ - "constant.numeric" - ], - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "constant.regexp", - "settings": { - "foreground": "#646695" - } - }, - { - "scope": "entity.name.tag", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "entity.name.tag.css", - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "entity.other.attribute-name", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": [ - "entity.other.attribute-name.class.css", - "entity.other.attribute-name.class.mixin.css", - "entity.other.attribute-name.id.css", - "entity.other.attribute-name.parent-selector.css", - "entity.other.attribute-name.pseudo-class.css", - "entity.other.attribute-name.pseudo-element.css", - "source.css.less entity.other.attribute-name.id", - "entity.other.attribute-name.attribute.scss", - "entity.other.attribute-name.scss" - ], - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "invalid", - "settings": { - "foreground": "#f44747" - } - }, - { - "scope": "markup.underline", - "settings": { - "fontStyle": "underline" - } - }, - { - "scope": "markup.bold", - "settings": { - "fontStyle": "bold", - "foreground": "#569cd6" - } - }, - { - "scope": "markup.heading", - "settings": { - "fontStyle": "bold", - "foreground": "#569cd6" - } - }, - { - "scope": "markup.italic", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "markup.inserted", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "markup.deleted", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "markup.changed", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "beginning.punctuation.definition.quote.markdown", - "settings": { - "foreground": "#608b4e" - } - }, - { - "scope": "beginning.punctuation.definition.list.markdown", - "settings": { - "foreground": "#6796e6" - } - }, - { - "scope": "markup.inline.raw", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "meta.selector", - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "name": "brackets of XML/HTML tags", - "scope": "punctuation.definition.tag", - "settings": { - "foreground": "#808080" - } - }, - { - "scope": "meta.preprocessor", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "meta.preprocessor.string", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "meta.preprocessor.numeric", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "meta.structure.dictionary.key.python", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "meta.diff.header", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "storage", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "storage.type", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "storage.modifier", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "string", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.tag", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.value", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.regexp", - "settings": { - "foreground": "#d16969" - } - }, - { - "name": "String interpolation", - "scope": [ - "punctuation.definition.template-expression.begin", - "punctuation.definition.template-expression.end", - "punctuation.section.embedded" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "name": "Reset JavaScript string interpolation expression", - "scope": [ - "meta.template.expression" - ], - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "scope": [ - "support.type.vendored.property-name", - "support.type.property-name", - "variable.css", - "variable.scss", - "variable.other.less", - "source.coffee.embedded" - ], - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "keyword", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.control", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.operator", - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "scope": [ - "keyword.operator.new", - "keyword.operator.expression", - "keyword.operator.cast", - "keyword.operator.sizeof", - "keyword.operator.logical.python" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.other.unit", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": [ - "punctuation.section.embedded.begin.php", - "punctuation.section.embedded.end.php" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "support.function.git-rebase", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "constant.sha.git-rebase", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "name": "coloring of the Java import and package identifiers", - "scope": [ - "storage.modifier.import.java", - "variable.language.wildcard.java", - "storage.modifier.package.java" - ], - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "name": "this.self", - "scope": "variable.language", - "settings": { - "foreground": "#569cd6" - } - } - ] -} \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_defaults.json b/extensions/theme-defaults/themes/light_defaults.json deleted file mode 100644 index ad85f38214..0000000000 --- a/extensions/theme-defaults/themes/light_defaults.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Light Default Colors", - "colors": { - "editor.background": "#FFFFFF", - "editor.foreground": "#000000", - "editor.inactiveSelectionBackground": "#E5EBF1", - "editorIndentGuide.background": "#D3D3D3", - "editor.selectionHighlightBackground": "#ADD6FF4D", - "editorSuggestWidget.background": "#F3F3F3", - "activityBarBadge.background": "#007ACC", - "sideBarTitle.foreground": "#6F6F6F" - } -} \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json deleted file mode 100644 index 0ab71013c2..0000000000 --- a/extensions/theme-defaults/themes/light_plus.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Light+ (default light)", - "include": "./light_vs.json", - "tokenColors": [ - { - "name": "Function declarations", - "scope": [ - "entity.name.function", - "support.function", - "support.constant.handlebars" - ], - "settings": { - "foreground": "#795E26" - } - }, - { - "name": "Types declaration and references", - "scope": [ - "meta.return-type", - "support.class", - "support.type", - "entity.name.type", - "entity.name.class", - "storage.type.cs", - "storage.type.generic.cs", - "storage.type.modifier.cs", - "storage.type.variable.cs", - "storage.type.annotation.java", - "storage.type.generic.java", - "storage.type.java", - "storage.type.object.array.java", - "storage.type.primitive.array.java", - "storage.type.primitive.java", - "storage.type.token.java", - "storage.type.groovy", - "storage.type.annotation.groovy", - "storage.type.parameters.groovy", - "storage.type.generic.groovy", - "storage.type.object.array.groovy", - "storage.type.primitive.array.groovy", - "storage.type.primitive.groovy" - ], - "settings": { - "foreground": "#267f99" - } - }, - { - "name": "Types declaration and references, TS grammar specific", - "scope": [ - "meta.type.cast.expr", - "meta.type.new.expr", - "support.constant.math", - "support.constant.dom", - "support.constant.json", - "entity.other.inherited-class" - ], - "settings": { - "foreground": "#267f99" - } - }, - { - "name": "Control flow keywords", - "scope": "keyword.control", - "settings": { - "foreground": "#AF00DB" - } - }, - { - "name": "Variable and parameter name", - "scope": [ - "variable", - "meta.definition.variable.name", - "support.variable" - ], - "settings": { - "foreground": "#001080" - } - }, - { - "name": "Object keys, TS grammar specific", - "scope": [ - "meta.object-literal.key" - ], - "settings": { - "foreground": "#001080" - } - }, - { - "name": "CSS property value", - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "name": "Regular expression groups", - "scope": [ - "punctuation.definition.group.regexp", - "punctuation.definition.group.assertion.regexp", - "punctuation.definition.character-class.regexp", - "punctuation.character.set.begin.regexp", - "punctuation.character.set.end.regexp", - "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp" - ], - "settings": { - "foreground": "#d16969" - } - }, - { - "scope": [ - "constant.character.character-class.regexp", - "constant.other.character-class.set.regexp", - "constant.other.character-class.regexp", - "constant.character.set.regexp" - ], - "settings": { - "foreground": "#811f3f" - } - }, - { - "scope": "keyword.operator.quantifier.regexp", - "settings": { - "foreground": "#000000" - } - }, - { - "scope": [ - "keyword.operator.or.regexp", - "keyword.control.anchor.regexp" - ], - "settings": { - "foreground": "#ff0000" - } - }, - { - "scope": "constant.character", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "constant.character.escape", - "settings": { - "foreground": "#a31515" - } - } - - ] -} \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json deleted file mode 100644 index 08866668af..0000000000 --- a/extensions/theme-defaults/themes/light_vs.json +++ /dev/null @@ -1,374 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Light (Visual Studio)", - "include": "./light_defaults.json", - "tokenColors": [ - { - "scope": ["meta.embedded", "source.groovy.embedded"], - "settings": { - "foreground": "#000000ff" - } - }, - { - "scope": "emphasis", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "strong", - "settings": { - "fontStyle": "bold" - } - }, - { - "scope": "meta.diff.header", - "settings": { - "foreground": "#000080" - } - }, - { - "scope": "comment", - "settings": { - "foreground": "#008000" - } - }, - { - "scope": "constant.language", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": [ - "constant.numeric" - ], - "settings": { - "foreground": "#09885a" - } - }, - { - "scope": "constant.regexp", - "settings": { - "foreground": "#811f3f" - } - }, - { - "name": "css tags in selectors, xml tags", - "scope": "entity.name.tag", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "entity.name.selector", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "entity.other.attribute-name", - "settings": { - "foreground": "#ff0000" - } - }, - { - "scope": [ - "entity.other.attribute-name.class.css", - "entity.other.attribute-name.class.mixin.css", - "entity.other.attribute-name.id.css", - "entity.other.attribute-name.parent-selector.css", - "entity.other.attribute-name.pseudo-class.css", - "entity.other.attribute-name.pseudo-element.css", - "source.css.less entity.other.attribute-name.id", - "entity.other.attribute-name.attribute.scss", - "entity.other.attribute-name.scss" - ], - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "invalid", - "settings": { - "foreground": "#cd3131" - } - }, - { - "scope": "markup.underline", - "settings": { - "fontStyle": "underline" - } - }, - { - "scope": "markup.bold", - "settings": { - "fontStyle": "bold", - "foreground": "#000080" - } - }, - { - "scope": "markup.heading", - "settings": { - "fontStyle": "bold", - "foreground": "#800000" - } - }, - { - "scope": "markup.italic", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "markup.inserted", - "settings": { - "foreground": "#09885a" - } - }, - { - "scope": "markup.deleted", - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": "markup.changed", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": [ - "beginning.punctuation.definition.quote.markdown", - "beginning.punctuation.definition.list.markdown" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "markup.inline.raw", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "meta.selector", - "settings": { - "foreground": "#800000" - } - }, - { - "name": "brackets of XML/HTML tags", - "scope": "punctuation.definition.tag", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "meta.preprocessor", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "meta.preprocessor.string", - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": "meta.preprocessor.numeric", - "settings": { - "foreground": "#09885a" - } - }, - { - "scope": "meta.structure.dictionary.key.python", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "storage", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "storage.type", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "storage.modifier", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "string", - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": [ - "string.comment.buffered.block.jade", - "string.quoted.jade", - "string.interpolated.jade", - "string.unquoted.plain.in.yaml", - "string.unquoted.plain.out.yaml", - "string.unquoted.block.yaml", - "string.quoted.single.yaml", - "string.quoted.double.xml", - "string.quoted.single.xml", - "string.unquoted.cdata.xml", - "string.quoted.double.html", - "string.quoted.single.html", - "string.unquoted.html", - "string.quoted.single.handlebars", - "string.quoted.double.handlebars" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "string.regexp", - "settings": { - "foreground": "#811f3f" - } - }, - { - "name": "String interpolation", - "scope": [ - "punctuation.definition.template-expression.begin", - "punctuation.definition.template-expression.end", - "punctuation.section.embedded" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "name": "Reset JavaScript string interpolation expression", - "scope": [ - "meta.template.expression" - ], - "settings": { - "foreground": "#000000" - } - }, - { - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": [ - "support.type.vendored.property-name", - "support.type.property-name", - "variable.css", - "variable.scss", - "variable.other.less", - "source.coffee.embedded" - ], - "settings": { - "foreground": "#ff0000" - } - }, - { - "scope": "support.type.property-name.json", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "keyword", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.control", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.operator", - "settings": { - "foreground": "#000000" - } - }, - { - "scope": [ - "keyword.operator.new", - "keyword.operator.expression", - "keyword.operator.cast", - "keyword.operator.sizeof", - "keyword.operator.logical.python" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.other.unit", - "settings": { - "foreground": "#09885a" - } - }, - { - "scope": [ - "punctuation.section.embedded.begin.php", - "punctuation.section.embedded.end.php" - ], - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "support.function.git-rebase", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "constant.sha.git-rebase", - "settings": { - "foreground": "#09885a" - } - }, - { - "name": "coloring of the Java import and package identifiers", - "scope": [ - "storage.modifier.import.java", - "variable.language.wildcard.java", - "storage.modifier.package.java" - ], - "settings": { - "foreground": "#000000" - } - }, - { - "name": "this.self", - "scope": "variable.language", - "settings": { - "foreground": "#0000ff" - } - } - ] -} \ No newline at end of file diff --git a/src/sql/media/actionBarLabel.css b/src/sql/media/actionBarLabel.css index 0bf41f03ef..de8a96069c 100644 --- a/src/sql/media/actionBarLabel.css +++ b/src/sql/media/actionBarLabel.css @@ -16,19 +16,19 @@ } /* Activity Bar - explore */ -.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.explore { +.monaco-workbench > .activitybar .monaco-action-bar .action-label.explore { -webkit-mask: url('icons/file_inverse.svg') no-repeat 50% 50%; -webkit-mask-size: 25px 25px; } /* Activity Bar - source control */ -.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.scm { +.monaco-workbench > .activitybar .monaco-action-bar .action-label.scm { -webkit-mask: url('icons/sourcecontrol_inverse.svg') no-repeat 50% 50%; -webkit-mask-size: 25px 25px; } /* Activity Bar - search */ -.monaco-workbench > .activitybar > .content > .monaco-action-bar .action-label.search { +.monaco-workbench > .activitybar .monaco-action-bar .action-label.search { -webkit-mask: url('icons/search_inverse.svg') no-repeat 50% 50%; -webkit-mask-size: 25px 25px; } diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeView.ts b/src/sql/parts/registeredServer/viewlet/serverTreeView.ts index f7faa4b585..e0f5ce0625 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeView.ts +++ b/src/sql/parts/registeredServer/viewlet/serverTreeView.ts @@ -61,8 +61,10 @@ export class ServerTreeView { this._onSelectionOrFocusChange = new Emitter(); if (this._capabilitiesService) { this._capabilitiesService.onCapabilitiesReady().then(() => { - this.refreshTree(); - this._treeSelectionHandler.onTreeActionStateChange(false); + if (this._connectionManagementService.hasRegisteredServers()) { + this.refreshTree(); + this._treeSelectionHandler.onTreeActionStateChange(false); + } }); } } diff --git a/src/sql/workbench/update/releaseNotes.ts b/src/sql/workbench/update/releaseNotes.ts index eed1d5a8b1..f67ed7a4b3 100644 --- a/src/sql/workbench/update/releaseNotes.ts +++ b/src/sql/workbench/update/releaseNotes.ts @@ -68,7 +68,7 @@ export class ProductContribution implements IWorkbenchContribution { text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text), { pinned: true }), () => { messageService.show(Severity.Info, { - message: nls.localize('read the release notes', "Welcome to {0} January Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version), + message: nls.localize('read the release notes', "Welcome to {0} February Public Preview! Would you like to view the Getting Started Guide?", product.nameLong, pkg.version), actions: [ instantiationService.createInstance(OpenGettingStartedInBrowserAction), CloseAction