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

Bug 1707101, remove duplication protection panel icons, r=mconley 

Differential Revision: https://phabricator.services.mozilla.com/D118170
This commit is contained in:
Neil Deakin 2021-06-18 13:37:25 +00:00
Родитель 496e371f46
Коммит bc6ca9ef7f
11 изменённых файлов: 13 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/components/protections/content/protections.html
Просмотреть файл

@ -78,13 +78,13 @@
<input id="tab-tracker" data-type="tracker" type="radio" name="tabs" aria-labelledby="trackerLabel trackerTitle" aria-describedby="trackerContent">
<label id="trackerLabel" for="tab-tracker" data-type="tracker">
<img class="icon-small" src="chrome://browser/skin/controlcenter/tracker-image.svg" data-type="tracker"/>
<img class="icon-small" src="chrome://browser/skin/canvas.svg" data-type="tracker"/>
<span data-type="tracker"></span>
</label>
<input id="tab-fingerprinter" data-type="fingerprinter" type="radio" name="tabs" aria-labelledby="fingerprinterLabel fingerprinterTitle" aria-describedby="fingerprinterContent">
<label id="fingerprinterLabel" for="tab-fingerprinter" data-type="fingerprinter">
<img class="icon-small" src="chrome://browser/skin/controlcenter/fingerprinters.svg" data-type="fingerprinter"/>
<img class="icon-small" src="chrome://browser/skin/fingerprint.svg" data-type="fingerprinter"/>
<span data-type="fingerprinter"></span>
</label>

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

@ -119,14 +119,6 @@ chrome/toolkit/skin/classic/global/icons/check.svg
browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
# Bug 1707101 - De-duplicate Protections Panel icons
browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image.svg
browser/chrome/browser/skin/classic/browser/notification-icons/canvas.svg
browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image-disabled.svg
browser/chrome/browser/skin/classic/browser/notification-icons/canvas-blocked.svg
browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters.svg
browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
# Bug 1708008 - De-duplicate extension icons
browser/chrome/browser/content/browser/extension.svg
chrome/toolkit/skin/classic/mozapps/extensions/extension.svg

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

