From b53a3e79b50cb8b3d36676a3383f61049a052ca1 Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 20:54:36 +1000 Subject: [PATCH 01/12] =?UTF-8?q?=F0=9F=92=84=20Correct=20sidebar=20color?= =?UTF-8?q?=20on=20system=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 6f3e19fb..5810089a 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -11,7 +11,7 @@ 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); From 85869897f41176abccd863da04ba7e8194c090c0 Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 21:08:58 +1000 Subject: [PATCH 02/12] =?UTF-8?q?=F0=9F=92=84=20Fix=20background=20colors?= =?UTF-8?q?=20on=20linux=20dynamic=20themes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 5810089a..e29ecd6b 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -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; @@ -82,7 +82,8 @@ #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; } From 3782021d5a3f1360239ec2a29107196f1071c80c Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 21:09:46 +1000 Subject: [PATCH 03/12] =?UTF-8?q?=F0=9F=92=84=20Remove=20messy=20border?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index e29ecd6b..ee5fbd53 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -80,6 +80,10 @@ background-image: url('chrome://global/skin/icons/settings.svg'); } +#sidebar-header { + border-bottom: none; +} + #sidebar-box, #sidebar-splitter { background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); From 361c5e9d6e0923d3f6187c3ce2f8a58e0ca907ab Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 21:48:35 +1000 Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=92=84=20Fix=20wierd=20sidebar=20ta?= =?UTF-8?q?b=20spacing=20on=20proton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index ee5fbd53..48e3591d 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -14,12 +14,8 @@ 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-icon-item { From fe0e56851d18e191a90d8debb33916255907d1df Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 21:55:52 +1000 Subject: [PATCH 05/12] =?UTF-8?q?=F0=9F=8E=A8=20Format=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/addons/shared.css | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) 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); } From 35f292cb70dee6774f67d761c19ab94b47699928 Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 22:20:04 +1000 Subject: [PATCH 06/12] =?UTF-8?q?=F0=9F=92=84=20Bring=20back=20lightweight?= =?UTF-8?q?=20theming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/themes/pulse/sidebar_tabs.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 48e3591d..0fe689fc 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -18,6 +18,10 @@ position: relative; } +.sidebar-container:-moz-lwtheme { + background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)); +} + .sidebar-icon-item { background-size: 16px 16px; background-repeat: no-repeat; From 9c36024352ab45c0141b2643e3cea116f1058d0e Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 22:32:56 +1000 Subject: [PATCH 07/12] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20Remove=20duplicate?= =?UTF-8?q?=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/tabliss/manifest-json.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/browser/extensions/tabliss/manifest-json.patch 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", From 5736e33665ff1b1ce0cbef16ee6e3d5ad7d5f604 Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 22:33:11 +1000 Subject: [PATCH 08/12] Mark tabliss as a bundled extension --- src/browser/app/profile/pulse-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/app/profile/pulse-browser.js b/src/browser/app/profile/pulse-browser.js index 4fcee2f6..848e9b75 100644 --- a/src/browser/app/profile/pulse-browser.js +++ b/src/browser/app/profile/pulse-browser.js @@ -23,7 +23,7 @@ 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); +pref('extensions.installedDistroAddon.extension@tabliss.io', true); pref('browser.discovery.enabled', false); pref('svg.context-properties.content.enabled', true); From 301c9f42e7d6179f4d0b555675c1fcf51b7ad1de Mon Sep 17 00:00:00 2001 From: trickypr Date: Tue, 5 Jul 2022 22:52:33 +1000 Subject: [PATCH 09/12] =?UTF-8?q?=F0=9F=93=9D=20Rename=20gluon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/app/profile/pulse-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/app/profile/pulse-browser.js b/src/browser/app/profile/pulse-browser.js index 848e9b75..d3b26985 100644 --- a/src/browser/app/profile/pulse-browser.js +++ b/src/browser/app/profile/pulse-browser.js @@ -22,7 +22,7 @@ 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 +// TODO: Documentation in gluon for preference pref('extensions.installedDistroAddon.extension@tabliss.io', true); pref('browser.discovery.enabled', false); From d6a3ffa50e22abd578e507e68af2b08aab3cc7fd Mon Sep 17 00:00:00 2001 From: trickypr Date: Fri, 8 Jul 2022 11:36:38 +1000 Subject: [PATCH 10/12] =?UTF-8?q?=F0=9F=92=84=20Refine=20import=20dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/browser/components/welcome/jar.mn | 8 +++-- .../components/welcome/migrate.dark.svg | 6 ++++ .../components/welcome/migrate.light.svg | 6 ++++ src/browser/components/welcome/welcome.css | 17 ++++++++++ src/browser/components/welcome/welcome.html | 34 ++++++++++++------- src/browser/locales/en-US/browser/welcome.ftl | 2 +- 6 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 src/browser/components/welcome/migrate.dark.svg create mode 100644 src/browser/components/welcome/migrate.light.svg 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/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 From 7a15f458dccffbd5bb157d75543ca57577f5eb99 Mon Sep 17 00:00:00 2001 From: trickypr Date: Fri, 8 Jul 2022 11:41:44 +1000 Subject: [PATCH 11/12] =?UTF-8?q?=F0=9F=92=84=20Remove=20"More=20From=20Mo?= =?UTF-8?q?zilla"=20from=20preferences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/shared/preferences/preferences-css.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/browser/themes/shared/preferences/preferences-css.patch 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; ++} From 706daa894ea3e9cbf778d927685cb3955cedee30 Mon Sep 17 00:00:00 2001 From: trickypr Date: Fri, 8 Jul 2022 11:58:17 +1000 Subject: [PATCH 12/12] =?UTF-8?q?=F0=9F=90=9B=20Correct=20the=20update=20h?= =?UTF-8?q?ost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/build/moz-build.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"]