зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1390511 - Replace inconsistent padlock icons. r=johannh
MozReview-Commit-ID: 5j4ntbJDVGu --HG-- extra : rebase_source : d85af7ebde0c84fec4ae1317b045b867fc1c7839
This commit is contained in:
Dale Harvey
Родитель
a47c2d6ea7
Коммит
bf10e62b24
|
|
@ -155,10 +155,10 @@ add_task(async function test_ignoring_window_opener() {
|
|||
"url(\"chrome://browser/skin/connection-secure.svg\")",
|
||||
"Using expected icon image in the identity block");
|
||||
is(securityViewBG,
|
||||
"url(\"chrome://browser/skin/controlcenter/connection.svg#connection-secure\")",
|
||||
"url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"Using expected icon image in the Control Center main view");
|
||||
is(securityContentBG,
|
||||
"url(\"chrome://browser/skin/controlcenter/connection.svg#connection-secure\")",
|
||||
"url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"Using expected icon image in the Control Center subview");
|
||||
|
||||
ok(Array.every(document.querySelectorAll("[when-loginforms=insecure]"),
|
||||
|
|
|
|||
|
|
@ -232,9 +232,9 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) {
|
|||
}
|
||||
|
||||
if (stateSecure) {
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-secure\")",
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using secure icon");
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-secure\")",
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using secure icon");
|
||||
}
|
||||
|
||||
|
|
@ -245,15 +245,15 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) {
|
|||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/mcb-disabled.svg\")",
|
||||
"CC using active loaded icon");
|
||||
} else if (activeBlocked || passiveLoaded) {
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-degraded\")",
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using degraded icon");
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-degraded\")",
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using degraded icon");
|
||||
} else {
|
||||
// There is a case here with weak ciphers, but no bc tests are handling this yet.
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-degraded\")",
|
||||
is(securityViewBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using degraded icon");
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg#connection-degraded\")",
|
||||
is(securityContentBG, "url(\"chrome://browser/skin/controlcenter/connection.svg\")",
|
||||
"CC using degraded icon");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,28 +2,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" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
width="24" height="24" viewBox="0 0 24 24">
|
||||
#include ../icon-colors.inc.svg
|
||||
<style>
|
||||
svg > rect:not(:target) {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
<defs>
|
||||
<rect id="shape-lock-clasp-outer" x="5" y="1" width="14" height="20" rx="7" ry="7" />
|
||||
<rect id="shape-lock-clasp-inner" x="8" y="4" width="8" height="14" rx="4" ry="4" />
|
||||
<rect id="shape-lock-base" x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" />
|
||||
<mask id="mask-clasp-cutout">
|
||||
<rect width="24" height="24" fill="#000" />
|
||||
<use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
|
||||
<use xlink:href="#shape-lock-clasp-inner" fill="#000" />
|
||||
</mask>
|
||||
<mask id="mask-lock">
|
||||
<use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#fff"/>
|
||||
<use xlink:href="#shape-lock-base" fill="#fff"/>
|
||||
</mask>
|
||||
</defs>
|
||||
<rect id="connection-degraded" class="fieldtext" width="24" height="24" mask="url(#mask-lock)"/>
|
||||
<rect id="connection-secure" width="24" height="24" mask="url(#mask-lock)" fill="context-fill"/>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="context-fill" fill-opacity="context-fill-opacity">
|
||||
<path d="M18.75 9.977H18V7A6 6 0 0 0 6 7v2.977h-.75A2.25 2.25 0 0 0 3 12.227v7.523A2.25 2.25 0 0 0 5.25 22h13.5A2.25 2.25 0 0 0 21 19.75v-7.523a2.25 2.25 0 0 0-2.25-2.25zM9 7a3 3 0 0 1 6 0v2.977H9z"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
До Ширина: | Высота: | Размер: 1.4 KiB После Ширина: | Высота: | Размер: 601 B |
|
|
@ -2,33 +2,7 @@
|
|||
<!-- 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="24" height="24" viewBox="0 0 24 24">
|
||||
#include ../icon-colors.inc.svg
|
||||
<defs>
|
||||
<rect id="shape-lock-clasp-outer" x="5" y="1" width="14" height="20" rx="7" ry="7" />
|
||||
<rect id="shape-lock-clasp-inner" x="8" y="4" width="8" height="14" rx="4" ry="4" />
|
||||
<rect id="shape-lock-base" x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" />
|
||||
|
||||
<mask id="mask-clasp-cutout">
|
||||
<rect width="24" height="24" fill="#000" />
|
||||
<use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
|
||||
<use xlink:href="#shape-lock-clasp-inner" fill="#000" />
|
||||
<line x1="3" y1="21" x2="21.5" y2="0.5" stroke="#000" stroke-width="3" />
|
||||
<line x1="3" y1="25" x2="21.5" y2="4.5" stroke="#000" stroke-width="3" />
|
||||
<rect x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" />
|
||||
</mask>
|
||||
|
||||
<mask id="mask-base-cutout">
|
||||
<rect width="24" height="24" fill="#000" />
|
||||
<use xlink:href="#shape-lock-base" fill="#fff" />
|
||||
<line x1="2.25" y1="24.75" x2="21.5" y2="4.5" stroke="#000" stroke-width="3" />
|
||||
</mask>
|
||||
</defs>
|
||||
|
||||
<use class="fieldtext" xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)"/>
|
||||
<use class="fieldtext" xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)"/>
|
||||
|
||||
<line x1="2.25" y1="22.75" x2="21.5" y2="2.5" stroke="#d92d21" stroke-width="3" />
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="context-fill" fill-opacity="context-fill-opacity">
|
||||
<path d="M18.75 9.977h-.727L6 22h12.75A2.25 2.25 0 0 0 21 19.75v-7.523a2.25 2.25 0 0 0-2.25-2.25zm-9.75 0V7a3 3 0 0 1 6 0v1.5l2.838-2.838A5.994 5.994 0 0 0 6 7v2.977h-.75A2.25 2.25 0 0 0 3 12.227v7.523a2.224 2.224 0 0 0 .105.645L13.523 9.977z"/>
|
||||
<path d="M2.5 23a1.5 1.5 0 0 1-1.061-2.561l19-19A1.5 1.5 0 0 1 22.56 3.56l-19 19A1.5 1.5 0 0 1 2.5 23z" fill="#ff0039"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
До Ширина: | Высота: | Размер: 1.6 KiB После Ширина: | Высота: | Размер: 769 B |
|
|
@ -235,7 +235,7 @@
|
|||
}
|
||||
#identity-popup[connection^=secure] #identity-popup-securityView,
|
||||
#identity-popup[connection^=secure] #identity-popup-security-content {
|
||||
background-image: url(chrome://browser/skin/controlcenter/connection.svg#connection-secure);
|
||||
background-image: url(chrome://browser/skin/controlcenter/connection.svg);
|
||||
-moz-context-properties: fill;
|
||||
fill: #12BC00;
|
||||
}
|
||||
|
|
@ -244,7 +244,9 @@
|
|||
#identity-popup[ciphers=weak] #identity-popup-security-content,
|
||||
#identity-popup[mixedcontent~=passive-loaded][isbroken] #identity-popup-securityView,
|
||||
#identity-popup[mixedcontent~=passive-loaded][isbroken] #identity-popup-security-content {
|
||||
background-image: url(chrome://browser/skin/controlcenter/connection.svg#connection-degraded);
|
||||
background-image: url(chrome://browser/skin/controlcenter/connection.svg);
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
fill: black;
|
||||
}
|
||||
|
||||
#identity-popup[connection=secure-cert-user-overridden] #identity-popup-securityView,
|
||||
|
|
@ -258,6 +260,7 @@
|
|||
#identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-securityView,
|
||||
#identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-security-content {
|
||||
background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg);
|
||||
-moz-context-properties: fill-opacity;
|
||||
}
|
||||
|
||||
#identity-popup[connection=extension] #identity-popup-securityView,
|
||||
|
|
|
|||
|
|
@ -2,35 +2,7 @@
|
|||
<!-- 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">
|
||||
|
||||
<defs>
|
||||
<rect id="shape-lock-clasp-outer" x="4" y="2" width="8" height="10" rx="4" ry="4" />
|
||||
<rect id="shape-lock-clasp-inner" x="6" y="4" width="4" height="6" rx="2" ry="2" />
|
||||
<rect id="shape-lock-base" x="3" y="7" width="10" height="7" rx="1" ry="1" />
|
||||
|
||||
<mask id="mask-clasp-cutout">
|
||||
<use href="#shape-lock-clasp-outer" fill="#fff"/>
|
||||
<use href="#shape-lock-clasp-inner" fill="#000"/>
|
||||
<line x1="2" y1="13" x2="14" y2="1.5" stroke="#000" stroke-width="2" />
|
||||
<line x1="2" y1="15" x2="14" y2="3.5" stroke="#000" stroke-width="2" />
|
||||
<rect x="3" y="7" width="10" height="7" rx="1" ry="1" fill="#000" />
|
||||
</mask>
|
||||
|
||||
<mask id="mask-base-cutout">
|
||||
<use href="#shape-lock-base" fill="#fff"/>
|
||||
<line x1="2" y1="14.8" x2="14" y2="3.2" stroke="#000" stroke-width="1.8" />
|
||||
</mask>
|
||||
|
||||
<g id="lock">
|
||||
<use href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)"/>
|
||||
<use href="#shape-lock-base" mask="url(#mask-base-cutout)"/>
|
||||
</g>
|
||||
|
||||
<line id="strike-through-red" x1="2" y1="14.1" x2="14" y2="2.5" stroke="#d92d21" stroke-width="1.8"/>
|
||||
</defs>
|
||||
|
||||
<use fill="context-fill" fill-opacity="context-fill-opacity" href="#lock"/>
|
||||
<use href="#strike-through-red"/>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||
<path d="M12.5 6.984h-.484L4 15h8.5a1.5 1.5 0 0 0 1.5-1.5V8.484a1.5 1.5 0 0 0-1.5-1.5zm-6.5 0V5a2 2 0 0 1 4 0v1l1.892-1.892A4 4 0 0 0 4 5v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5a1.483 1.483 0 0 0 .07.43l6.946-6.946z" fill="context-fill" fill-opacity="context-fill-opacity"/>
|
||||
<path d="M2 15a1 1 0 0 1-.707-1.707l12-12a1 1 0 0 1 1.414 1.414l-12 12A1 1 0 0 1 2 15z" fill="#ff0039"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
До Ширина: | Высота: | Размер: 1.5 KiB После Ширина: | Высота: | Размер: 723 B |
|
|
@ -2,33 +2,9 @@
|
|||
<!-- 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">
|
||||
|
||||
<defs>
|
||||
<rect id="shape-lock-clasp-outer" x="2" y="1" width="8" height="10" rx="4" ry="4" />
|
||||
<rect id="shape-lock-clasp-inner" x="4" y="3" width="4" height="6" rx="2" ry="2" />
|
||||
<rect id="shape-lock-base" x="1" y="6" width="10" height="7" rx="1" ry="1" />
|
||||
|
||||
<mask id="mask-clasp-cutout">
|
||||
<rect width="16" height="16" fill="#000" />
|
||||
<use href="#shape-lock-clasp-outer" fill="#fff"/>
|
||||
<use href="#shape-lock-clasp-inner" fill="#000"/>
|
||||
</mask>
|
||||
|
||||
<mask id="mask-lock">
|
||||
<use href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#fff"/>
|
||||
<use href="#shape-lock-base" fill="#fff"/>
|
||||
</mask>
|
||||
|
||||
<g id="warning-triangle">
|
||||
<path fill="#fff" d="M10.5,5C9.8,5,9.1,5.4,8.8,6.2l-3.5,6.8c-0.4,0.7-0.4,1.4,0,2c0.4,0.6,1,1,1.8,1H14c0.8,0,1.4-0.4,1.8-1 c0.3-0.6,0.3-1.4,0-2l-3.5-6.8C11.9,5.4,11.2,5,10.5,5L10.5,5z"/>
|
||||
<path fill="#ffbf00" d="M14.8,13.4l-3.5-6.8C11.2,6.2,10.9,6,10.5,6c-0.3,0-0.7,0.2-0.9,0.6l-3.5,6.8c-0.2,0.4-0.2,0.8,0,1.1C6.3,14.8,6.6,15,7,15 H14c0.4,0,0.7-0.2,0.9-0.5C15.1,14.2,15,13.8,14.8,13.4z"/>
|
||||
<path fill="#fff" d="M10,8.5C10,8.2,10.2,8,10.5,8S11,8.2,11,8.5L10.8,11h-0.6L10,8.5z"/>
|
||||
<circle fill="#fff" cx="10.5" cy="12.5" r=".75"/>
|
||||
</g>
|
||||
</defs>
|
||||
|
||||
<rect fill="context-fill" fill-opacity="context-fill-opacity" width="16" height="16" mask="url(#mask-lock)"/>
|
||||
<use href="#warning-triangle"/>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||
<path d="M8 1a4 4 0 0 0-4 4v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5A1.5 1.5 0 0 0 3.5 15h2.535a2.274 2.274 0 0 1 .207-1.318L9.43 7.27a2.266 2.266 0 0 1 .2-.286H6V5a2 2 0 0 1 4 0v1.568A2.255 2.255 0 0 1 11.478 6a2.283 2.283 0 0 1 .522.073V5a4 4 0 0 0-4-4z" fill="context-fill" fill-opacity="context-fill-opacity"/>
|
||||
<path d="M15.818 14.127l-3.189-6.411a1.285 1.285 0 0 0-2.3 0l-3.192 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873z" fill="#ffbf00"/>
|
||||
<path d="M11.478 8a.272.272 0 0 1 .256.161l3.188 6.412a.291.291 0 0 1-.013.291.275.275 0 0 1-.243.137H8.289a.275.275 0 0 1-.243-.137.29.29 0 0 1-.013-.291l3.188-6.412A.272.272 0 0 1 11.478 8m0-1a1.272 1.272 0 0 0-1.152.716l-3.189 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873l-3.189-6.411A1.272 1.272 0 0 0 11.478 7z" fill="#d76e00" opacity=".35"/>
|
||||
<path d="M11.5 12a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-1 0v2a.5.5 0 0 0 .5.5zm0 .809a.691.691 0 1 0 .691.691.691.691 0 0 0-.691-.691z" fill="#fff"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
До Ширина: | Высота: | Размер: 1.7 KiB После Ширина: | Высота: | Размер: 1.3 KiB |
|
|
@ -21,8 +21,8 @@
|
|||
skin/classic/browser/addons/addon-install-restart.svg (../shared/addons/addon-install-restart.svg)
|
||||
skin/classic/browser/addons/addon-install-warning.svg (../shared/addons/addon-install-warning.svg)
|
||||
* skin/classic/browser/controlcenter/conn-not-secure.svg (../shared/controlcenter/conn-not-secure.svg)
|
||||
* skin/classic/browser/controlcenter/connection.svg (../shared/controlcenter/connection.svg)
|
||||
* skin/classic/browser/controlcenter/mcb-disabled.svg (../shared/controlcenter/mcb-disabled.svg)
|
||||
skin/classic/browser/controlcenter/connection.svg (../shared/controlcenter/connection.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/permissions.svg (../shared/controlcenter/permissions.svg)
|
||||
* skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче