From 7ac1c7a7943a1bec09295cd94f0f31756bfcd667 Mon Sep 17 00:00:00 2001 From: Andreea Pavel Date: Fri, 17 Apr 2020 02:41:26 +0300 Subject: [PATCH] Backed out changeset a95e314cd2af (bug 1618051) for failing bc at browser_parsable_css.js on a CLOSED TREE --- browser/branding/aurora/content/jar.mn | 1 + browser/branding/nightly/content/jar.mn | 1 + browser/branding/official/content/jar.mn | 1 + browser/branding/unofficial/content/jar.mn | 1 + .../newtab/content-src/components/Search/_Search.scss | 5 +---- browser/components/newtab/css/activity-stream-linux.css | 5 +---- browser/components/newtab/css/activity-stream-mac.css | 5 +---- browser/components/newtab/css/activity-stream-windows.css | 5 +---- browser/installer/allowed-dupes.mn | 1 + .../shared/privatebrowsing/aboutPrivateBrowsing.css | 8 +------- 10 files changed, 10 insertions(+), 23 deletions(-) diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn index eeae7911c256..68b2bfd8e571 100644 --- a/browser/branding/aurora/content/jar.mn +++ b/browser/branding/aurora/content/jar.mn @@ -14,6 +14,7 @@ browser.jar: content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/horizontal-lockup.svg diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn index eeae7911c256..68b2bfd8e571 100644 --- a/browser/branding/nightly/content/jar.mn +++ b/browser/branding/nightly/content/jar.mn @@ -14,6 +14,7 @@ browser.jar: content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/horizontal-lockup.svg diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn index eeae7911c256..68b2bfd8e571 100644 --- a/browser/branding/official/content/jar.mn +++ b/browser/branding/official/content/jar.mn @@ -14,6 +14,7 @@ browser.jar: content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/horizontal-lockup.svg diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index eeae7911c256..68b2bfd8e571 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/browser/branding/unofficial/content/jar.mn @@ -14,6 +14,7 @@ browser.jar: content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css content/branding/horizontal-lockup.svg diff --git a/browser/components/newtab/content-src/components/Search/_Search.scss b/browser/components/newtab/content-src/components/Search/_Search.scss index fdbf52f2996f..e9cd149762d8 100644 --- a/browser/components/newtab/content-src/components/Search/_Search.scss +++ b/browser/components/newtab/content-src/components/Search/_Search.scss @@ -22,11 +22,8 @@ $glyph-forward: url('chrome://browser/skin/forward.svg'); margin-bottom: 49px; .logo { - background: url('chrome://branding/content/about-logo.png') no-repeat center; + background: url('chrome://branding/content/icon128.png') no-repeat center center; background-size: $logo-size; - @media (min-resolution: 2x) { - background-image: url('chrome://branding/content/about-logo@2x.png'); - } display: inline-block; height: $logo-size; width: $logo-size; diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css index b8602fd55983..78266996f82e 100644 --- a/browser/components/newtab/css/activity-stream-linux.css +++ b/browser/components/newtab/css/activity-stream-linux.css @@ -1032,14 +1032,11 @@ main { justify-content: center; margin-bottom: 49px; } .search-wrapper .logo-and-wordmark .logo { - background: url("chrome://branding/content/about-logo.png") no-repeat center; + background: url("chrome://branding/content/icon128.png") no-repeat center center; background-size: 96px; display: inline-block; height: 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 { background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background-size: 172px; diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css index 6b28e858ee3b..b0b5afc80754 100644 --- a/browser/components/newtab/css/activity-stream-mac.css +++ b/browser/components/newtab/css/activity-stream-mac.css @@ -1035,14 +1035,11 @@ main { justify-content: center; margin-bottom: 49px; } .search-wrapper .logo-and-wordmark .logo { - background: url("chrome://branding/content/about-logo.png") no-repeat center; + background: url("chrome://branding/content/icon128.png") no-repeat center center; background-size: 96px; display: inline-block; height: 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 { background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background-size: 172px; diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css index ede9ca002de6..f7903c47aa17 100644 --- a/browser/components/newtab/css/activity-stream-windows.css +++ b/browser/components/newtab/css/activity-stream-windows.css @@ -1032,14 +1032,11 @@ main { justify-content: center; margin-bottom: 49px; } .search-wrapper .logo-and-wordmark .logo { - background: url("chrome://branding/content/about-logo.png") no-repeat center; + background: url("chrome://branding/content/icon128.png") no-repeat center center; background-size: 96px; display: inline-block; height: 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 { background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background-size: 172px; diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index a6b0c1595be0..8f699b479c10 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -26,6 +26,7 @@ browser/chrome/browser/content/branding/icon48.png browser/chrome/icons/default/default48.png browser/chrome/browser/content/branding/icon64.png browser/chrome/icons/default/default64.png +browser/chrome/browser/content/branding/icon128.png browser/chrome/icons/default/default128.png #endif diff --git a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css index a24a3e8225c1..9548153053ec 100644 --- a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css +++ b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css @@ -55,19 +55,13 @@ p { } .logo { - background: url("chrome://branding/content/about-logo.png") no-repeat center center; + background: url("chrome://branding/content/icon128.png") no-repeat center center; background-size: 96px; display: inline-block; height: 96px; width: 96px; } -@media (min-resolution: 2x) { - .logo { - background-image: url('chrome://branding/content/about-logo@2x.png'); - } -} - .wordmark { background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center; background-size: 172px;