Skip to content

Commit

Permalink
Fix branding
Browse files Browse the repository at this point in the history
1. Use SVG Images for about-logo
2. `navigator.whoami` is now fully gated behind the `flamewolf.api.whoami.enabled` pref, enabled by default. On the absence, instead of returning an empty string, it will no longer exist (aka, become `undefined`)
  • Loading branch information
rustdevbtw committed Jul 21, 2024
1 parent 9116ef5 commit 18c558a
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 161 deletions.
4 changes: 2 additions & 2 deletions browser/base/content/aboutDialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

#leftBox {
background-image: url("chrome://branding/content/about-logo.png");
background-image: url("chrome://branding/content/about-logo.svg");
background-repeat: no-repeat;
background-size: 192px auto;
background-position: center 40px;
Expand All @@ -31,7 +31,7 @@

@media (min-resolution: 2dppx) {
#leftBox {
background-image: url("chrome://branding/content/about-logo@2x.png");
background-image: url("chrome://branding/content/about-logo.svg");
}
}

Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/aboutDialog.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<vbox id="rightBox">
<label id="release" hidden="true">
<!-- This string is explicitly not translated -->
Extended Support Release
FlameWolf Standard Release
</label>
#ifndef MOZ_UPDATER
<!-- This HBOX is duplicated below with class="update" -->
Expand Down
38 changes: 19 additions & 19 deletions browser/base/content/test/general/browser_gestureSupport.js
Original file line number Diff line number Diff line change
Expand Up @@ -924,15 +924,15 @@ async function test_rotateHelperOneGesture(
stopExpectedRotation,
test_rotateHelperGetImageRotation(aImageElement),
"Image rotation at gesture stop/hold: expected=" +
stopExpectedRotation +
", observed=" +
test_rotateHelperGetImageRotation(aImageElement) +
", init=" +
aCurrentRotation +
", amt=" +
aAmount +
", dir=" +
(aDirection == clockwise ? "cl" : "ccl")
stopExpectedRotation +
", observed=" +
test_rotateHelperGetImageRotation(aImageElement) +
", init=" +
aCurrentRotation +
", amt=" +
aAmount +
", dir=" +
(aDirection == clockwise ? "cl" : "ccl")
);
}
// End it and force flush
Expand Down Expand Up @@ -967,15 +967,15 @@ async function test_rotateHelperOneGesture(
finalExpectedRotation,
test_rotateHelperGetImageRotation(aImageElement),
"Image rotation gesture end: expected=" +
finalExpectedRotation +
", observed=" +
test_rotateHelperGetImageRotation(aImageElement) +
", init=" +
aCurrentRotation +
", amt=" +
aAmount +
", dir=" +
(aDirection == clockwise ? "cl" : "ccl")
finalExpectedRotation +
", observed=" +
test_rotateHelperGetImageRotation(aImageElement) +
", init=" +
aCurrentRotation +
", amt=" +
aAmount +
", dir=" +
(aDirection == clockwise ? "cl" : "ccl")
);
}

Expand Down Expand Up @@ -1138,7 +1138,7 @@ async function test_rotateGesturesOnTab() {
function test_rotateGestures() {
test_imageTab = BrowserTestUtils.addTab(
gBrowser,
"chrome://branding/content/about-logo.png"
"chrome://branding/content/about-logo.svg"
);
gBrowser.selectedTab = test_imageTab;

Expand Down
Binary file removed browser/branding/flamewolf/content/about-logo.png
Binary file not shown.
Binary file not shown.
122 changes: 2 additions & 120 deletions browser/branding/flamewolf/content/about-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions browser/branding/flamewolf/content/firefox-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions browser/branding/flamewolf/content/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png
content/branding/about-logo.png
content/branding/about-logo.svg
content/branding/[email protected]
content/branding/about-logo-private.png
content/branding/[email protected]
content/branding/about-wordmark.svg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $glyph-forward: url('chrome://browser/skin/forward.svg');
display: inline-block;
height: $logo-size;
width: $logo-size;
background: image-set(url('chrome://branding/content/about-logo.png'), url('chrome://branding/content/[email protected]') 2x) no-repeat center;
background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center;
background-size: $logo-size;
}

Expand Down
2 changes: 1 addition & 1 deletion browser/components/newtab/css/activity-stream-linux.css
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ main section {
display: inline-block;
height: 82px;
width: 82px;
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/[email protected]") 2x) no-repeat center;
background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center;
background-size: 82px;
}
.search-wrapper .logo-and-wordmark .wordmark {
Expand Down
2 changes: 1 addition & 1 deletion browser/components/newtab/css/activity-stream-mac.css
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ main section {
display: inline-block;
height: 82px;
width: 82px;
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/[email protected]") 2x) no-repeat center;
background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center;
background-size: 82px;
}
.search-wrapper .logo-and-wordmark .wordmark {
Expand Down
2 changes: 1 addition & 1 deletion browser/components/newtab/css/activity-stream-windows.css
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ main section {
display: inline-block;
height: 82px;
width: 82px;
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/[email protected]") 2x) no-repeat center;
background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center;
background-size: 82px;
}
.search-wrapper .logo-and-wordmark .wordmark {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_task(async function test_experiment_plain_text() {
infoTitleEnabled: true,
infoBody: "This is some text",
infoLinkText: "This is a link",
infoIcon: "chrome://branding/content/about-logo.png",
infoIcon: "chrome://branding/content/about-logo.svg",
promoTitle: "Promo title",
promoLinkText: "Promo link",
promoLinkType: "link",
Expand Down Expand Up @@ -55,7 +55,7 @@ add_task(async function test_experiment_plain_text() {
ok(!infoContainer.hidden, ".info container should be visible");
ok(
infoContainer.style.backgroundImage.includes(
"chrome://branding/content/about-logo.png"
"chrome://branding/content/about-logo.svg"
),
"should render icon"
);
Expand Down
2 changes: 1 addition & 1 deletion browser/config/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128.1.1
128.1.2
2 changes: 1 addition & 1 deletion browser/config/version_display.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128.1.1esr
128.1.2esr
Loading

0 comments on commit 18c558a

Please sign in to comment.