Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1630615 - Remove duplicate settings icons. r=dao

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D71185
This commit is contained in:
Tim Nguyen 2020-04-16 18:48:33 +00:00
parent a82a710fd6
commit 55d9542872
24 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/aboutlogins/content/components/menu-button.css
View File

@ -71,7 +71,7 @@
}
.menuitem-preferences {
background-image: url("chrome://browser/skin/settings.svg");
background-image: url("chrome://global/skin/icons/settings.svg");
}
.menuitem-mobile-ios {

2
browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSPrivacyModal/_DSPrivacyModal.scss
View File

@ -32,7 +32,7 @@
}
&.modal-link-manage::before {
background-image: url('chrome://browser/skin/settings.svg');
background-image: url('chrome://global/skin/icons/settings.svg');
}
}

2
browser/components/newtab/content-src/styles/_icons.scss
View File

@ -75,7 +75,7 @@
}
&.icon-settings {
background-image: url('chrome://browser/skin/settings.svg');
background-image: url('chrome://global/skin/icons/settings.svg');
}
&.icon-pin {

4
browser/components/newtab/css/activity-stream-linux.css
View File

@ -182,7 +182,7 @@ body {
.icon.icon-new-window-private {
background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
.icon.icon-settings {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.icon.icon-pin {
background-image: url("../data/content/assets/glyph-pin-16.svg"); }
.icon.icon-pin:dir(rtl) {
@ -3216,7 +3216,7 @@ main {
.ds-privacy-modal .modal-link.modal-link-privacy::before {
background-image: url("../data/content/assets/glyph-info-16.svg"); }
.ds-privacy-modal .modal-link.modal-link-manage::before {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.ds-privacy-modal p {
line-height: 24px; }

4
browser/components/newtab/css/activity-stream-mac.css
View File

@ -185,7 +185,7 @@ body {
.icon.icon-new-window-private {
background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
.icon.icon-settings {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.icon.icon-pin {
background-image: url("../data/content/assets/glyph-pin-16.svg"); }
.icon.icon-pin:dir(rtl) {
@ -3219,7 +3219,7 @@ main {
.ds-privacy-modal .modal-link.modal-link-privacy::before {
background-image: url("../data/content/assets/glyph-info-16.svg"); }
.ds-privacy-modal .modal-link.modal-link-manage::before {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.ds-privacy-modal p {
line-height: 24px; }

4
browser/components/newtab/css/activity-stream-windows.css
View File

@ -182,7 +182,7 @@ body {
.icon.icon-new-window-private {
background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
.icon.icon-settings {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.icon.icon-pin {
background-image: url("../data/content/assets/glyph-pin-16.svg"); }
.icon.icon-pin:dir(rtl) {
@ -3216,7 +3216,7 @@ main {
.ds-privacy-modal .modal-link.modal-link-privacy::before {
background-image: url("../data/content/assets/glyph-info-16.svg"); }
.ds-privacy-modal .modal-link.modal-link-manage::before {
background-image: url("chrome://browser/skin/settings.svg"); }
background-image: url("chrome://global/skin/icons/settings.svg"); }
.ds-privacy-modal p {
line-height: 24px; }

2
browser/components/preferences/in-content/preferences.xhtml
View File

@ -51,7 +51,7 @@
<link rel="localization" href="security/certificates/deviceManager.ftl"/>
<link rel="localization" href="security/certificates/certManager.ftl"/>
<link rel="shortcut icon" href="chrome://browser/skin/settings.svg"/>
<link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
<script src="chrome://browser/content/utilityOverlay.js"/>
<script src="chrome://global/content/preferencesBindings.js"/>

2
browser/components/protections/content/protections.css
View File

@ -234,7 +234,7 @@ a.hidden,
padding-inline: 24px 3px;
-moz-context-properties: fill;
fill: currentColor;
background: url("chrome://browser/skin/settings.svg") no-repeat 3px;
background: url("chrome://global/skin/icons/settings.svg") no-repeat 3px;
font-size: 0.75em;
cursor: default;
width: max-content;

2
browser/themes/osx/places/organizer.css
View File

@ -138,7 +138,7 @@
/* organize button */
#organizeButton {
list-style-image: url("chrome://browser/skin/settings.svg");
list-style-image: url("chrome://global/skin/icons/settings.svg");
}
/* view button */

2
browser/themes/shared/controlcenter/panel.inc.css
View File

@ -1040,7 +1040,7 @@ description#identity-popup-content-verifier,
}
.protections-popup-settings-icon {
list-style-image: url(chrome://browser/skin/settings.svg);
list-style-image: url(chrome://global/skin/icons/settings.svg);
}
.protections-popup-show-report-icon {

6
browser/themes/shared/icons/settings.svg
View File

@ -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" viewBox="0 0 16 16">
<path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 936 B

1
browser/themes/shared/jar.inc.mn
View File

@ -216,7 +216,6 @@
skin/classic/browser/save.svg (../shared/icons/save.svg)
skin/classic/browser/search-glass.svg (../shared/icons/search-glass.svg)
skin/classic/browser/send-to-device.svg (../shared/icons/send-to-device.svg)
skin/classic/browser/settings.svg (../shared/icons/settings.svg)
skin/classic/browser/sidebars.svg (../shared/icons/sidebars.svg)
skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg)
skin/classic/browser/sign-out.svg (../shared/icons/sign-out.svg)

2
browser/themes/shared/menupanel.inc.css
View File

@ -32,7 +32,7 @@
#PanelUI-fxa-menu-sync-prefs-button,
#PanelUI-fxa-menu-account-devices-button,
#appMenu-preferences-button {
list-style-image: url(chrome://browser/skin/settings.svg);
list-style-image: url(chrome://global/skin/icons/settings.svg);
}
#appMenu-customize-button {

2
browser/themes/shared/searchbar.inc.css
View File

@ -212,7 +212,7 @@
}
.search-setting-button-compact > .button-box > .button-icon {
list-style-image: url("chrome://browser/skin/settings.svg");
list-style-image: url("chrome://global/skin/icons/settings.svg");
-moz-context-properties: fill, fill-opacity;
fill: currentColor;
fill-opacity: .6;

2
browser/themes/shared/toolbarbutton-icons.inc.css
View File

@ -265,7 +265,7 @@ toolbar[brighttext] {
}
#preferences-button {
list-style-image: url("chrome://browser/skin/settings.svg");
list-style-image: url("chrome://global/skin/icons/settings.svg");
}
#PanelUI-menu-button {

2
browser/themes/windows/places/organizer.css
View File

@ -72,7 +72,7 @@
/* organize button */
#organizeButton {
list-style-image: url("chrome://browser/skin/settings.svg");
list-style-image: url("chrome://global/skin/icons/settings.svg");
}
/* view button */

4
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
View File

@ -7,7 +7,7 @@
var EXPORTED_SYMBOLS = ["Tabs"];
const CUST_TAB = "chrome://browser/skin/customize.svg";
const PREFS_TAB = "chrome://browser/skin/settings.svg";
const PREFS_TAB = "chrome://global/skin/icons/settings.svg";
const DEFAULT_FAVICON_TAB = `data:text/html,<meta%20charset="utf-8"><title>No%20favicon</title>`;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
@ -159,7 +159,7 @@ async function allTabTitlesDisplayed(browserWindow) {
"about:addons": "Add-ons Manager",
"about:privatebrowsing": "about:privatebrowsing",
};
specToTitleMap[PREFS_TAB] = "browser/skin/settings.svg";
specToTitleMap[PREFS_TAB] = "global/skin/icons/settings.svg";
specToTitleMap[CUST_TAB] = "browser/skin/customize.svg";
specToTitleMap[DEFAULT_FAVICON_TAB] = "No favicon";

2
toolkit/mozapps/extensions/content/aboutaddons.css
View File

@ -344,7 +344,7 @@ addon-card:not([expanded]) .addon-description {
}
.page-options-menu > .more-options-button {
background-image: url("chrome://mozapps/skin/extensions/utilities.svg");
background-image: url("chrome://global/skin/icons/settings.svg");
width: 32px;
height: 32px;
}

2
toolkit/themes/shared/alert.inc.css
View File

@ -134,7 +134,7 @@
border-width: 0;
border-radius: 20px;
min-width: 0;
list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
list-style-image: url("chrome://global/skin/icons/settings.svg");
-moz-context-properties: fill;
fill: currentColor;
margin-inline-end: 4px;

6
toolkit/themes/shared/extensions/utilities.svg
View File

@ -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">
<path fill="context-fill" d="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 880 B

6
toolkit/themes/shared/icons/settings.svg Normal file
View File

@ -0,0 +1,6 @@
<!-- 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="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 916 B

4
toolkit/themes/shared/in-content/common.inc.css
View File

@ -1112,11 +1112,11 @@ html|*.help-icon {
}
.preferences-icon {
background-image: url("chrome://browser/skin/preferences/general.svg");
background-image: url("chrome://global/skin/icons/settings.svg");
}
.addons-icon {
list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg");
list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
/* The add-ons icon doesn't have much (any?) margin, so make it a bit smaller. */
width: 14px;
height: 14px;

1
toolkit/themes/shared/jar.inc.mn
View File

@ -52,6 +52,7 @@ toolkit.jar:
skin/classic/global/pictureinpicture/play.svg (../../shared/pictureinpicture/play.svg)
skin/classic/global/icons/identity-icon.svg (../../shared/icons/identity-icon.svg)
skin/classic/global/icons/resizer.svg (../../shared/icons/resizer.svg)
skin/classic/global/icons/settings.svg (../../shared/icons/settings.svg)
skin/classic/global/icons/shortcut.svg (../../shared/icons/shortcut.svg)
skin/classic/global/icons/spinner-arrow-down.svg (../../shared/icons/spinner-arrow-down.svg)
skin/classic/global/icons/spinner-arrow-up.svg (../../shared/icons/spinner-arrow-up.svg)

1
toolkit/themes/shared/mozapps.inc.mn
View File

@ -14,7 +14,6 @@
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/extension.svg (../../shared/extensions/extension.svg)
skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg)
skin/classic/mozapps/extensions/recommended.svg (../../shared/extensions/recommended.svg)
#ifndef ANDROID
skin/classic/mozapps/extensions/rating-star.svg (../../shared/extensions/rating-star.svg)