diff --git a/angular.json b/angular.json index 28ed68f9678..72e5abfb400 100644 --- a/angular.json +++ b/angular.json @@ -24,7 +24,7 @@ "tsConfig": "tsconfig.app.json", "vendorChunk": false, "aot": true, - "assets": ["src/favicon.ico", "src/assets"], + "assets": ["src/assets"], "styles": ["src/styles.scss"], "scripts": [] }, @@ -92,7 +92,7 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", - "assets": ["src/favicon.ico", "src/assets"], + "assets": ["src/assets"], "styles": ["src/styles.scss"], "scripts": [] } @@ -141,7 +141,6 @@ "vendorChunk": false, "aot": true, "assets": [ - "projects/shell-chrome/src/favicon.ico", "projects/shell-chrome/src/assets", "projects/shell-chrome/src/manifest.json", "projects/shell-chrome/src/devtools.html", @@ -208,7 +207,7 @@ "polyfills": "projects/shell-chrome/src/polyfills.ts", "tsConfig": "projects/shell-chrome/tsconfig.spec.json", "karmaConfig": "projects/shell-chrome/karma.conf.js", - "assets": ["projects/shell-chrome/src/favicon.ico", "projects/shell-chrome/src/assets"], + "assets": ["projects/shell-chrome/src/assets"], "styles": ["projects/shell-chrome/src/styles.scss"], "scripts": [] } @@ -393,7 +392,7 @@ "main": "projects/demo-no-zone/src/main.ts", "polyfills": "projects/demo-no-zone/src/polyfills.ts", "tsConfig": "projects/demo-no-zone/tsconfig.app.json", - "assets": ["projects/demo-no-zone/src/favicon.ico", "projects/demo-no-zone/src/assets"], + "assets": ["projects/demo-no-zone/src/assets"], "styles": ["projects/demo-no-zone/src/styles.css"], "scripts": [] }, @@ -448,7 +447,7 @@ "polyfills": "projects/demo-no-zone/src/polyfills.ts", "tsConfig": "projects/demo-no-zone/tsconfig.spec.json", "karmaConfig": "projects/demo-no-zone/karma.conf.js", - "assets": ["projects/demo-no-zone/src/favicon.ico", "projects/demo-no-zone/src/assets"], + "assets": ["projects/demo-no-zone/src/assets"], "styles": ["projects/demo-no-zone/src/styles.css"], "scripts": [] } diff --git a/projects/demo-no-zone/src/favicon.ico b/projects/demo-no-zone/src/favicon.ico deleted file mode 100644 index 8081c7ceaf2..00000000000 Binary files a/projects/demo-no-zone/src/favicon.ico and /dev/null differ diff --git a/projects/demo-no-zone/src/index.html b/projects/demo-no-zone/src/index.html index 41760f4e3fa..073f2aba1b9 100644 --- a/projects/demo-no-zone/src/index.html +++ b/projects/demo-no-zone/src/index.html @@ -6,7 +6,7 @@ - + diff --git a/projects/shell-chrome/src/app/background.ts b/projects/shell-chrome/src/app/background.ts index bb36f2764e2..05acd398cc8 100644 --- a/projects/shell-chrome/src/app/background.ts +++ b/projects/shell-chrome/src/app/background.ts @@ -1,5 +1,15 @@ import { AngularDetection } from './ng-validate'; +// By default use the black and white icon. +// Replace it only when we detect an Angular app. +chrome.browserAction.setIcon({ + path: { + 16: `assets/icon-bw16.png`, + 48: `assets/icon-bw48.png`, + 128: `assets/icon-bw128.png`, + }, +}); + const ports: { [tab: string]: | { @@ -113,7 +123,9 @@ chrome.runtime.onMessage.addListener((req, sender) => { chrome.browserAction.setIcon({ tabId: sender.tab.id, path: { - 16: `assets/favicon.ico`, + 16: `assets/icon16.png`, + 48: `assets/icon48.png`, + 128: `assets/icon128.png`, }, }); } diff --git a/projects/shell-chrome/src/assets/favicon.ico b/projects/shell-chrome/src/assets/favicon.ico deleted file mode 100644 index cebb174068b..00000000000 Binary files a/projects/shell-chrome/src/assets/favicon.ico and /dev/null differ diff --git a/projects/shell-chrome/src/assets/icon-bw128.png b/projects/shell-chrome/src/assets/icon-bw128.png new file mode 100644 index 00000000000..73d8f7e44ca Binary files /dev/null and b/projects/shell-chrome/src/assets/icon-bw128.png differ diff --git a/projects/shell-chrome/src/assets/icon-bw16.png b/projects/shell-chrome/src/assets/icon-bw16.png new file mode 100644 index 00000000000..dafc9e59475 Binary files /dev/null and b/projects/shell-chrome/src/assets/icon-bw16.png differ diff --git a/projects/shell-chrome/src/assets/icon-bw48.png b/projects/shell-chrome/src/assets/icon-bw48.png new file mode 100644 index 00000000000..040a37020fb Binary files /dev/null and b/projects/shell-chrome/src/assets/icon-bw48.png differ diff --git a/projects/shell-chrome/src/assets/icon128.png b/projects/shell-chrome/src/assets/icon128.png new file mode 100644 index 00000000000..1c8186103d8 Binary files /dev/null and b/projects/shell-chrome/src/assets/icon128.png differ diff --git a/projects/shell-chrome/src/assets/icon16.png b/projects/shell-chrome/src/assets/icon16.png new file mode 100644 index 00000000000..bb6ea681a4e Binary files /dev/null and b/projects/shell-chrome/src/assets/icon16.png differ diff --git a/projects/shell-chrome/src/assets/icon48.png b/projects/shell-chrome/src/assets/icon48.png new file mode 100644 index 00000000000..3e20df96579 Binary files /dev/null and b/projects/shell-chrome/src/assets/icon48.png differ diff --git a/projects/shell-chrome/src/devtools.ts b/projects/shell-chrome/src/devtools.ts index ea713dc2b59..0f6aedbed5f 100644 --- a/projects/shell-chrome/src/devtools.ts +++ b/projects/shell-chrome/src/devtools.ts @@ -1 +1 @@ -chrome.devtools.panels.create('Angular', 'favicon.ico', 'index.html'); +chrome.devtools.panels.create('Angular', 'assets/icon-bw16.png', 'index.html'); diff --git a/projects/shell-chrome/src/favicon.ico b/projects/shell-chrome/src/favicon.ico deleted file mode 100644 index 997406ad22c..00000000000 Binary files a/projects/shell-chrome/src/favicon.ico and /dev/null differ diff --git a/projects/shell-chrome/src/index.html b/projects/shell-chrome/src/index.html index 430087d69aa..961767aef51 100644 --- a/projects/shell-chrome/src/index.html +++ b/projects/shell-chrome/src/index.html @@ -1,14 +1,14 @@ - + - - - ShellChrome - - - - - - - - + + + ShellChrome + + + + + + + + diff --git a/projects/shell-chrome/src/manifest.json b/projects/shell-chrome/src/manifest.json index 8cda59f7a93..85e0d886a66 100644 --- a/projects/shell-chrome/src/manifest.json +++ b/projects/shell-chrome/src/manifest.json @@ -2,13 +2,15 @@ "manifest_version": 2, "short_name": "Angular DevTools", "name": "Angular Developer Tools", - "description": "Extends the Developer Tools, adding tools for debugging and profiling Angular applications.", + "description": "Angular DevTools extends Chrome DevTools adding Angular specific debugging and profiling capabilities.", "version": "1.0.0", "version_name": "1.0.0", "minimum_chrome_version": "50", "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'", "icons": { - "16": "favicon.ico" + "16": "assets/icon16.png", + "48": "assets/icon48.png", + "128": "assets/icon128.png" }, "browser_action": { "default_popup": "popups/not-angular.html" diff --git a/src/favicon.ico b/src/favicon.ico deleted file mode 100644 index 997406ad22c..00000000000 Binary files a/src/favicon.ico and /dev/null differ diff --git a/src/index.html b/src/index.html index 079ca8fc046..b3359645256 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@ AngularDevtools - +