@ -546,13 +546,13 @@ description#identity-popup-content-verifier,
}
.protections-popup-trackersView-icon {
list-style-image: url(chrome://browser/skin/controlcenter/tracker-image-disabled.svg);
list-style-image: url(chrome://browser/skin/canvas-blocked.svg);
width: 16px;
height: 16px;
}
.protections-popup-trackersView-icon.allowed {
list-style-image: url(chrome://browser/skin/controlcenter/tracker-image.svg);
list-style-image: url(chrome://browser/skin/canvas.svg);
}
.protections-popup-socialblockView-icon {
@ -576,7 +576,7 @@ description#identity-popup-content-verifier,
}
.protections-popup-fingerprintersView-icon.allowed {
list-style-image: url(chrome://browser/skin/controlcenter/fingerprinters.svg);
list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
.protections-popup-cryptominersView-icon {
@ -655,7 +655,7 @@ description#identity-popup-content-verifier,
}
.trackers-icon {
list-style-image: url(chrome://browser/skin/controlcenter/tracker-image.svg);
list-style-image: url(chrome://browser/skin/canvas.svg);
}
.socialblock-icon {
@ -671,7 +671,7 @@ description#identity-popup-content-verifier,
}
.fingerprinters-icon {
list-style-image: url(chrome://browser/skin/controlcenter/fingerprinters.svg);
list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
/* PERMISSIONS */

8
browser/themes/shared/controlcenter/tracker-image-disabled.svg
Просмотреть файл

@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M15.817 14.933 1.067.183a.626.626 0 0 0-.885.885l1.046 1.046A1.945 1.945 0 0 0 1 3l0 10a2 2 0 0 0 2 2l10 0c.323 0 .618-.092.886-.229l1.046 1.046a.627.627 0 0 0 .885 0 .625.625 0 0 0 0-.884zM2.85 13.75l-.6-.6 0-10.015L6.236 7.12 4.218 9.15A.749.749 0 0 0 4 9.679L4 11a1 1 0 0 0 1 1l6.115 0 1.75 1.75-10.015 0z"/>
<path d="m13.15 2.25.6.6 0 8.245 1.25 1.25L15 3a2 2 0 0 0-2-2L3.655 1l1.25 1.25 8.245 0z"/>
<path d="m11.6 5-1.2 0-.4.4 0 1.2.4.4 1.2 0 .4-.4 0-1.2z"/>
</svg>
Режим "рядом"

До

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

8
browser/themes/shared/controlcenter/tracker-image.svg
Просмотреть файл

@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M3 1a2 2 0 0 0-2 2l0 10a2 2 0 0 0 2 2l10 0a2 2 0 0 0 2-2l0-10a2 2 0 0 0-2-2L3 1zm10.75 12.15-.6.6-10.3 0-.6-.6 0-10.3.6-.6 10.3 0 .6.6 0 10.3z"/>
<path d="m11 12-6 0a1 1 0 0 1-1-1l0-1.321a.75.75 0 0 1 .218-.529L6.35 7.005a.75.75 0 0 1 1.061-.003l2.112 2.102.612-.577a.75.75 0 0 1 1.047.017l.6.605a.75.75 0 0 1 .218.529L12 11a1 1 0 0 1-1 1z"/>
<path d="m11.6 5-1.2 0-.4.4 0 1.2.4.4 1.2 0 .4-.4 0-1.2z"/>
</svg>
Режим "рядом"

До

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

0
browser/themes/shared/notification-icons/canvas-blocked.svg → browser/themes/shared/icons/canvas-blocked.svg
Просмотреть файл

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

До

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

После

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

0
browser/themes/shared/notification-icons/canvas.svg → browser/themes/shared/icons/canvas.svg
Просмотреть файл

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

До

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

После

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

0
browser/themes/shared/controlcenter/fingerprinters.svg → browser/themes/shared/icons/fingerprint.svg
Просмотреть файл

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

До

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

После

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

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

@ -29,12 +29,9 @@
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/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)
skin/classic/browser/controlcenter/socialblock.svg (../shared/controlcenter/socialblock.svg)
skin/classic/browser/controlcenter/socialblock-disabled.svg (../shared/controlcenter/socialblock-disabled.svg)
skin/classic/browser/controlcenter/tracker-image.svg (../shared/controlcenter/tracker-image.svg)
skin/classic/browser/controlcenter/tracker-image-disabled.svg (../shared/controlcenter/tracker-image-disabled.svg)
skin/classic/browser/controlcenter/trackers.svg (../shared/controlcenter/trackers.svg)
skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg)
skin/classic/browser/controlcenter/hero-message-background.svg (../shared/controlcenter/hero-message-background.svg)
@ -62,8 +59,6 @@
skin/classic/browser/notification-icons/autoplay-media-blocked.svg (../shared/notification-icons/autoplay-media-blocked.svg)
skin/classic/browser/notification-icons/camera-blocked.svg (../shared/notification-icons/camera-blocked.svg)
skin/classic/browser/notification-icons/camera.svg (../shared/notification-icons/camera.svg)
skin/classic/browser/notification-icons/canvas-blocked.svg (../shared/notification-icons/canvas-blocked.svg)
skin/classic/browser/notification-icons/canvas.svg (../shared/notification-icons/canvas.svg)
skin/classic/browser/notification-icons/desktop-notification-blocked.svg (../shared/notification-icons/desktop-notification-blocked.svg)
skin/classic/browser/notification-icons/desktop-notification.svg (../shared/notification-icons/desktop-notification.svg)
skin/classic/browser/notification-icons/drag-indicator.svg (../shared/notification-icons/drag-indicator.svg)
@ -82,7 +77,6 @@
skin/classic/browser/notification-icons/xr-blocked.svg (../shared/notification-icons/xr-blocked.svg)
skin/classic/browser/notification-icons/xr.svg (../shared/notification-icons/xr.svg)
skin/classic/browser/notification-icons/midi.svg (../shared/notification-icons/midi.svg)
skin/classic/browser/notification-icons/webauthn.svg (../shared/notification-icons/webauthn.svg)
skin/classic/browser/tracking-protection.svg (../shared/identity-block/tracking-protection.svg)
skin/classic/browser/tracking-protection-disabled.svg (../shared/identity-block/tracking-protection-disabled.svg)
@ -140,6 +134,8 @@
skin/classic/browser/bookmark-hollow.svg (../shared/icons/bookmark-hollow.svg)
skin/classic/browser/bookmark-star-on-tray.svg (../shared/icons/bookmark-star-on-tray.svg)
skin/classic/browser/bookmarks-toolbar.svg (../shared/icons/bookmarks-toolbar.svg)
skin/classic/browser/canvas.svg (../shared/icons/canvas.svg)
skin/classic/browser/canvas-blocked.svg (../shared/icons/canvas-blocked.svg)
skin/classic/browser/characterEncoding.svg (../shared/icons/characterEncoding.svg)
skin/classic/browser/chevron-animation.svg (../shared/icons/chevron-animation.svg)
skin/classic/browser/customize.svg (../shared/icons/customize.svg)
@ -152,6 +148,7 @@
skin/classic/browser/edit-copy.svg (../shared/icons/edit-copy.svg)
skin/classic/browser/edit-cut.svg (../shared/icons/edit-cut.svg)
skin/classic/browser/edit-paste.svg (../shared/icons/edit-paste.svg)
skin/classic/browser/fingerprint.svg (../shared/icons/fingerprint.svg)
skin/classic/browser/forget.svg (../shared/icons/forget.svg)
skin/classic/browser/forward.svg (../shared/icons/forward.svg)
skin/classic/browser/fullscreen.svg (../shared/icons/fullscreen.svg)

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

@ -206,16 +206,16 @@
#canvas-notification-icon,
.popup-notification-icon[popupid="canvas-permissions-prompt"],
.canvas-icon {
list-style-image: url(chrome://browser/skin/notification-icons/canvas.svg);
list-style-image: url(chrome://browser/skin/canvas.svg);
}
.canvas-icon.blocked-permission-icon {
list-style-image: url(chrome://browser/skin/notification-icons/canvas-blocked.svg);
list-style-image: url(chrome://browser/skin/canvas-blocked.svg);
}
#webauthn-notification-icon,
.popup-notification-icon[popupid^="webauthn-prompt-"] {
list-style-image: url(chrome://browser/skin/notification-icons/webauthn.svg);
list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
#permission-popup-menulist {

8
browser/themes/shared/notification-icons/webauthn.svg
Просмотреть файл

@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M.625 13a.625.625 0 0 1 0-1.25l3.25 0A4.88 4.88 0 0 0 8.75 6.875l0-.25a.625.625 0 0 1 1.25 0l0 .25A6.132 6.132 0 0 1 3.875 13l-3.25 0z"/>
<path d="M12.096 15.248a.625.625 0 0 1-.491-1.012c4.281-5.446 3.261-8.813 2.271-10.337-1.346-2.07-4.169-3.106-6.71-2.464-2.428.615-3.951 2.583-4.178 5.397-.027.345-.364.585-.673.574a.626.626 0 0 1-.573-.673C2.011 3.4 3.924.967 6.859.224c3.044-.768 6.437.489 8.064 2.995 1.172 1.803 2.426 5.732-2.337 11.791a.622.622 0 0 1-.49.238z"/>
<path d="M5.734 16a.624.624 0 0 1-.165-1.228c5.912-1.62 6.147-7.768 6.148-7.829a2.113 2.113 0 0 0-.457-1.708 2.713 2.713 0 0 0-1.689-.947c-.683-.109-1.357.021-1.902.371-.521.334-.859.83-.95 1.396l-.217 1.209a3.621 3.621 0 0 1-3.567 2.986l-2.31 0a.625.625 0 0 1 0-1.25l2.31 0a2.373 2.373 0 0 0 2.337-1.957l.215-1.196c.146-.912.683-1.711 1.509-2.24a3.95 3.95 0 0 1 2.774-.553 3.964 3.964 0 0 1 2.461 1.394c.618.762.878 1.688.729 2.611.005 0-.27 7.059-7.061 8.919a.619.619 0 0 1-.165.022z"/>
</svg>
Режим "рядом"

До

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