mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1421039 - Remove duplicate extension icons r=mstriemer 

Differential Revision: https://phabricator.services.mozilla.com/D63288

--HG--
rename : browser/themes/shared/controlcenter/extension.svg => toolkit/themes/shared/extensions/extension.svg
extra : moz-landing-system : lando
This commit is contained in:
ajitesh 2020-03-23 15:24:24 +00:00
Родитель bd152e0d88
Коммит 74c011887b
16 изменённых файлов: 13 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/components/extensions/test/browser/browser_ext_identity_indication.js
Просмотреть файл

@ -29,7 +29,7 @@ function confirmExtensionPage() {
is(
getComputedStyle(identityIconEl).listStyleImage,
'url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg")',
'url("chrome://mozapps/skin/extensions/extension.svg")',
"Identity icon should be the default extension icon"
);

2
browser/components/preferences/in-content/extensionControlled.js
Просмотреть файл

@ -247,7 +247,7 @@ function showEnableExtensionMessage(settingName) {
};
let label = document.createXULElement("label");
let addonIcon = icon(
"chrome://mozapps/skin/extensions/extensionGeneric-16.svg",
"chrome://mozapps/skin/extensions/extension.svg",
"addons-icon"
);
let toolbarIcon = icon("chrome://browser/skin/menu.svg", "menu-icon");

2
browser/installer/allowed-dupes.mn
Просмотреть файл

@ -16,10 +16,8 @@ browser/chrome/browser/content/branding/icon32.png
browser/chrome/browser/content/branding/icon48.png
browser/chrome/browser/content/branding/icon64.png
browser/chrome/browser/content/browser/defaultthemes/5.header.png
browser/chrome/browser/content/browser/extension.svg
browser/chrome/browser/content/browser/places/bookmarkProperties.xhtml
browser/chrome/browser/content/browser/places/bookmarkProperties2.xhtml
browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
browser/chrome/browser/skin/classic/browser/connection-secure.svg
browser/chrome/browser/skin/classic/browser/controlcenter/warning-gray.svg
# devtools reduction is bug 1311178

2
browser/themes/shared/addon-notification.inc.css
Просмотреть файл

@ -55,7 +55,7 @@ html|*.addon-webext-perm-list {
}
.addon-addon-icon {
list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
}
.addon-toolbar-icon {

19
browser/themes/shared/addons/addon-install-confirm.svg
Просмотреть файл

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="64" height="64" viewBox="0 0 64 64">
<defs>
<style>
.style-puzzle-piece {
fill: url('#gradient-linear-puzzle-piece');
}
</style>
<linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
<stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
<stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
</linearGradient>
</defs>
<path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
</svg>
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 1.4 KiB

2
browser/themes/shared/controlcenter/panel.inc.css
Просмотреть файл

@ -395,7 +395,7 @@
}
#identity-popup[connection=extension] .identity-popup-security-connection {
background-image: url(chrome://browser/skin/controlcenter/extension.svg);
background-image: url(chrome://mozapps/skin/extensions/extension.svg);
-moz-context-properties: fill;
fill: #60bf4c;
}

4
browser/themes/shared/identity-block/identity-block.inc.css
Просмотреть файл

@ -146,11 +146,11 @@
}
#urlbar[actiontype="extension"] > #urlbar-input-container > #identity-box > #identity-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
}
#identity-box[pageproxystate="valid"].extensionPage > #identity-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
}
#identity-box[pageproxystate="valid"].verifiedDomain > #identity-icon,

2
browser/themes/shared/jar.inc.mn
Просмотреть файл

