Merge branch 'main' into update-12

astro.config.mjs

@@ -8,16 +8,6 @@ import sitemap from '@astrojs/sitemap'
 
 // https://astro.build/config
 export default defineConfig({
-  integrations: [
+  integrations: [tailwind(), preact({ compat: true }), sitemap({})],
-    tailwind(),
-    preact({ compat: true }),
-    sitemap({
-      // TODO: Maybe? Maybe not?
-      //   filter: (page) => !page.includes('mods/'),
-    }),
-  ],
   site: 'https://zen-browser.app',
-  redirects: {
-    '/themes/[...slug]': '/mods/[...slug]',
-  },
 })

src/components/Community.astro

@@ -22,9 +22,7 @@ import Image from 'astro/components/Image.astro'
     {...getTitleAnimation(0.6)}
     className="px-4 md:px-24 lg:w-1/2 lg:px-0"
   >
-    We make it not only a priority, but a necessity to ensure that Zen always
+We make it not only a priority, but a necessity to ensure that Zen always strikes the right balance between beauty, performance, and privacy. We are committed to making Zen the most beautiful, productive, and privacy-respecting browser out there — without compromising on your experience.
-    provides the best experience for you. We are committed to making Zen the
-    most beautiful, productive, and privacy-focused browser out there.
   </motion.p>
   <div
     class="mt-6 flex w-full flex-wrap gap-3 px-4 sm:gap-10 sm:px-0 md:justify-center"

src/components/Features.astro

