Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 777210d

Browse files
PressJumpPressJump
authored
🔀 Merge about-welcome-rebrand
About welcome rebrand
2 parents e9690fc + 9a4f093 commit 777210d

File tree

8 files changed

+134
-5
lines changed

8 files changed

+134
-5
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ name: CI and tests
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [alpha, beta]
76
pull_request:
8-
# The branches below must be a subset of the branches above
9-
branches: [alpha, beta]
107

118
jobs:
129
license-check:

‎src/browser/app/profile/better-fox.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ pref('browser.privatebrowsing.vpnpromourl', '');
194194
pref('extensions.getAddons.showPane', false);
195195
pref('extensions.htmlaboutaddons.recommendations.enabled', false);
196196
pref('browser.shell.checkDefaultBrowser', false);
197-
pref('browser.aboutwelcome.enabled', false);
197+
pref('browser.aboutwelcome.enabled', true);
198198
pref('browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons', false);
199199
pref(
200200
'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features',

‎src/browser/app/profile/pulse-browser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
pref('media.eme.enabled', true);
99

1010
// Disable firefox's about:welcome page
11-
pref('browser.aboutwelcome.enabled', false);
11+
pref('browser.aboutwelcome.enabled', true);
1212

1313
pref('pulse.welcome.enabled', true);
1414
pref('pulse.welcome.seen', false);

‎src/browser/components/newtab/aboutwelcome/content/aboutwelcome.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!-- This Source Code Form is subject to the terms of the Mozilla Public
2+
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
3+
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
4+
5+
<!doctype html>
6+
<html>
7+
<head>
8+
<meta charset="utf-8">
9+
<meta name="color-scheme" content="light dark">
10+
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; media-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src resource: chrome:;">
11+
<title data-l10n-id="onboarding-welcome-header"></title>
12+
<link rel="icon" type="image/png" href="chrome://branding/content/icon32.png">
13+
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
14+
<link rel="stylesheet" href="chrome://activity-stream/content/aboutwelcome/pulse.css">
15+
<link rel="localization" href="branding/brand.ftl"/>
16+
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
17+
<link rel="localization" href="browser/branding/brandings.ftl"/>
18+
<link rel="localization" href="browser/newtab/onboarding.ftl"/>
19+
20+
<link rel="localization" href="browser/welcome.ftl" />
21+
</head>
22+
<body>
23+
<div id="root">
24+
<div class="grid-container">
25+
<div class="grid-item">
26+
<h1 data-l10n-id="welcome-dialog-welcome"></h1>
27+
<p data-l10n-id="welcome-page-description"></p>
28+
<div class="version-container">
29+
<div>
30+
<img class="logo" src="chrome://branding/content/about-logo.png"/>
31+
</div>
32+
<div>
33+
<h3 data-l10n-id="welcome-page-version"></h3>
34+
<p data-l10n-id="welcome-page-other-downloads"></p>
35+
</div>
36+
</div>
37+
</div>
38+
<div class="grid-item"><img class="preview" src="chrome://activity-stream/content/aboutwelcome/browser-preview.png"></div>
39+
</div>
40+
</div>
41+
</body>
42+
</html>

‎src/browser/components/newtab/aboutwelcome/content/browser-preview.png‎

2.63 MB
Loading

‎src/browser/components/newtab/aboutwelcome/content/pulse.css‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
html {
5+
box-sizing: border-box;
6+
}
7+
8+
*,
9+
*::before,
10+
*::after {
11+
box-sizing: inherit;
12+
}
13+
14+
*::-moz-focus-inner {
15+
border: 0;
16+
}
17+
18+
body {
19+
margin: 0;
20+
}
21+
22+
button,
23+
input {
24+
background-color: inherit;
25+
color: inherit;
26+
font-family: inherit;
27+
font-size: inherit;
28+
}
29+
30+
[hidden] {
31+
display: none !important;
32+
}
33+
34+
html {
35+
height: 100%;
36+
}
37+
38+
body {
39+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Ubuntu", "Helvetica Neue", sans-serif;
40+
font-size: 15px;
41+
}
42+
43+
.grid-container {
44+
display: grid;
45+
grid-template-columns: 1fr 1fr;
46+
grid-template-rows: 1fr 1fr;
47+
grid-gap: 70px;
48+
position: relative;
49+
}
50+
51+
.grid-item {
52+
width: auto;
53+
padding-left: 200px;
54+
margin: 0;
55+
transform: translateY(50%);
56+
}
57+
58+
.preview {
59+
height: 400px;
60+
width: 780px;
61+
}
62+
63+
.logo {
64+
height: 120px;
65+
width: 120px;
66+
}
67+
68+
.version-container {
69+
display: inline-flex;
70+
padding-top: 100px;
71+
}

‎src/browser/components/newtab/jar-mn.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/browser/components/newtab/jar.mn b/browser/components/newtab/jar.mn
2+
index 59ccd0ca577f5947b4ce8077b444673b80b7be67..b439efb9bbc3dadd317aa753145cf30df8e2de4e 100644
3+
--- a/browser/components/newtab/jar.mn
4+
+++ b/browser/components/newtab/jar.mn
5+
@@ -8,6 +8,8 @@ browser.jar:
6+
res/activity-stream/lib/ (./lib/*)
7+
res/activity-stream/common/ (./common/*)
8+
content/activity-stream/aboutwelcome/aboutwelcome.css (./aboutwelcome/content/aboutwelcome.css)
9+
+ content/activity-stream/aboutwelcome/pulse.css (./aboutwelcome/content/pulse.css)
10+
+ content/activity-stream/aboutwelcome/browser-preview.png (./aboutwelcome/content/browser-preview.png)
11+
res/activity-stream/aboutwelcome/aboutwelcome.bundle.js (./aboutwelcome/content/aboutwelcome.bundle.js)
12+
res/activity-stream/aboutwelcome/aboutwelcome.html (./aboutwelcome/content/aboutwelcome.html)
13+
res/activity-stream/aboutwelcome/lib/ (./aboutwelcome/lib/*)

‎src/browser/locales/en-US/browser/welcome.ftl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,9 @@ welcome-dialog-theme-action = Continue
1717
1818
welcome-dialog-search = Chose a search engine
1919
welcome-dialog-search-action = Done
20+
21+
# About Welcome Page
22+
welcome-page-description = An experimental Firefox fork that enhances focus and increases work productivity due to its hyper minimalistic UI and built-in tools
23+
welcome-page-version = You are using { -brand-full-name }
24+
welcome-page-build-id = Build { -build-id }
25+
welcome-page-other-downloads = If this is not the release you want, feel free to checkout other downloads at https://pulsebrowser.app/download

0 commit comments

Comments
 (0)