diff --git a/src/browser/app/profile/pulse-browser.js b/src/browser/app/profile/pulse-browser.js
index 4fcee2f6..d3b26985 100644
--- a/src/browser/app/profile/pulse-browser.js
+++ b/src/browser/app/profile/pulse-browser.js
@@ -22,8 +22,8 @@ pref('media.videocontrols.picture-in-picture.audio-toggle.enabled', true);
// This preference tells the browser that our addons are preinstalled and should
// be provided with permissions without asking
-// TODO: Documentation in melon for preference
-pref('extensions.installedDistroAddon.newtab@browser.fushra.com', true);
+// TODO: Documentation in gluon for preference
+pref('extensions.installedDistroAddon.extension@tabliss.io', true);
pref('browser.discovery.enabled', false);
pref('svg.context-properties.content.enabled', true);
diff --git a/src/browser/components/welcome/jar.mn b/src/browser/components/welcome/jar.mn
index 4eda6368..599c8e77 100644
--- a/src/browser/components/welcome/jar.mn
+++ b/src/browser/components/welcome/jar.mn
@@ -4,6 +4,8 @@
browser.jar:
% content browser %content/browser/ contentaccessible=yes
- content/browser/welcome/welcome.html (welcome.html)
- content/browser/welcome/welcome.css (welcome.css)
- content/browser/welcome/welcome.js (welcome.js)
+ content/browser/welcome/welcome.html (welcome.html)
+ content/browser/welcome/welcome.css (welcome.css)
+ content/browser/welcome/welcome.js (welcome.js)
+ content/browser/welcome/migrate.light.svg (migrate.light.svg)
+ content/browser/welcome/migrate.dark.svg (migrate.dark.svg)
diff --git a/src/browser/components/welcome/migrate.dark.svg b/src/browser/components/welcome/migrate.dark.svg
new file mode 100644
index 00000000..a1409cbb
--- /dev/null
+++ b/src/browser/components/welcome/migrate.dark.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/browser/components/welcome/migrate.light.svg b/src/browser/components/welcome/migrate.light.svg
new file mode 100644
index 00000000..570b17fc
--- /dev/null
+++ b/src/browser/components/welcome/migrate.light.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/browser/components/welcome/welcome.css b/src/browser/components/welcome/welcome.css
index c3cbfd40..cb33f29c 100644
--- a/src/browser/components/welcome/welcome.css
+++ b/src/browser/components/welcome/welcome.css
@@ -67,3 +67,20 @@ p {
height: 82px;
width: 82px;
}
+
+.asset {
+ width: 500px;
+ padding-bottom: 32px;
+}
+
+@media (prefers-color-scheme: light) {
+ .dark-only {
+ display: none;
+ }
+}
+
+@media (prefers-color-scheme: dark) {
+ .light-only {
+ display: none;
+ }
+}
diff --git a/src/browser/components/welcome/welcome.html b/src/browser/components/welcome/welcome.html
index 9645cfaf..f7961701 100644
--- a/src/browser/components/welcome/welcome.html
+++ b/src/browser/components/welcome/welcome.html
@@ -27,7 +27,7 @@
-
+
@@ -40,22 +40,32 @@
diff --git a/src/browser/extensions/tabliss/manifest-json.patch b/src/browser/extensions/tabliss/manifest-json.patch
deleted file mode 100644
index cba7aebd..00000000
--- a/src/browser/extensions/tabliss/manifest-json.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/browser/extensions/tabliss/manifest.json b/browser/extensions/tabliss/manifest.json
-index b22be5737d450e9f7fa2c55dac44432505e293f4..9f64d286dab8be040b24c4fdf4456b3a76163591 100644
---- a/browser/extensions/tabliss/manifest.json
-+++ b/browser/extensions/tabliss/manifest.json
-@@ -13,6 +13,10 @@
- "chrome_url_overrides": {
- "newtab": "index.html"
- },
-+ "chrome_settings_overrides": {
-+ "_Pulse": "We want tabliss to appear on the home screen as well as new tabpages",
-+ "homepage": "index.html"
-+ },
- "icons": {
- "32": "icons/32.png",
- "48": "icons/48.png",
diff --git a/src/browser/locales/en-US/browser/welcome.ftl b/src/browser/locales/en-US/browser/welcome.ftl
index f1121da7..1cfd9602 100644
--- a/src/browser/locales/en-US/browser/welcome.ftl
+++ b/src/browser/locales/en-US/browser/welcome.ftl
@@ -10,7 +10,7 @@ welcome-dialog-skip = Not now
welcome-dialog-import = Import your stuff
welcome-dialog-import-subtext = Pick up where you left off in your last browser.
-welcome-dialog-import-action = Import from previous browser
+welcome-dialog-import-action = Import
welcome-dialog-theme = Choose a theme
welcome-dialog-theme-action = Continue
diff --git a/src/browser/themes/pulse/addons/shared.css b/src/browser/themes/pulse/addons/shared.css
index 2d9bc77e..f22acc58 100644
--- a/src/browser/themes/pulse/addons/shared.css
+++ b/src/browser/themes/pulse/addons/shared.css
@@ -21,7 +21,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
--tab-block-margin: 0 !important; /* The padding around each tab. In proton, this is what makes them float */
--tab-border-radius: 0 !important; /* The border radius of the tab */
--tab-padding-inline: 0 !important; /* Padding to the left and right of the tab. **Focus Browser custom** */
-
+
--toolbarbutton-border-radius: 4px;
/* Toolbar area */
@@ -63,7 +63,8 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
padding: 4px !important;
}
-.toolbarbutton-icon, .tab-close-button {
+.toolbarbutton-icon,
+.tab-close-button {
border-radius: 4px !important;
}
@@ -83,7 +84,7 @@ tab.tabbrowser-tab:nth-child(1) {
.tabbrowser-tab {
/* BUG GH#54: The container color does not show up in the pulse theme */
border-top: 2px solid var(--identity-tab-color);
-
+
/* Expand the overflow margin to contain the tab curves
https://searchfox.org/mozilla-central/diff/b269ed31009c9a01be532c9afc0a836e0ad86ed6/browser/themes/shared/tabs.css#103 */
overflow-clip-margin: 8px !important;
@@ -94,27 +95,27 @@ tab.tabbrowser-tab:nth-child(1) {
fill: var(--lwt-selected-tab-background-color);
} */
-.tab-background[selected="true"]::before,
-.tab-background[selected="true"]::after {
- content: "";
+.tab-background[selected='true']::before,
+.tab-background[selected='true']::after {
+ content: '';
position: absolute;
bottom: 0;
-
+
-moz-context-properties: fill;
fill: var(--lwt-selected-tab-background-color);
background-size: cover;
-
+
width: var(--tab-rounding-size);
height: var(--tab-rounding-size);
}
-.tab-background[selected="true"]::before {
- background-image: url("chrome://global/skin/icons/tab-rising-edge.svg");
+.tab-background[selected='true']::before {
+ background-image: url('chrome://global/skin/icons/tab-rising-edge.svg');
left: var(--tab-rounding-size-neg);
}
-.tab-background[selected="true"]::after {
- background-image: url("chrome://global/skin/icons/tab-falling-edge.svg");
+.tab-background[selected='true']::after {
+ background-image: url('chrome://global/skin/icons/tab-falling-edge.svg');
right: var(--tab-rounding-size-neg);
}
@@ -140,9 +141,9 @@ tab.tabbrowser-tab:nth-child(1) {
/* ========================================================================== */
/* Sidebar tabs */
-.sidebar-item-background[checked="true"]::before,
-.sidebar-item-background[checked="true"]::after {
- content: "";
+.sidebar-item-background[checked='true']::before,
+.sidebar-item-background[checked='true']::after {
+ content: '';
position: absolute;
right: 0;
@@ -158,13 +159,13 @@ tab.tabbrowser-tab:nth-child(1) {
z-index: 10;
}
-.sidebar-item-background[checked="true"]::before {
- background-image: url("chrome://global/skin/icons/tab-rising-edge.svg");
+.sidebar-item-background[checked='true']::before {
+ background-image: url('chrome://global/skin/icons/tab-rising-edge.svg');
top: var(--tab-rounding-size-neg);
}
-.sidebar-item-background[checked="true"]::after {
- background-image: url("chrome://global/skin/icons/tab-falling-edge.svg");
+.sidebar-item-background[checked='true']::after {
+ background-image: url('chrome://global/skin/icons/tab-falling-edge.svg');
bottom: var(--tab-rounding-size-neg);
transform: rotate(180deg);
}
diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css
index 6f3e19fb..0fe689fc 100644
--- a/src/browser/themes/pulse/sidebar_tabs.css
+++ b/src/browser/themes/pulse/sidebar_tabs.css
@@ -11,15 +11,15 @@
display: flex;
flex-direction: column;
justify-content: space-between;
- background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
+ background-color: -moz-Dialog;
overflow: hidden;
- max-width: var(--tab-min-height);
- min-width: var(--tab-min-height);
-
/* Makes the sidebar slide out from below */
position: relative;
- z-index: 10;
+}
+
+.sidebar-container:-moz-lwtheme {
+ background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
}
.sidebar-icon-item {
@@ -57,8 +57,8 @@
.sidebar-item-background[checked] {
background-attachment: scroll, scroll, fixed;
- background-color: transparent;
- background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+ background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+ background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
background-position: 0 0, 0 0, right top;
background-repeat: repeat-x, repeat-x, no-repeat;
background-size: auto 100%, auto 100%, auto auto;
@@ -80,9 +80,14 @@
background-image: url('chrome://global/skin/icons/settings.svg');
}
+#sidebar-header {
+ border-bottom: none;
+}
+
#sidebar-box,
#sidebar-splitter {
- background-color: var(--lwt-selected-tab-background-color, --lwt-sidebar-background-color) !important;
+ background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+ background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
-moz-default-appearance: auto !important;
-moz-font-smoothing-background-color: auto !important;
}
diff --git a/src/browser/themes/shared/preferences/preferences-css.patch b/src/browser/themes/shared/preferences/preferences-css.patch
new file mode 100644
index 00000000..7f527b76
--- /dev/null
+++ b/src/browser/themes/shared/preferences/preferences-css.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
+index 74493f3c59c4824c0873d278a47be649e4e90ffa..f1446090abbca1bf1a004e59721bf2c7ce5c9afc 100644
+--- a/browser/themes/shared/preferences/preferences.css
++++ b/browser/themes/shared/preferences/preferences.css
+@@ -1603,3 +1603,8 @@ richlistitem .text-link:hover {
+ appearance: none;
+ }
+ }
++
++#category-more-from-mozilla {
++ /* Don't show from mozilla in settings */
++ display: none;
++}
diff --git a/src/build/moz-build.patch b/src/build/moz-build.patch
index 384ab4ef..54084ce4 100644
--- a/src/build/moz-build.patch
+++ b/src/build/moz-build.patch
@@ -1,5 +1,5 @@
diff --git a/build/moz.build b/build/moz.build
-index 671e77e97b351148a871022769e41798db3781eb..0386c1283d695f21074092a015f7d5b09ad94884 100644
+index 671e77e97b351148a871022769e41798db3781eb..284d3bcdec8a139f9881a4df24cbae846e2f44f3 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
@@ -7,7 +7,7 @@ index 671e77e97b351148a871022769e41798db3781eb..0386c1283d695f21074092a015f7d5b0
appini_defines[var] = True
- appini_defines["MOZ_APPUPDATE_HOST"] = "aus5.mozilla.org"
-+ appini_defines["MOZ_APPUPDATE_HOST"] = "localhost:8000"
++ appini_defines["MOZ_APPUPDATE_HOST"] = "updates.pulsebrowser.app"
if CONFIG["MOZ_APPUPDATE_HOST"]:
appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
+ 
+ 
+