Backed out changeset 7749765974c1 (bug 1630615) for failing browser_primaryUI.js on a CLOSED TREE

This commit is contained in:
Andreea Pavel 2020-04-16 20:12:17 +03:00
Родитель f3ca5aa03c
Коммит 3cd455d5ca
22 изменённых файлов: 34 добавлений и 27 удалений

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -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" 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>

После

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

Просмотреть файл

@ -216,6 +216,7 @@
skin/classic/browser/save.svg (../shared/icons/save.svg) skin/classic/browser/save.svg (../shared/icons/save.svg)
skin/classic/browser/search-glass.svg (../shared/icons/search-glass.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/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.svg (../shared/icons/sidebars.svg)
skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg) skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg)
skin/classic/browser/sign-out.svg (../shared/icons/sign-out.svg) skin/classic/browser/sign-out.svg (../shared/icons/sign-out.svg)

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -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">
<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>

После

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

Просмотреть файл

@ -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="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>

До

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

Просмотреть файл

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

Просмотреть файл

@ -52,7 +52,6 @@ toolkit.jar:
skin/classic/global/pictureinpicture/play.svg (../../shared/pictureinpicture/play.svg) 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/identity-icon.svg (../../shared/icons/identity-icon.svg)
skin/classic/global/icons/resizer.svg (../../shared/icons/resizer.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/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-down.svg (../../shared/icons/spinner-arrow-down.svg)
skin/classic/global/icons/spinner-arrow-up.svg (../../shared/icons/spinner-arrow-up.svg) skin/classic/global/icons/spinner-arrow-up.svg (../../shared/icons/spinner-arrow-up.svg)

Просмотреть файл

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