chore: Update firefox version to 126.0.0

This commit is contained in:
Mauro Balades
2024-05-16 19:52:09 +02:00
parent 79910d0158
commit a52e38de44
15 changed files with 51 additions and 68 deletions

View File

@@ -1,5 +1,5 @@
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
index e0fcce367abe57e03e54779437facbba4326687b..70ef3cf15e9384f05e76d0768efb07872d4b69cf 100644
index 55de24241514d11f6a174dd97ca37c8a4a99b8af..1459c91ff11429788e103d385f1598b6275592c8 100644
--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
@@ -36,6 +36,7 @@
@@ -20,7 +20,7 @@ index e0fcce367abe57e03e54779437facbba4326687b..70ef3cf15e9384f05e76d0768efb0787
</description>
+#if 0
<description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
<label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"/>
<label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
<label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
</description>
+#endif

View File

@@ -1,12 +1,13 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..b40fee5724a60171a8fa8849e6c778d2a17980f7 100644
index 41258d81bbd2549a2d80cb7df9a9d65aa73a46f1..75bb0897710a478257d38c55c7fb0efb5aedd777 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
@@ -2,27 +2,19 @@
@@ -2,28 +2,17 @@
# 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/.
-<hbox flex="1" id="browser">
- <html:sidebar-launcher id="sidebar-launcher" flex="1" hidden="true"></html:sidebar-launcher>
- <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
- <box id="sidebar-header" align="center">
- <toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
@@ -23,9 +24,7 @@ index d445abe7e743b2ec5d46d42f8f149c000e3c7997..b40fee5724a60171a8fa8849e6c778d2
- <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+<vbox id="browser">
<vbox id="appcontent" flex="1">
+
+ <html:div id="zen-appcontent-navbar-container"></html:div>
+
<!-- gNotificationBox will be added here lazily. -->
- <tabbox id="tabbrowser-tabbox"
+ <hbox id="zen-tabbox-wrapper" flex="1">

View File

@@ -1,12 +0,0 @@
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
index ea6457a5c42f7bd2e002bd9234b8eb9bd23bbcc0..9a7b75481fc0968c295bae9ca46ac5da4aec96dc 100644
--- a/browser/base/content/browser-sidebar.js
+++ b/browser/base/content/browser-sidebar.js
@@ -305,6 +305,7 @@ var SidebarUI = {
this._box.setAttribute("positionend", true);
} else {
this._box.removeAttribute("positionend");
+ this._box.style.order = 0;
}
this.hideSwitcherPanel();

View File

@@ -1,3 +1,4 @@
<html:sidebar-launcher id="sidebar-launcher" flex="1" hidden="true"></html:sidebar-launcher>
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
<box id="sidebar-header" align="center">
<toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">