diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css index 0dc99200ed9c..1f30548f50ca 100644 --- a/browser/base/content/aboutDialog.css +++ b/browser/base/content/aboutDialog.css @@ -7,7 +7,7 @@ } #rightBox { - background-image: url("chrome://branding/content/about-wordmark.png"); + background-image: url("chrome://branding/content/about-wordmark.svg"); background-repeat: no-repeat; /* padding-top creates room for the wordmark */ padding-top: 38px; diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css index 22cbb93de871..ce8db3cce987 100644 --- a/browser/base/content/abouthome/aboutHome.css +++ b/browser/base/content/abouthome/aboutHome.css @@ -42,9 +42,13 @@ a { } #brandLogo { - height: 154px; - width: 154px; - margin: 22px 0 31px; + height: 192px; + width: 192px; + margin: 22px auto 31px; + background-image: url("chrome://branding/content/about-logo.png"); + background-size: 192px auto; + background-position: center center; + background-repeat: no-repeat; } #searchForm, @@ -360,6 +364,10 @@ body[narrow] #restorePreviousSession::before { * rather than upscaling the original-size ones (bug 818940). */ @media not all and (max-resolution: 1dppx) { + #brandLogo { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } + #defaultSnippet1, #defaultSnippet2, #rightsSnippet { diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml index a10627e22e43..cd821c4e673a 100644 --- a/browser/base/content/abouthome/aboutHome.xhtml +++ b/browser/base/content/abouthome/aboutHome.xhtml @@ -33,7 +33,7 @@
- +
diff --git a/browser/branding/aurora/content/about-logo.png b/browser/branding/aurora/content/about-logo.png index cb541d25d60b..a70d815f7d4d 100644 Binary files a/browser/branding/aurora/content/about-logo.png and b/browser/branding/aurora/content/about-logo.png differ diff --git a/browser/branding/aurora/content/about-logo@2x.png b/browser/branding/aurora/content/about-logo@2x.png new file mode 100644 index 000000000000..462a1b3bb9ce Binary files /dev/null and b/browser/branding/aurora/content/about-logo@2x.png differ diff --git a/browser/branding/aurora/content/about-wordmark.png b/browser/branding/aurora/content/about-wordmark.png deleted file mode 100644 index 4f3e484d824f..000000000000 Binary files a/browser/branding/aurora/content/about-wordmark.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-wordmark.svg b/browser/branding/aurora/content/about-wordmark.svg new file mode 100644 index 000000000000..aa2bad7afdc0 --- /dev/null +++ b/browser/branding/aurora/content/about-wordmark.svg @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn index abe651b98c80..821aa03bc43c 100644 --- a/browser/branding/aurora/content/jar.mn +++ b/browser/branding/aurora/content/jar.mn @@ -7,7 +7,8 @@ browser.jar: content/branding/about.png (about.png) content/branding/about-background.png (about-background.png) content/branding/about-logo.png (about-logo.png) - content/branding/about-wordmark.png (about-wordmark.png) + content/branding/about-logo@2x.png (about-logo@2x.png) + content/branding/about-wordmark.svg (about-wordmark.svg) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) diff --git a/browser/branding/nightly/content/about-logo.png b/browser/branding/nightly/content/about-logo.png index 367307d53ad0..0541a3384768 100644 Binary files a/browser/branding/nightly/content/about-logo.png and b/browser/branding/nightly/content/about-logo.png differ diff --git a/browser/branding/nightly/content/about-logo@2x.png b/browser/branding/nightly/content/about-logo@2x.png new file mode 100644 index 000000000000..55c6b4dd8c6d Binary files /dev/null and b/browser/branding/nightly/content/about-logo@2x.png differ diff --git a/browser/branding/nightly/content/about-wordmark.png b/browser/branding/nightly/content/about-wordmark.png deleted file mode 100644 index 4a8bcdc85a6a..000000000000 Binary files a/browser/branding/nightly/content/about-wordmark.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-wordmark.svg b/browser/branding/nightly/content/about-wordmark.svg new file mode 100644 index 000000000000..df36525e4d64 --- /dev/null +++ b/browser/branding/nightly/content/about-wordmark.svg @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn index abe651b98c80..821aa03bc43c 100644 --- a/browser/branding/nightly/content/jar.mn +++ b/browser/branding/nightly/content/jar.mn @@ -7,7 +7,8 @@ browser.jar: content/branding/about.png (about.png) content/branding/about-background.png (about-background.png) content/branding/about-logo.png (about-logo.png) - content/branding/about-wordmark.png (about-wordmark.png) + content/branding/about-logo@2x.png (about-logo@2x.png) + content/branding/about-wordmark.svg (about-wordmark.svg) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) diff --git a/browser/branding/official/background.png b/browser/branding/official/background.png index 5e20353be45b..d594986c1a70 100644 Binary files a/browser/branding/official/background.png and b/browser/branding/official/background.png differ diff --git a/browser/branding/official/bgintro.bmp b/browser/branding/official/bgintro.bmp index a9dc7653273d..9c2fc80cf9ed 100644 Binary files a/browser/branding/official/bgintro.bmp and b/browser/branding/official/bgintro.bmp differ diff --git a/browser/branding/official/bgplain.bmp b/browser/branding/official/bgplain.bmp index 5330aca6532b..c82f89641e4d 100644 Binary files a/browser/branding/official/bgplain.bmp and b/browser/branding/official/bgplain.bmp differ diff --git a/browser/branding/official/content/VisualElements_smalllogo.png b/browser/branding/official/content/VisualElements_smalllogo.png index 2539d370cdb8..12642cba4a95 100644 Binary files a/browser/branding/official/content/VisualElements_smalllogo.png and b/browser/branding/official/content/VisualElements_smalllogo.png differ diff --git a/browser/branding/official/content/VisualElements_splashscreen.png b/browser/branding/official/content/VisualElements_splashscreen.png index b53775586321..c9e21ba6d9c0 100644 Binary files a/browser/branding/official/content/VisualElements_splashscreen.png and b/browser/branding/official/content/VisualElements_splashscreen.png differ diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png index 175956b42c77..c7c5ac2b829d 100644 Binary files a/browser/branding/official/content/about-logo.png and b/browser/branding/official/content/about-logo.png differ diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png new file mode 100644 index 000000000000..624ad150f80a Binary files /dev/null and b/browser/branding/official/content/about-logo@2x.png differ diff --git a/browser/branding/official/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png deleted file mode 100644 index 6c3df87f5d99..000000000000 Binary files a/browser/branding/official/content/about-wordmark.png and /dev/null differ diff --git a/browser/branding/official/content/about-wordmark.svg b/browser/branding/official/content/about-wordmark.svg new file mode 100644 index 000000000000..042b8eaa0a42 --- /dev/null +++ b/browser/branding/official/content/about-wordmark.svg @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png index 144866a2b538..7d78057dc5c0 100644 Binary files a/browser/branding/official/content/about.png and b/browser/branding/official/content/about.png differ diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css index 5a4da33e8756..e525cf319230 100644 --- a/browser/branding/official/content/aboutDialog.css +++ b/browser/branding/official/content/aboutDialog.css @@ -10,13 +10,21 @@ #leftBox { background-image: url("chrome://branding/content/about-logo.png"); background-repeat: no-repeat; + background-size: 192px auto; /* min-width and min-height create room for the logo */ min-width: 210px; min-height: 210px; - margin-top:20px; + margin-top: 20px; -moz-margin-start: 30px; } + +@media (min-resolution: 2dppx) { + #leftBox { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } +} + #rightBox { margin-left: 30px; margin-right: 30px; diff --git a/browser/branding/official/content/icon48.png b/browser/branding/official/content/icon48.png index b982cf979038..10de891724e3 100644 Binary files a/browser/branding/official/content/icon48.png and b/browser/branding/official/content/icon48.png differ diff --git a/browser/branding/official/content/icon64.png b/browser/branding/official/content/icon64.png index 582a6952abe0..ac94fb47dec8 100644 Binary files a/browser/branding/official/content/icon64.png and b/browser/branding/official/content/icon64.png differ diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn index 5794ae2e76d1..a799da97c43b 100644 --- a/browser/branding/official/content/jar.mn +++ b/browser/branding/official/content/jar.mn @@ -6,7 +6,8 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes content/branding/about.png (about.png) content/branding/about-logo.png (about-logo.png) - content/branding/about-wordmark.png (about-wordmark.png) + content/branding/about-logo@2x.png (about-logo@2x.png) + content/branding/about-wordmark.svg (about-wordmark.svg) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png) diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 0822f7386800..33ebba13ba93 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png index 20e6cabcff78..2390f0924d39 100644 Binary files a/browser/branding/official/default22.png and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index c6aab1c4bb5f..737466b5ae94 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index 0be7473b3d2a..eef767dabc2a 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index 0c4f6818bd8a..12642cba4a95 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index b982cf979038..10de891724e3 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/disk.icns b/browser/branding/official/disk.icns index 3e2c44f187ce..82fdccff8c9e 100644 Binary files a/browser/branding/official/disk.icns and b/browser/branding/official/disk.icns differ diff --git a/browser/branding/official/document.icns b/browser/branding/official/document.icns index 75de3a655663..5f03305d71aa 100644 Binary files a/browser/branding/official/document.icns and b/browser/branding/official/document.icns differ diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico index cb14c6137dfa..0957f61e3cc1 100644 Binary files a/browser/branding/official/document.ico and b/browser/branding/official/document.ico differ diff --git a/browser/branding/official/dsstore b/browser/branding/official/dsstore index ae7602df8f24..8ea703674566 100644 Binary files a/browser/branding/official/dsstore and b/browser/branding/official/dsstore differ diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns index baeadcd9f67f..ac016713fdc7 100644 Binary files a/browser/branding/official/firefox.icns and b/browser/branding/official/firefox.icns differ diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico index 25461ec33352..9507b299dfc2 100644 Binary files a/browser/branding/official/firefox.ico and b/browser/branding/official/firefox.ico differ diff --git a/browser/branding/official/mozicon128.png b/browser/branding/official/mozicon128.png index f82ea67df208..946c31e6885b 100644 Binary files a/browser/branding/official/mozicon128.png and b/browser/branding/official/mozicon128.png differ diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp index 026f412f3d07..51bec2211a75 100644 Binary files a/browser/branding/official/wizHeader.bmp and b/browser/branding/official/wizHeader.bmp differ diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp index 55d2c1aa27ca..7610fbfd058a 100644 Binary files a/browser/branding/official/wizHeaderRTL.bmp and b/browser/branding/official/wizHeaderRTL.bmp differ diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp index 0abfbb7fae79..5326bba930b3 100644 Binary files a/browser/branding/official/wizWatermark.bmp and b/browser/branding/official/wizWatermark.bmp differ diff --git a/browser/branding/unofficial/content/about-logo.png b/browser/branding/unofficial/content/about-logo.png index 623b7b32de75..b0e6186e120b 100644 Binary files a/browser/branding/unofficial/content/about-logo.png and b/browser/branding/unofficial/content/about-logo.png differ diff --git a/browser/branding/unofficial/content/about-logo@2x.png b/browser/branding/unofficial/content/about-logo@2x.png new file mode 100644 index 000000000000..18f7458d6e6e Binary files /dev/null and b/browser/branding/unofficial/content/about-logo@2x.png differ diff --git a/browser/branding/unofficial/content/about-wordmark.png b/browser/branding/unofficial/content/about-wordmark.png deleted file mode 100644 index 4a8bcdc85a6a..000000000000 Binary files a/browser/branding/unofficial/content/about-wordmark.png and /dev/null differ diff --git a/browser/branding/unofficial/content/about-wordmark.svg b/browser/branding/unofficial/content/about-wordmark.svg new file mode 100644 index 000000000000..55e7f7e9670f --- /dev/null +++ b/browser/branding/unofficial/content/about-wordmark.svg @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index abe651b98c80..821aa03bc43c 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/browser/branding/unofficial/content/jar.mn @@ -7,7 +7,8 @@ browser.jar: content/branding/about.png (about.png) content/branding/about-background.png (about-background.png) content/branding/about-logo.png (about-logo.png) - content/branding/about-wordmark.png (about-wordmark.png) + content/branding/about-logo@2x.png (about-logo@2x.png) + content/branding/about-wordmark.svg (about-wordmark.svg) content/branding/icon48.png (icon48.png) content/branding/icon64.png (icon64.png) content/branding/icon16.png (../default16.png)