@ -17,7 +17,6 @@
skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
skin/classic/browser/setDesktopBackground.css (../shared/setDesktopBackground.css)
skin/classic/browser/addons/addon-install-blocked.svg (../shared/addons/addon-install-blocked.svg)
skin/classic/browser/addons/addon-install-confirm.svg (../shared/addons/addon-install-confirm.svg)
skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
skin/classic/browser/addons/addon-install-error.svg (../shared/addons/addon-install-error.svg)
skin/classic/browser/addons/addon-install-installed.svg (../shared/addons/addon-install-installed.svg)
@ -28,7 +27,6 @@
skin/classic/browser/controlcenter/dashboard.svg (../shared/controlcenter/dashboard.svg)
skin/classic/browser/controlcenter/cryptominers-disabled.svg (../shared/controlcenter/cryptominers-disabled.svg)
skin/classic/browser/controlcenter/mcb-disabled.svg (../shared/controlcenter/mcb-disabled.svg)
skin/classic/browser/controlcenter/extension.svg (../shared/controlcenter/extension.svg)
skin/classic/browser/controlcenter/etp-milestone.svg (../shared/controlcenter/etp-milestone.svg)
skin/classic/browser/controlcenter/fingerprinters.svg (../shared/controlcenter/fingerprinters.svg)
skin/classic/browser/controlcenter/fingerprinters-disabled.svg (../shared/controlcenter/fingerprinters-disabled.svg)

2
browser/themes/shared/menupanel.inc.css
Просмотреть файл

@ -26,7 +26,7 @@
}
#appMenu-addons-button {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
}
#PanelUI-fxa-menu-sync-prefs-button,

4
browser/themes/shared/notification-icons.inc.css
Просмотреть файл

@ -273,7 +273,7 @@ html|*#webRTC-previewVideo {
/* INSTALL ADDONS */
.install-icon {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
}
.install-icon.blocked-permission-icon,
@ -292,7 +292,7 @@ html|*#webRTC-previewVideo {
}
.popup-notification-icon[popupid="addon-install-confirmation"] {
list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
list-style-image: url(chrome://browser/content/extension.svg);
}
#addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {

2
browser/themes/shared/toolbarbutton-icons.inc.css
Просмотреть файл

@ -205,7 +205,7 @@ toolbar[brighttext] {
}
#add-ons-button {
list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
}
#open-file-button {

2
toolkit/components/aboutperformance/content/aboutPerformance.js
Просмотреть файл

@ -373,7 +373,7 @@ var State = {
continue;
}
name = `${addon.name} (${addon.id})`;
image = "chrome://mozapps/skin/extensions/extensionGeneric-16.svg";
image = "chrome://mozapps/skin/extensions/extension.svg";
type = gSystemAddonIds.has(addon.id) ? "system-addon" : "addon";
} else if (id == 0 && !tab.isWorker) {
name = { id: "ghost-windows" };

2
toolkit/mozapps/extensions/content/extensions.xhtml
Просмотреть файл

@ -22,7 +22,7 @@
role="application" windowtype="Addons:Manager">
<xhtml:link rel="shortcut icon"
href="chrome://mozapps/skin/extensions/extensionGeneric-16.svg"/>
href="chrome://mozapps/skin/extensions/extension.svg"/>
<linkset>
<xhtml:link rel="localization" href="branding/brand.ftl"/>
<xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/>

0
browser/themes/shared/controlcenter/extension.svg → toolkit/themes/shared/extensions/extension.svg
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 1.0 KiB

После

Ширина:  |  Высота:  |  Размер: 1.0 KiB

6
toolkit/themes/shared/extensions/extensionGeneric-16.svg
Просмотреть файл

@ -1,6 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"/>
</svg>
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 909 B

3
toolkit/themes/shared/mozapps.inc.mn
Просмотреть файл

@ -15,8 +15,7 @@
skin/classic/mozapps/extensions/category-service.svg (../../shared/extensions/category-service.svg)
skin/classic/mozapps/extensions/category-recent.svg (../../shared/extensions/category-recent.svg)
skin/classic/mozapps/extensions/category-available.svg (../../shared/extensions/category-available.svg)
skin/classic/mozapps/extensions/extensionGeneric-16.svg (../../shared/extensions/extensionGeneric-16.svg)
skin/classic/mozapps/extensions/extension.svg (../../shared/extensions/extension.svg)
skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg)
skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg)
skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg)