Skip to content

Commit 18c558a

Browse files
committed
Fix branding
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`)
1 parent 9116ef5 commit 18c558a

File tree

18 files changed

+40
-161
lines changed

18 files changed

+40
-161
lines changed

browser/base/content/aboutDialog.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

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

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

browser/base/content/aboutDialog.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<vbox id="rightBox">
4545
<label id="release" hidden="true">
4646
<!-- This string is explicitly not translated -->
47-
Extended Support Release
47+
FlameWolf Standard Release
4848
</label>
4949
#ifndef MOZ_UPDATER
5050
<!-- This HBOX is duplicated below with class="update" -->

browser/base/content/test/general/browser_gestureSupport.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -924,15 +924,15 @@ async function test_rotateHelperOneGesture(
924924
stopExpectedRotation,
925925
test_rotateHelperGetImageRotation(aImageElement),
926926
"Image rotation at gesture stop/hold: expected=" +
927-
stopExpectedRotation +
928-
", observed=" +
929-
test_rotateHelperGetImageRotation(aImageElement) +
930-
", init=" +
931-
aCurrentRotation +
932-
", amt=" +
933-
aAmount +
934-
", dir=" +
935-
(aDirection == clockwise ? "cl" : "ccl")
927+
stopExpectedRotation +
928+
", observed=" +
929+
test_rotateHelperGetImageRotation(aImageElement) +
930+
", init=" +
931+
aCurrentRotation +
932+
", amt=" +
933+
aAmount +
934+
", dir=" +
935+
(aDirection == clockwise ? "cl" : "ccl")
936936
);
937937
}
938938
// End it and force flush
@@ -967,15 +967,15 @@ async function test_rotateHelperOneGesture(
967967
finalExpectedRotation,
968968
test_rotateHelperGetImageRotation(aImageElement),
969969
"Image rotation gesture end: expected=" +
970-
finalExpectedRotation +
971-
", observed=" +
972-
test_rotateHelperGetImageRotation(aImageElement) +
973-
", init=" +
974-
aCurrentRotation +
975-
", amt=" +
976-
aAmount +
977-
", dir=" +
978-
(aDirection == clockwise ? "cl" : "ccl")
970+
finalExpectedRotation +
971+
", observed=" +
972+
test_rotateHelperGetImageRotation(aImageElement) +
973+
", init=" +
974+
aCurrentRotation +
975+
", amt=" +
976+
aAmount +
977+
", dir=" +
978+
(aDirection == clockwise ? "cl" : "ccl")
979979
);
980980
}
981981

@@ -1138,7 +1138,7 @@ async function test_rotateGesturesOnTab() {
11381138
function test_rotateGestures() {
11391139
test_imageTab = BrowserTestUtils.addTab(
11401140
gBrowser,
1141-
"chrome://branding/content/about-logo.png"
1141+
"chrome://branding/content/about-logo.svg"
11421142
);
11431143
gBrowser.selectedTab = test_imageTab;
11441144

-33.7 KB
Binary file not shown.
Binary file not shown.

browser/branding/flamewolf/content/about-wordmark.svg

Lines changed: 2 additions & 120 deletions
Loading

browser/branding/flamewolf/content/firefox-wordmark.svg

Lines changed: 1 addition & 2 deletions
Loading

browser/branding/flamewolf/content/jar.mn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
browser.jar:
66
% content branding %content/branding/ contentaccessible=yes
77
content/branding/about.png
8-
content/branding/about-logo.png
98
content/branding/about-logo.svg
10-
content/branding/about-logo@2x.png
119
content/branding/about-logo-private.png
1210
content/branding/about-logo-private@2x.png
1311
content/branding/about-wordmark.svg

browser/components/newtab/content-src/components/Search/_Search.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $glyph-forward: url('chrome://browser/skin/forward.svg');
2626
display: inline-block;
2727
height: $logo-size;
2828
width: $logo-size;
29-
background: image-set(url('chrome://branding/content/about-logo.png'), url('chrome://branding/content/about-logo@2x.png') 2x) no-repeat center;
29+
background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center;
3030
background-size: $logo-size;
3131
}
3232

browser/components/newtab/css/activity-stream-linux.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ main section {
12821282
display: inline-block;
12831283
height: 82px;
12841284
width: 82px;
1285-
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center;
1285+
background: image-set(url('chrome://branding/content/about-logo.svg')) no-repeat center;
12861286
background-size: 82px;
12871287
}
12881288
.search-wrapper .logo-and-wordmark .wordmark {

browser/components/newtab/css/activity-stream-mac.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ main section {
12861286
display: inline-block;
12871287
height: 82px;
12881288
width: 82px;
1289-
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center;
1289+
background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center;
12901290
background-size: 82px;
12911291
}
12921292
.search-wrapper .logo-and-wordmark .wordmark {

browser/components/newtab/css/activity-stream-windows.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ main section {
12821282
display: inline-block;
12831283
height: 82px;
12841284
width: 82px;
1285-
background: image-set(url("chrome://branding/content/about-logo.png"), url("chrome://branding/content/about-logo@2x.png") 2x) no-repeat center;
1285+
background: image-set(url("chrome://branding/content/about-logo.svg")) no-repeat center;
12861286
background-size: 82px;
12871287
}
12881288
.search-wrapper .logo-and-wordmark .wordmark {

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ add_task(async function test_experiment_plain_text() {
1717
infoTitleEnabled: true,
1818
infoBody: "This is some text",
1919
infoLinkText: "This is a link",
20-
infoIcon: "chrome://branding/content/about-logo.png",
20+
infoIcon: "chrome://branding/content/about-logo.svg",
2121
promoTitle: "Promo title",
2222
promoLinkText: "Promo link",
2323
promoLinkType: "link",
@@ -55,7 +55,7 @@ add_task(async function test_experiment_plain_text() {
5555
ok(!infoContainer.hidden, ".info container should be visible");
5656
ok(
5757
infoContainer.style.backgroundImage.includes(
58-
"chrome://branding/content/about-logo.png"
58+
"chrome://branding/content/about-logo.svg"
5959
),
6060
"should render icon"
6161
);

browser/config/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
128.1.1
1+
128.1.2

browser/config/version_display.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
128.1.1esr
1+
128.1.2esr

0 commit comments

Comments
 (0)