Merge branch 'main' of gitlab.com:librewolf-community/browser/source

themes/browser/base/content/aboutDialog.js

@@ -2,23 +2,23 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
- "use strict";
+"use strict";
 
- /* import-globals-from aboutDialog-appUpdater.js */
+/* import-globals-from aboutDialog-appUpdater.js */
 
- // Services = object with smart getters for common XPCOM services
- var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
- var { AppConstants } = ChromeUtils.import(
+// Services = object with smart getters for common XPCOM services
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
- );
- if (AppConstants.MOZ_UPDATER) {
+);
+if (AppConstants.MOZ_UPDATER) {
   Services.scriptloader.loadSubScript(
     "chrome://browser/content/aboutDialog-appUpdater.js",
     this
   );
- }
+}
 
- async function init(aEvent) {
+async function init(aEvent) {
   if (aEvent.target != document) {
     return;
   }
@@ -76,42 +76,6 @@
 
   await document.l10n.translateElements([versionField]);
 
-   // Show a release notes link if we have a URL.
-   let relNotesLink = document.getElementById("releasenotes");
-   let relNotesPrefType = Services.prefs.getPrefType(
-     "app.releaseNotesURL.aboutDialog"
-   );
-   if (relNotesPrefType != Services.prefs.PREF_INVALID) {
-     let relNotesURL = Services.urlFormatter.formatURLPref(
-       "app.releaseNotesURL.aboutDialog"
-     );
-     if (relNotesURL != "about:blank") {
-       relNotesLink.href = relNotesURL;
-       relNotesLink.hidden = false;
-     }
-   }
- 
-   if (AppConstants.MOZ_UPDATER) {
-     gAppUpdater = new appUpdater({ buttonAutoFocus: true });
- 
-     let channelLabel = document.getElementById("currentChannel");
-     let currentChannelText = document.getElementById("currentChannelText");
-     channelLabel.value = UpdateUtils.UpdateChannel;
-     let hasWinPackageId = false;
-     try {
-       hasWinPackageId = Services.sysinfo.getProperty("hasWinPackageId");
-     } catch (_ex) {
-       // The hasWinPackageId property doesn't exist; assume it should be false.
-     }
-     if (/^release($|\-)/.test(channelLabel.value) || hasWinPackageId) {
-       currentChannelText.hidden = true;
-     }
-   }
- 
-   if (AppConstants.IS_ESR) {
-     document.getElementById("release").hidden = false;
-   }
- 
   window.sizeToContent();
 
   if (AppConstants.platform == "macosx") {
@@ -120,5 +84,4 @@
       screen.availHeight / 5
     );
   }
- }
- 
+}

themes/browser/base/content/aboutDialog.xhtml

@@ -6,7 +6,6 @@
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

themes/browser/branding/librewolf/content/jar.mn

@@ -12,3 +12,5 @@ browser.jar:
   content/branding/logo.svg
   content/branding/identity-icons-brand.svg
   content/branding/horizontal-lockup.svg
+  content/branding/about-logo.png                (../empty.png)
+  content/branding/firefox-wordmark.svg          (../empty.svg)

themes/browser/branding/librewolf/empty.svg

@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 0 1 1" xmlns="http://www.w3.org/2000/svg"></svg>