@@ -33,7 +33,7 @@ const {
     </motion.span>
   </Description>
   <motion.p client:load {...getTitleAnimation(0.6)} className="lg:w-1/2">
-    Zen is packed with features that help you stay productive and focused.
+    Zen Browser is packed with features that help you stay productive and focused.
     Browsers should be tools that help you get things done, not distractions
     that keep you from your work.
   </motion.p>

src/components/Footer.astro

@@ -63,7 +63,9 @@ import { ArrowRight } from 'lucide-astro'
             </h2>
             <nav aria-label="About navigation">
               <ul class="grid gap-2 opacity-80">
-                <li><a href="/about" class="font-normal">About Us</a></li>
+                <li>
+                  <a href="/about" class="font-normal">Team & Contributors</a>
+                </li>
                 <li>
                   <a href="/privacy-policy" class="font-normal"
                     >Privacy Policy</a

src/components/Hero.astro

@@ -8,6 +8,7 @@ import { ArrowRight } from 'lucide-astro'
 import { motion } from 'motion/react'
 import { getTitleAnimation } from '../animations'
 import Video from './Video.astro'
+import SocialMediaStrip from './SocialMediaStrip.astro'
 
 let titleAnimationCounter = 0
 function getNewAnimationDelay() {
@@ -26,7 +27,7 @@ function getHeroTitleAnimation() {
 >
   <div class="flex h-full flex-col items-center justify-center">
     <Title
-      class="relative px-12 text-center !font-normal leading-[108px] md:!text-7xl lg:px-0 lg:!text-9xl"
+      class="relative px-12 text-center !font-normal !leading-8 leading-[108px] md:!text-7xl lg:px-0 lg:!text-9xl"
     >
       <motion.span client:load {...getHeroTitleAnimation()}>
         welcome
@@ -60,9 +61,16 @@ function getHeroTitleAnimation() {
         </Button>
       </motion.span>
       <motion.span client:load {...getHeroTitleAnimation()}>
-        <Button href="#Features">Explore Zen</Button>
+        <Button href="/donate">Support Us ❤️</Button>
       </motion.span>
     </div>
+    <motion.span
+      client:load
+      {...getHeroTitleAnimation()}
+      class="mx-auto translate-y-16 !transform"
+    >
+      <SocialMediaStrip />
+    </motion.span>
   </div>
 </header>
 <motion.span

src/components/ReleaseNoteItem.astro

@@ -44,7 +44,7 @@ const ffVersion = getReleaseNoteFirefoxVersion(props)
       }
       {
         ffVersion ? (
-          <div class="!mb-2 ml-6 mt-1 block inline w-fit rounded-full bg-blue-500 dark:bg-blue-50 px-3 py-1 text-xs text-paper">
+          <div class="!mb-2 ml-6 mt-1 block inline w-fit rounded-full bg-blue-500 px-3 py-1 text-xs text-paper dark:bg-blue-50">
             Firefox {ffVersion}
           </div>
         ) : null

src/components/Sponsors.astro

@@ -19,9 +19,9 @@ const { showSponsors = true } = Astro.props
     <motion.span client:load {...getTitleAnimation(0.4)}>
       <Description>
         We are grateful to our sponsors for their support. They help us to keep
-        the project alive.<br />You can also be part of this journey by donating <a
+        the project alive.<br />You can also be part of this journey by <a
           href="/donate"
-          class="zen-link">here</a
+          class="zen-link">donating us directly</a
         >!
       </Description>
     </motion.span>

src/layouts/Layout.astro

@@ -11,6 +11,8 @@ const { title, description, ogImage, isHome, redirect } = Astro.props
 const defaultDescription = 'Zen Browser is built for speed, security, and true privacy. Download now to enjoy a beautifully-designed, distraction-free web experience packed with features.';
 const defaultOgImage = '/share-pic.png';
 import '@fontsource/bricolage-grotesque/400.css'
+import '@fontsource/bricolage-grotesque/500.css'
+import '@fontsource/bricolage-grotesque/600.css'
 import NavBar from '../components/NavBar.astro'
 import Footer from '../components/Footer.astro'
 ---
@@ -103,11 +105,13 @@ import Footer from '../components/Footer.astro'
   @font-face {
     font-family: 'Junicode';
     src: url('/fonts/JunicodeVF-Roman-subset.woff2') format('woff2');
+    font-display: swap;
   }
 
   @font-face {
     font-family: 'Junicode-Italic';
     src: url('/fonts/JunicodeVF-Italic-subset.woff2') format('woff2');
+    font-display: swap;
   }
 
   * {

src/pages/donate.astro

@@ -7,18 +7,21 @@ import Layout from '../layouts/Layout.astro'
 ---
 
 <Layout title="Donate - Zen Browser">
-  <main class="flex flex-col items-center pb-52 pt-36">
+  <main class="pb-52 pt-36">
-    <div class="mb-24 p-4 text-center lg:w-1/2">
+    <div
-      <Description class="text-6xl font-bold">Donate!</Description>
+      class="relative flex w-full flex-col items-center justify-center gap-12"
+    >
+      <div class="px-8 lg:w-2/5 lg:text-center xl:px-0">
+        <Description class="text-6xl font-bold"
+          >Help us build <br class="hidden lg:block" />a better browser!</Description
+        >
         <Description>
           We are a small team of developers working hard to bring you the best
-        browsing experience. If you like what we do, please consider supporting
+          browsing experience. If you like what we do, please consider
-        us.
+          supporting us.
         </Description>
       </div>
-    <div
+      <div class="flex w-full flex-col items-center justify-center lg:flex-row">
-      class="relative flex w-full flex-col items-center justify-center lg:flex-row"
-    >
         <div class="flex flex-col p-8 lg:w-1/3 lg:pr-24">
           <div class="text-6xl font-bold">Patreon</div>
           <Description>
@@ -41,16 +44,21 @@ import Layout from '../layouts/Layout.astro'
           <div class="text-6xl font-bold">Ko-fi</div>
           <Description>
             Ko-fi allows you to support us with a one-time donation. You can
-          choose the amount that works best for you. Monthly donations are also
+            choose the amount that works best for you. Monthly donations are
-          available.
+            also available.
           </Description>
           <div class="mt-6">
-          <Button href="https://ko-fi.com/zen_browser" isPrimary class="w-fit">
+            <Button
+              href="https://ko-fi.com/zen_browser"
+              isPrimary
+              class="w-fit"
+            >
               Go to Ko-fi
               <ArrowRight class="size-4" />
             </Button>
           </div>
         </div>
       </div>
+    </div>
   </main>
 </Layout>

src/release-notes/stable.json

@@ -2617,10 +2617,10 @@
   {
     "version": "1.11.5b",
     "image": false,
-    "extra": "A small update to fix some issues with the new PiP feature and element-separation 0",
+    "extra": "A small update to fix some issues with the new PiP feature and 'element-separation: 0'",
     "fixes": [
-      "Fixed an issue with element-separation 0 not allowing to access the window controls",
+      "Fixed an issue with 'element-separation: 0' disallowing access to the window controls",
-      "Disabled automatic PiP untill we have a proper settings UI for it once we build own settings panel"
+      "Disabled automatic PiP until we've built a proper settings UI panel of our own"
     ],
     "features": [],
     "workflowId": 14551479492,

src/release-notes/twilight.json

@@ -1,11 +1,11 @@
 {
   "version": "1.12t",
   "image": false,
-  "extra": "A nice update that brings some cool new features and fixes!\n\nWe are also exited to announce that we moved into <a href=\"https://floss.social/@zenbrowser\">floss.social</a>!\n\nIn response to recent privacy concerns, we've significantly strengthened Zen's privacy measures. Previously, we only disabled telemetry, but some minimal pings were still being sent. Now, firefox telemetry has been completely stripped out from the core.\n\nAdditionally, onboarding pages and intial essentials favicons are now served through our own fully private CDN and our website no longer relies on any external services/CDNs. Initial essentials selected on startup will only be loaded once clicked on the tab as well.\n\nOnly essential security updates and other non-telemetry-related services remain. As a result, the number of external connections has dropped from 82 to around 13 — factoring in that Zen's site is loaded twice (for the welcome page and privacy policy) and about 10 favicons are fetched from our private CDN.\n\nPsst. With the release of firefox 138, folders are just around the corner!",
+  "extra": "A nice update that brings some cool new features and fixes!\n\nWe are also excited to announce that we moved into <a href=\"https://floss.social/@zenbrowser\">floss.social</a>!\n\nIn response to recent privacy concerns, we've significantly strengthened Zen's privacy measures. Previously, we only disabled telemetry, but some minimal pings were still being sent. Now, Firefox telemetry has been completely stripped out from the core.\n\nAdditionally, onboarding pages and initial essentials favicons are now locally bundled and our website no longer relies on any external services/CDNs and/or cloudflare services. Initial essentials selected on startup will only be loaded once clicked on the tab as well, meaning connections wont be done until you explicitly enter the tab. We also changed our initial essentials variations to more private/productivity focused sites.\n\nOnly essential security updates and other non-telemetry-related services remain. As a result, the number of external connections has dropped from 82 to around 20-10 — factoring in that Zen's site is loaded twice (for the welcome page and privacy policy).\n\nPsst. With the release of Firefox 138, folders are just around the corner!",
   "fixes": [
     "Fixed a crash when no loaded tab is present on the ctrl+Tab menu",
     {
-      "description": "Fixed alert boxes cutoff half way on split view",
+      "description": "Fixed alert boxes cutoff halfway on split view",
       "issue": 7564
     },
     {
@@ -14,7 +14,7 @@
     },
     "Fixed Paste-And-Go always navigating in the current tab, even after ctrl+T is pressed",
     {
-      "description": "Panels UI not rendering addons correctly and overflow outside the screen on linux",
+      "description": "Panels UI not rendering add-ons correctly and overflow outside the screen on linux",
       "issue": 7633
     },
     "Fixed URL bar unfocusing when pressing the newtab button",
@@ -32,7 +32,7 @@
     "Updated to Firefox 138.0",
     "Increased privacy and reduced initial connections at startup",
     "Added a *really smooth* animation when downloading files. Thanks to @BrielOtero on github!",
-    "New, fully containerized essentials are out! It allows to have different essentials based on your workspace's container. It can be enabled by goign into about:preferences -> tab management -> allow container specific essentials",
+    "New, fully containerized essentials are out! It allows having different essentials based on your workspace's container. It can be enabled by going into about:preferences -> tab management -> allow container specific essentials",
     "Auto-Picture-in-Picture wont activate if the video is muted",
     "Added homepage button and export/import buttons to the mods page for easier access. Thanks to @Pdzly on github!",
     "More efficient workspace switching, by only animating what we need and warming up the tabs before switching",