diff --git a/src/command/Menus.js b/src/command/Menus.js index c15060438..cd04998ac 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -807,7 +807,7 @@ define(function (require, exports, module) { // create MenuItem DOM if (_isHTMLMenu(this.id)) { // Create the HTML MenuItem - var $menuItem = $("
  • " + + var $menuItem = $("
  • " + "" + name + "" + "" + "
  • "); diff --git a/src/extensions/default/JavaScriptRefactoring/keyboard.json b/src/extensions/default/JavaScriptRefactoring/keyboard.json index 3e374fb90..6927b977f 100644 --- a/src/extensions/default/JavaScriptRefactoring/keyboard.json +++ b/src/extensions/default/JavaScriptRefactoring/keyboard.json @@ -1,9 +1,9 @@ { "extractToVariable": [ - "Ctrl-Shift-V" + "Ctrl-Alt-V" ], "extractToFunction": [ - "Ctrl-Shift-M" + "Ctrl-Alt-M" ], "renameIdentifier": [ { diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 7c69bbcb9..49b99d36c 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -688,7 +688,7 @@ define({ "CMD_REFACTORING_RENAME" : "Rename", "CMD_REFACTORING_TRY_CATCH" : "Wrap in Try Catch", "CMD_REFACTORING_CONDITION" : "Wrap in Condition", - "CMD_REFACTORING_GETTERS_SETTERS" : "Create Getters Setters", + "CMD_REFACTORING_GETTERS_SETTERS" : "Create Getters/Setters", "CMD_REFACTORING_ARROW_FUNCTION" : "Convert to Arrow Function", "DESCRIPTION_CODE_REFACTORING" : "Enable/disable JavaScript Code Refactoring", "ERROR_TRY_CATCH" : "Select valid code to wrap in a Try-catch block", diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 1068e0ba3..3824aa242 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -67,7 +67,7 @@ @bc-menu-separator: #eaeaea; // inline menu widget -@bc-inlinemenu-bg: #d7d7d7; +@bc-inlinemenu-text: #d4d4d4; // Warning @bc-warning-bg: #fdf5cc; @@ -157,7 +157,7 @@ @dark-bc-menu-separator: #343434; // inline menu widget -@dark-bc-inlinemenu-bg: #47484b; +@dark-bc-inlinemenu-text: #d4d4d4; // Warning @dark-bc-warning-bg: #c95800; diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 475d88f84..4df15a68b 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -501,17 +501,25 @@ a:focus { // Styles used for inlinemenu widget header li.inlinemenu-header a { - background-color: @bc-inlinemenu-bg; + background-color: @bc-bg-tool-bar; + color: @bc-inlinemenu-text; + padding-bottom: 5px; .dark & { - background-color: @dark-bc-inlinemenu-bg; + background-color: @dark-bc-bg-tool-bar; + color: @dark-bc-inlinemenu-text; + padding-bottom: 5px; } &:hover { - background-color: @bc-inlinemenu-bg; + background-color: @bc-bg-tool-bar; + color: @bc-inlinemenu-text; + padding-bottom: 5px; .dark & { - background-color: @dark-bc-inlinemenu-bg; + background-color: @dark-bc-bg-tool-bar; + color: @dark-bc-inlinemenu-text; + padding-bottom: 5px; } } } @@ -520,7 +528,7 @@ a:focus { a { // Less padding than on menus. More padding on top than bottom // to center font within its bg highlight better. - padding: 2px 20px 0 0; + padding: 2px 20px 4px 0; // Don't show highlighting on hover for code hints... &:hover {