Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace small Tomster icons with Ember's 'e' icon #876

Merged
merged 4 commits into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed public/assets/images/ember-icon-final.png
Binary file not shown.
Binary file removed public/assets/images/hamster.png
Binary file not shown.
Binary file modified public/assets/images/icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/icon19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/icon38.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/icon48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/images/tomster.png
Binary file not shown.
1 change: 1 addition & 0 deletions public/assets/svg/ember-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion skeletons/firefox/data/toolbar-button-panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</style>
</head>
<body>
<img src="./images/icon48.png">
<img src="./svg/ember-icon.svg">
<h5>
Ember Inspector <u id="inspectorVersion">VERSION</u>
</h5>
Expand Down
4 changes: 2 additions & 2 deletions skeletons/firefox/lib/tomster-devtool-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -102,7 +102,7 @@ let EmberInspector = Class({

/**
* Keep track of the last version.
*
*
* @propery _lastVersion
* @type {String}
*/
Expand Down
4 changes: 2 additions & 2 deletions skeletons/firefox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}]
Expand Down
6 changes: 3 additions & 3 deletions skeletons/web-extension/background-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion skeletons/web-extension/devtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
1 change: 1 addition & 0 deletions skeletons/web-extension/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions skeletons/web-extension/options-dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<body>
<label>
<input type="checkbox" data-settings="tomster">
Display the Tomster
<img src="/{{PANE_ROOT}}/assets/images/icon19.png" width="19" height="19">
Display the Ember favicon
<img src="/{{PANE_ROOT}}/assets/svg/ember-icon.svg" width="19" height="19">
when a site runs Ember.js
</label>
<script src="options.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions skeletons/web-extension/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<div class="frame">
<div class="navigation">
<img src="/{{PANE_ROOT}}/assets/images/tomster.png" width="100" height="95">
<img src="/{{PANE_ROOT}}/assets/svg/ember-icon.svg" width="100" height="95">
<ul class="menu">
<li class="selected">
<a href="#">Settings</a>
Expand All @@ -47,8 +47,8 @@ <h1>Settings</h1>
<form action="submit">
<label class="tomster-toggle">
<input type="checkbox" data-settings="tomster">
Display the Tomster
<img src="/{{PANE_ROOT}}/assets/images/icon19.png" width="19" height="19">
Display the Ember favicon
<img src="/{{PANE_ROOT}}/assets/svg/ember-icon.svg" width="19" height="19">
when a site runs Ember.js
</label>
</form>
Expand Down
2 changes: 1 addition & 1 deletion skeletons/web-extension/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* Extension options for Chrome.
* This allows the user to decide if the Tomster icon should show when visiting
* This allows the user to decide if the Ember icon should show when visiting
* a webpage that has Ember running.
*
* see:
Expand Down