Bug 1618051 - Proper hi res logo for search only newtab r=Mardak

Differential Revision: https://phabricator.services.mozilla.com/D65347
This commit is contained in:
Scott 2020-04-16 20:14:48 +00:00
Родитель 0ec55534cc
Коммит e6632dd612
10 изменённых файлов: 23 добавлений и 10 удалений

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

@ -14,7 +14,6 @@ browser.jar:
content/branding/icon32.png (../default32.png) content/branding/icon32.png (../default32.png)
content/branding/icon48.png (../default48.png) content/branding/icon48.png (../default48.png)
content/branding/icon64.png (../default64.png) content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/identity-icons-brand.svg content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css content/branding/aboutDialog.css
content/branding/horizontal-lockup.svg content/branding/horizontal-lockup.svg

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

@ -14,7 +14,6 @@ browser.jar:
content/branding/icon32.png (../default32.png) content/branding/icon32.png (../default32.png)
content/branding/icon48.png (../default48.png) content/branding/icon48.png (../default48.png)
content/branding/icon64.png (../default64.png) content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/identity-icons-brand.svg content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css content/branding/aboutDialog.css
content/branding/horizontal-lockup.svg content/branding/horizontal-lockup.svg

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

@ -14,7 +14,6 @@ browser.jar:
content/branding/icon32.png (../default32.png) content/branding/icon32.png (../default32.png)
content/branding/icon48.png (../default48.png) content/branding/icon48.png (../default48.png)
content/branding/icon64.png (../default64.png) content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/identity-icons-brand.svg content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css content/branding/aboutDialog.css
content/branding/horizontal-lockup.svg content/branding/horizontal-lockup.svg

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

@ -14,7 +14,6 @@ browser.jar:
content/branding/icon32.png (../default32.png) content/branding/icon32.png (../default32.png)
content/branding/icon48.png (../default48.png) content/branding/icon48.png (../default48.png)
content/branding/icon64.png (../default64.png) content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/identity-icons-brand.svg content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css content/branding/aboutDialog.css
content/branding/horizontal-lockup.svg content/branding/horizontal-lockup.svg

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

@ -22,8 +22,11 @@ $glyph-forward: url('chrome://browser/skin/forward.svg');
margin-bottom: 49px; margin-bottom: 49px;
.logo { .logo {
background: url('chrome://branding/content/icon128.png') no-repeat center center; background: url('chrome://branding/content/about-logo.png') no-repeat center;
background-size: $logo-size; background-size: $logo-size;
@media (min-resolution: 2x) {
background-image: url('chrome://branding/content/about-logo@2x.png');
}
display: inline-block; display: inline-block;
height: $logo-size; height: $logo-size;
width: $logo-size; width: $logo-size;

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

@ -1032,11 +1032,14 @@ main {
justify-content: center; justify-content: center;
margin-bottom: 49px; } margin-bottom: 49px; }
.search-wrapper .logo-and-wordmark .logo { .search-wrapper .logo-and-wordmark .logo {
background: url("chrome://branding/content/icon128.png") no-repeat center center; background: url("chrome://branding/content/about-logo.png") no-repeat center;
background-size: 96px; background-size: 96px;
display: inline-block; display: inline-block;
height: 96px; height: 96px;
width: 96px; } width: 96px; }
@media (min-resolution: 2x) {
.search-wrapper .logo-and-wordmark .logo {
background-image: url("chrome://branding/content/about-logo@2x.png"); } }
.search-wrapper .logo-and-wordmark .wordmark { .search-wrapper .logo-and-wordmark .wordmark {
background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
background-size: 172px; background-size: 172px;

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

@ -1035,11 +1035,14 @@ main {
justify-content: center; justify-content: center;
margin-bottom: 49px; } margin-bottom: 49px; }
.search-wrapper .logo-and-wordmark .logo { .search-wrapper .logo-and-wordmark .logo {
background: url("chrome://branding/content/icon128.png") no-repeat center center; background: url("chrome://branding/content/about-logo.png") no-repeat center;
background-size: 96px; background-size: 96px;
display: inline-block; display: inline-block;
height: 96px; height: 96px;
width: 96px; } width: 96px; }
@media (min-resolution: 2x) {
.search-wrapper .logo-and-wordmark .logo {
background-image: url("chrome://branding/content/about-logo@2x.png"); } }
.search-wrapper .logo-and-wordmark .wordmark { .search-wrapper .logo-and-wordmark .wordmark {
background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
background-size: 172px; background-size: 172px;

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

@ -1032,11 +1032,14 @@ main {
justify-content: center; justify-content: center;
margin-bottom: 49px; } margin-bottom: 49px; }
.search-wrapper .logo-and-wordmark .logo { .search-wrapper .logo-and-wordmark .logo {
background: url("chrome://branding/content/icon128.png") no-repeat center center; background: url("chrome://branding/content/about-logo.png") no-repeat center;
background-size: 96px; background-size: 96px;
display: inline-block; display: inline-block;
height: 96px; height: 96px;
width: 96px; } width: 96px; }
@media (min-resolution: 2x) {
.search-wrapper .logo-and-wordmark .logo {
background-image: url("chrome://branding/content/about-logo@2x.png"); } }
.search-wrapper .logo-and-wordmark .wordmark { .search-wrapper .logo-and-wordmark .wordmark {
background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
background-size: 172px; background-size: 172px;

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

@ -26,7 +26,6 @@ browser/chrome/browser/content/branding/icon48.png
browser/chrome/icons/default/default48.png browser/chrome/icons/default/default48.png
browser/chrome/browser/content/branding/icon64.png browser/chrome/browser/content/branding/icon64.png
browser/chrome/icons/default/default64.png browser/chrome/icons/default/default64.png
browser/chrome/browser/content/branding/icon128.png
browser/chrome/icons/default/default128.png browser/chrome/icons/default/default128.png
#endif #endif

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

@ -55,13 +55,19 @@ p {
} }
.logo { .logo {
background: url("chrome://branding/content/icon128.png") no-repeat center center; background: url("chrome://branding/content/about-logo.png") no-repeat center center;
background-size: 96px; background-size: 96px;
display: inline-block; display: inline-block;
height: 96px; height: 96px;
width: 96px; width: 96px;
} }
@media (min-resolution: 2x) {
.logo {
background-image: url('chrome://branding/content/about-logo@2x.png');
}
}
.wordmark { .wordmark {
background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
background-size: 172px; background-size: 172px;