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

Bug 1703647 - Change tab-to-search results to use a Primary Blue search glass icon instead of an inverted one. r=mak

Browse Source 
This patch removes the pre-Proton icon and tests. It looks like other changes to icons are just removing the old icons seeing as we're in the 89 Nightly cycle. See D110849 for example.

Differential Revision: https://phabricator.services.mozilla.com/D111155
This commit is contained in:
Harry Twyford 2021-04-07 22:41:06 +00:00
parent 3107158e4b
commit 14412b59d8
9 changed files with 22 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/urlbar/UrlbarProviderTabToSearch.jsm
View File

@ -450,7 +450,7 @@ function makeOnboardingResult(engine, satisfiesAutofillThreshold = false) {
engine: engine.name,
url,
providesSearchMode: true,
icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
icon: UrlbarUtils.ICON.SEARCH_GLASS,
dynamicType: DYNAMIC_RESULT_TYPE,
satisfiesAutofillThreshold,
}
@ -473,7 +473,7 @@ function makeResult(context, engine, satisfiesAutofillThreshold = false) {
isGeneralPurposeEngine: engine.isGeneralPurposeEngine,
url,
providesSearchMode: true,
icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
icon: UrlbarUtils.ICON.SEARCH_GLASS,
query: "",
satisfiesAutofillThreshold,
})

1
browser/components/urlbar/UrlbarUtils.jsm
View File

@ -150,7 +150,6 @@ var UrlbarUtils = {
EXTENSION: "chrome://browser/content/extension.svg",
HISTORY: "chrome://browser/skin/history.svg",
SEARCH_GLASS: "chrome://global/skin/icons/search-glass.svg",
SEARCH_GLASS_INVERTED: "chrome://browser/skin/search-glass-inverted.svg",
TIP: "chrome://browser/skin/tip.svg",
},

20
browser/components/urlbar/tests/unit/test_providerTabToSearch.js
View File

