README.md

@@ -7,6 +7,11 @@ This does not replace a proper implementation in
 [Firefox upstream](https://bugzilla.mozilla.org/show_bug.cgi?id=1579348)
 *(interesting stuff happens in issues linked in "References")*.
 
+## Matrix / IRC channel
+
+* Matrix: `#mobile-config-firefox:postmarketos.org`
+* IRC: `#mobile-config-firefox` at OFTC
+
 ## What this config does
 
 * Adapt UI elements and "about:" pages to small screen sizes (when opened on
@@ -23,7 +28,7 @@ This does not replace a proper implementation in
     for Wikipedia (only works in Firefox ESR, limitation of
     [policies.json](https://github.com/mozilla/policy-templates/blob/cab6a5076c1d8e5a1574637709c19b54bdbd669e/README.md#searchengines--remove))
   * Install [uBlock origin](https://github.com/gorhill/uBlock) by default
-    ([why?](https://gitlab.com/postmarketOS/mobile-config-firefox/-/commit/160a1056c2cf35572157762f66174ea7c0b1db06))
+    ([why?](https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox/-/commit/160a1056c2cf35572157762f66174ea7c0b1db06))
 * Uncluttering:
   * Disable built-in advertisements (e.g. hardcoded links for certain social
     media sites on the start page)
@@ -68,10 +73,10 @@ if you do not want it. Without editing the file, it can only be disabled in the
 add-on settings, and not removed, this is a limitation of `policies.json`.
 
 Feel free to
-[create an issue](https://gitlab.com/postmarketOS/mobile-config-firefox/-/issues)
+[create an issue](https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox/-/issues)
 if you run into problems. Or even better, attempt to fix the problem yourself
 (see development instructions below) and submit a
-[merge request](https://gitlab.com/postmarketOS/mobile-config-firefox/-/merge_requests).
+[merge request](https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox/-/merge_requests).
 
 ## Contributing changes to userChrome
 Firefox' developer tools include a

org.postmarketos.mobile_config_firefox.metainfo.xml

@@ -4,6 +4,7 @@
 
   <name>Mobile Config for Firefox</name>
   <summary>Mobile and privacy friendly configuration for Firefox (distro-independent)</summary>
+  <url type="homepage">https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox</url>
 
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MPL-2.0</project_license>

src/common/header.css

@@ -6,7 +6,7 @@
  * | | | | | | (_) | |_) | | |  __/_____| (_| (_) | | | |  _| | (_| |
  * |_| |_| |_|\___/|_.__/|_|_|\___|      \___\___/|_| |_|_| |_|\__, |
  * mobile-config-firefox                                        |___/
- * https://gitlab.com/postmarketOS/mobile-config-firefox/
+ * https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox/
  *
  * WARNING: DO NOT EDIT THE COPY OF THIS FILE LOCATED IN YOUR USER PROFILE!
  *

src/mobile-config-autoconfig.js

@@ -19,7 +19,15 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 const Services = globalThis.Services;
-Cu.import("resource://gre/modules/FileUtils.jsm");
+const { AppConstants } = ChromeUtils.importESModule("resource://gre/modules/AppConstants.sys.mjs");
+const IS_ESM_READY = parseInt(AppConstants.MOZ_APP_VERSION, 10) >= 128;
+
+// We need to conditionally load some modules because they haven't been ported
+// the ES module yet. This workaround can be removed when ESR128 will be EOL.
+const { FileUtils } =
+    IS_ESM_READY
+      ? ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs")
+      : Cu.import("resource://gre/modules/FileUtils.jsm");
 
 var g_ff_version;
 var g_updated = false;

src/userChrome/tabmenu.css

-/* Copyright 2022 Peter Mack, Oliver Smith
+/* Copyright 2025 Peter Mack, Oliver Smith
  * SPDX-License-Identifier: MPL-2.0 */
 
 @media (max-width: 700px) {
-    /* Even when not in private browsing mode, reserve space to the right of
-     * the tab bar for the private-browsing-indicator (that mask icon). This
-     * gives the tab bar a consistent width in both the regular and the private
-     * browsing mode, so the increased width hack below looks good in both. */
+    /* Make sure that we don't waste space on the right.
+     * This can removed once we no longer support ESR 128 */
     #titlebar {
-        padding-right: 30px;
+        padding-right: 0px;
     }
 
-    /* Fix private browsing mode for current Firefox >= 115 */
+
+    /* Increase tab width, to have more space for displaying the title of the
+     * website, supporting uidensity=touch
+     * Note that -94px/-124px would be enough for current (136), but ESR 128
+     * requires more (-102px/-132px) */
+    #tabbrowser-tabs {
+        border-inline-start: 0 !important;
+        --tab-min-width: calc(100vw - 86px) !important;
+
+        :root[uidensity=touch] & {
+            --tab-min-width: calc(100vw - 102px) !important;
+        }
+    }
+
+    /* Smaller tab width to allow for private browsing indicator */
+    :root[privatebrowsingmode="temporary"] #tabbrowser-tabs {
+        --tab-min-width: calc(100vw - 116px) !important; /* width */
+
+        :root[uidensity=touch] & {
+            --tab-min-width: calc(100vw - 132px) !important;
+        }
+    }
+
+    /* Fix private browsing mode for Firefox 115-132 */
     #private-browsing-indicator-with-label {
-        margin-inline: 0px !important;
-        width: 0px;
+        margin-inline: 2px !important;
         font-size: 0;
     }
+    /* Fix private browsing mode for current Firefox >= 133 */
+    hbox.private-browsing-indicator-with-label label {
+        display: none;
+    }
 
     /* Hide firefox-view tab, as none of the options in about:config hides it on FF 123 */
     #firefox-view-button {
         display: none;
     }
 
-    /* Increase tab width, to have more space for displaying the title of the
-     * website */
-    #tabbrowser-tabs {
-        --tab-min-width: calc(100vw - 116px) !important;
-        border-inline-start: 0 !important;
-    }
-
     /* Option to show multiple tabs in tab bar */
     @media (-moz-bool-pref: "mcf.multipletabs") {
-        #titlebar {
-            padding-right: 0px !important;
-        }
         /* Set small tabs width for small screens */
         #tabbrowser-tabs {
             --tab-min-width: 75px !important;

src/userChrome/urlbar.css

-/* Copyright 2022 Oliver Smith
+/* Copyright 2025 Oliver Smith, Peter Mack
  * SPDX-License-Identifier: MPL-2.0 */
 
 /* Reduce minimum window width */
@@ -65,6 +65,27 @@
         display: none;
     }
 
+    /* Fixing invisible URL bar on FF 133+ */
+    #urlbar[breakout][breakout-extend] {
+        width: --urlbar-width !important;
+        bottom: 0 !important;
+        z-index: 5 !important;
+    }
+
+    @media not (-moz-bool-pref: "mcf.addressbarontop") {
+        #urlbar[breakout][breakout-extend] {
+            top: 0 !important;
+            align-content: flex-end !important;
+        }
+    }
+
+    @media (-moz-bool-pref: "mcf.addressbarontop") {
+        #urlbar[breakout][breakout-extend] {
+            top: calc(1.1 * --urlbar-container-height) !important;
+            align-content: flex-start !important;
+        }
+    }
+
     /* Label of "identity icons", e.g. firefox specific pages look weird
      * when ellipsed, e.g. "F..x" instead of "Firefox". So just hide this
      * label. The icon itself is still visible. */