diff --git a/public/assets/images/ember-icon-final.png b/public/assets/images/ember-icon-final.png deleted file mode 100644 index 01c7bb6623..0000000000 Binary files a/public/assets/images/ember-icon-final.png and /dev/null differ diff --git a/public/assets/images/hamster.png b/public/assets/images/hamster.png deleted file mode 100644 index d01d47bee8..0000000000 Binary files a/public/assets/images/hamster.png and /dev/null differ diff --git a/public/assets/images/icon128.png b/public/assets/images/icon128.png index d9a220efa5..3b60079642 100644 Binary files a/public/assets/images/icon128.png and b/public/assets/images/icon128.png differ diff --git a/public/assets/images/icon16.png b/public/assets/images/icon16.png index d644dce159..7df9f82c10 100644 Binary files a/public/assets/images/icon16.png and b/public/assets/images/icon16.png differ diff --git a/public/assets/images/icon19.png b/public/assets/images/icon19.png index 6e325e23cc..37e4fac03e 100644 Binary files a/public/assets/images/icon19.png and b/public/assets/images/icon19.png differ diff --git a/public/assets/images/icon38.png b/public/assets/images/icon38.png index b4e30388ca..477d0452e2 100644 Binary files a/public/assets/images/icon38.png and b/public/assets/images/icon38.png differ diff --git a/public/assets/images/icon48.png b/public/assets/images/icon48.png index 22675c89d5..1cfafb8a88 100644 Binary files a/public/assets/images/icon48.png and b/public/assets/images/icon48.png differ diff --git a/public/assets/images/tomster.png b/public/assets/images/tomster.png deleted file mode 100644 index 4d4c748e8d..0000000000 Binary files a/public/assets/images/tomster.png and /dev/null differ diff --git a/public/assets/svg/ember-icon.svg b/public/assets/svg/ember-icon.svg new file mode 100644 index 0000000000..54a9fe3c5c --- /dev/null +++ b/public/assets/svg/ember-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skeletons/firefox/data/toolbar-button-panel.html b/skeletons/firefox/data/toolbar-button-panel.html index baaf521d4a..4865780ec1 100644 --- a/skeletons/firefox/data/toolbar-button-panel.html +++ b/skeletons/firefox/data/toolbar-button-panel.html @@ -15,7 +15,7 @@ - +
Ember Inspector VERSION
diff --git a/skeletons/firefox/lib/tomster-devtool-panel.js b/skeletons/firefox/lib/tomster-devtool-panel.js index 8144994a19..8ccda616de 100644 --- a/skeletons/firefox/lib/tomster-devtool-panel.js +++ b/skeletons/firefox/lib/tomster-devtool-panel.js @@ -30,7 +30,7 @@ exports.openEmberInspector = function () { exports.devtoolTabDefinition = { id: "ember-inspector", ordinal: 7, - icon: self.data.url("{{PANE_ROOT}}/assets/images/icon19.png"), + icon: self.data.url("{{PANE_ROOT}}/assets/svg/ember-icon.svg"), url: self.data.url("devtool-panel.html"), label: "Ember{{env}}", tooltip: "Ember Inspector", @@ -102,7 +102,7 @@ let EmberInspector = Class({ /** * Keep track of the last version. - * + * * @propery _lastVersion * @type {String} */ diff --git a/skeletons/firefox/package.json b/skeletons/firefox/package.json index c325f8c9df..9b81485bfc 100644 --- a/skeletons/firefox/package.json +++ b/skeletons/firefox/package.json @@ -8,8 +8,8 @@ "main": "lib/main.js", "preferences": [{ "name": "tomsterLocationbarButtonToggle", - "title": "Display The Tomster icon when a site runs Ember.js", - "description": "Display The Tomster icon when a site runs Ember.js", + "title": "Display The Ember icon when a site runs Ember.js", + "description": "Display The Ember icon when a site runs Ember.js", "type": "bool", "value": false }] diff --git a/skeletons/web-extension/background-script.js b/skeletons/web-extension/background-script.js index f67651f7ac..21eb73553a 100644 --- a/skeletons/web-extension/background-script.js +++ b/skeletons/web-extension/background-script.js @@ -6,7 +6,7 @@ * ClientApp. The background-script serves as a proxy between the EmberInspector * and the content-script. * - * It is also responsible for showing the Tomster icon and tooltip in the url bar. + * It is also responsible for showing the Ember icon and tooltip in the url bar. * * See: * https://developer.chrome.com/extensions/background_pages @@ -57,7 +57,7 @@ } /** - * Remove the curent tab's Tomster. + * Remove the curent tab's Ember icon. * Typically used to clearout the icon after reload. * @param {Number} tabId - the current tab */ @@ -152,7 +152,7 @@ updateTabAction(sender.tab.id); updateContextMenu(); } else if (request && request.type === 'resetEmberIcon') { - // hide the Tomster icon + // hide the Ember icon hideAction(sender.tab.id); } else if (request && request.type === 'inspectorLoaded') { updateContextMenu(true); diff --git a/skeletons/web-extension/devtools.js b/skeletons/web-extension/devtools.js index 5d31038a81..e18a37601c 100644 --- a/skeletons/web-extension/devtools.js +++ b/skeletons/web-extension/devtools.js @@ -6,4 +6,4 @@ */ var panelWindow, injectedPanel = false, injectedPage = false, panelVisible = false, savedStack = []; -chrome.devtools.panels.create("Ember{{env}}", "{{PANE_ROOT}}/assets/images/icon16.png", "{{PANE_ROOT}}/index.html"); +chrome.devtools.panels.create("Ember{{env}}", "{{PANE_ROOT}}/assets/svg/ember-icon.svg", "{{PANE_ROOT}}/index.html"); diff --git a/skeletons/web-extension/manifest.json b/skeletons/web-extension/manifest.json index df54be3703..5b3b863341 100644 --- a/skeletons/web-extension/manifest.json +++ b/skeletons/web-extension/manifest.json @@ -7,6 +7,7 @@ "icons": { "16": "{{PANE_ROOT}}/assets/images/icon16.png", + "32": "{{PANE_ROOT}}/assets/images/icon38.png", "48": "{{PANE_ROOT}}/assets/images/icon48.png", "128": "{{PANE_ROOT}}/assets/images/icon128.png" }, diff --git a/skeletons/web-extension/options-dialog.html b/skeletons/web-extension/options-dialog.html index 5a7fe39cf9..c03e5323f6 100644 --- a/skeletons/web-extension/options-dialog.html +++ b/skeletons/web-extension/options-dialog.html @@ -12,8 +12,8 @@ diff --git a/skeletons/web-extension/options.html b/skeletons/web-extension/options.html index 8c5680a0d1..169ad5530f 100644 --- a/skeletons/web-extension/options.html +++ b/skeletons/web-extension/options.html @@ -22,7 +22,7 @@
- +