@ -48,7 +48,7 @@ add_task(async function basic() {
}),
makeSearchResult(context, {
engineName: testEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
testEngine.getResultDomain()
),
@ -138,7 +138,7 @@ add_task(async function ignoreWww() {
}),
makeSearchResult(context, {
engineName: testEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
testEngine.getResultDomain()
),
@ -174,7 +174,7 @@ add_task(async function ignoreWww() {
}),
makeSearchResult(context, {
engineName: wwwTestEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
wwwTestEngine.getResultDomain()
),
@ -202,7 +202,7 @@ add_task(async function ignoreWww() {
}),
makeSearchResult(context, {
engineName: wwwTestEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
wwwTestEngine.getResultDomain()
),
@ -261,7 +261,7 @@ add_task(async function conflictingEngines() {
}),
makeSearchResult(context, {
engineName: fooTestEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
fooTestEngine.getResultDomain()
),
@ -293,7 +293,7 @@ add_task(async function conflictingEngines() {
}),
makeSearchResult(context, {
engineName: fooBarTestEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
fooBarTestEngine.getResultDomain()
),
@ -335,7 +335,7 @@ add_task(async function multipleEnginesForHostname() {
}),
makeSearchResult(context, {
engineName: testEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
testEngine.getResultDomain()
),
@ -366,7 +366,7 @@ add_task(async function test_casing() {
}),
makeSearchResult(context, {
engineName: testEngine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(
testEngine.getResultDomain()
),
@ -402,7 +402,7 @@ add_task(async function test_publicSuffix() {
}),
makeSearchResult(context, {
engineName: engine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(engine.getResultDomain()),
providesSearchMode: true,
query: "",
@ -477,7 +477,7 @@ add_task(async function test_disabledEngine() {
}),
makeSearchResult(context, {
engineName: engine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(engine.getResultDomain()),
providesSearchMode: true,
query: "",

4
browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js
View File

@ -64,7 +64,7 @@ add_task(async function setup() {
}),
makeSearchResult(context, {
engineName: engine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: "en.example.",
providesSearchMode: true,
query: "",
@ -107,7 +107,7 @@ add_task(async function setup() {
}),
makeSearchResult(context, {
engineName: engine2.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: "www.it.mochi.",
providesSearchMode: true,
query: "",

2
browser/components/urlbar/tests/unit/test_search_engine_host.js
View File

@ -75,7 +75,7 @@ add_task(async function test_searchEngine_noautoFill() {
}),
makeSearchResult(context, {
engineName: engine.name,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS,
uri: UrlbarUtils.stripPublicSuffixFromHost(engine.getResultDomain()),
providesSearchMode: true,
query: "",

7
browser/themes/shared/icons/search-glass-inverted.svg
View File

@ -1,7 +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 width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="16" height="16" rx="1" fill="context-fill"/>
<path fill="context-stroke" d="M6.752 3a3.736 3.736 0 013.328 2.026 3.744 3.744 0 01-.28 3.889l3.01 3.011a.624.624 0 11-.883.883L8.918 9.798a3.743 3.743 0 01-5.87-3.654A3.749 3.749 0 016.753 3zm0 6.245A2.495 2.495 0 009.2 6.26a2.499 2.499 0 00-3.403-1.82 2.497 2.497 0 00-.81 4.074 2.495 2.495 0 001.765.731z"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 669 B

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

@ -193,7 +193,6 @@
skin/classic/browser/reload-to-stop.svg (../shared/icons/reload-to-stop.svg)
skin/classic/browser/save.svg (../shared/icons/save.svg)
skin/classic/browser/screenshot.svg (../shared/icons/screenshot.svg)
skin/classic/browser/search-glass-inverted.svg (../shared/icons/search-glass-inverted.svg)
skin/classic/browser/send-to-device.svg (../shared/icons/send-to-device.svg)
skin/classic/browser/sidebars.svg (../shared/icons/sidebars.svg)
skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg)

37
browser/themes/shared/urlbar/dynamicResults.inc.css
View File

@ -30,43 +30,10 @@
.urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
min-width: 32px;
height: 32px;
color: rgb(0,97,224);
stroke: #fff;
-moz-context-properties: fill, stroke;
color: var(--urlbar-popup-url-color);
-moz-context-properties: fill;
}
.urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner[selected] > .urlbarView-no-wrap > .urlbarView-favicon {
color: #fff;
stroke: rgb(0,97,224);
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner:not([selected]) > .urlbarView-no-wrap > .urlbarView-favicon {
color: rgb(0,221,255);
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner[selected] > .urlbarView-no-wrap > .urlbarView-favicon {
stroke: rgb(0,221,255);
}
@media not (-moz-proton-urlbar) {
.urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: #0060df; /* Blue-60 */
}
.urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner[selected] > .urlbarView-no-wrap > .urlbarView-favicon {
color: #fff;
stroke: #0060df;
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner:not([selected]) > .urlbarView-no-wrap > .urlbarView-favicon {
color: #0a84ff; /* Blue-50 */
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[dynamicType=onboardTabToSearch] > .urlbarView-row-inner[selected] > .urlbarView-no-wrap > .urlbarView-favicon {
stroke: #0a84ff;
}
} /*** END !proton ***/
.urlbarView-dynamic-onboardTabToSearch-text-container {
display: flex;
flex-direction: column;

39
browser/themes/shared/urlbarView.inc.css
View File

@ -315,40 +315,11 @@
}
.urlbarView-row[type=tabtosearch] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: rgb(0,97,224);
stroke: #fff;
-moz-context-properties: fill, stroke;
}
.urlbarView-row[type=tabtosearch][selected] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: #fff;
stroke: rgb(0,97,224);
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=tabtosearch]:not([selected]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: rgb(0,221,255);
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=tabtosearch][selected] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
stroke: rgb(0,221,255);
}
@media not (-moz-proton-urlbar) {
.urlbarView-row[type=tabtosearch] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: #0060df; /* Blue-60 */
}
.urlbarView-row[type=tabtosearch][selected] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
stroke: #0060df;
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=tabtosearch]:not([selected]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
color: #0a84ff; /* Blue-50 */
}
:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=tabtosearch][selected] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon {
stroke: #0a84ff;
}
/* We use the URL color for this icon to inherit its accessibility
properties, like adapting to high contrast modes. We also want to ensure
contrast from the result highlight. */
color: var(--urlbar-popup-url-color);
-moz-context-properties: fill;
}
/* Type icon */