mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-25 16:01:34 +00:00
gh-9649: Start cross-compiling macos builds from linux (gh-14978)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
|
||||
index f6e1391baf12abb91c85a95107bb3923118746c0..cac04aa288e8a305d0c8b28e0c919abce87658e5 100644
|
||||
index a2fb4433c7044e7f5681d5762285314fa3e00a5c..dac1e79e86c534247a470ae062e59f7e7cba6e38 100644
|
||||
--- a/browser/base/content/aboutDialog.js
|
||||
+++ b/browser/base/content/aboutDialog.js
|
||||
@@ -52,7 +52,7 @@ function init() {
|
||||
@@ -58,7 +58,7 @@ function init() {
|
||||
]);
|
||||
let versionIdKey = "base";
|
||||
let versionAttributes = {
|
||||
@@ -11,7 +11,7 @@ index f6e1391baf12abb91c85a95107bb3923118746c0..cac04aa288e8a305d0c8b28e0c919abc
|
||||
};
|
||||
|
||||
let arch = Services.sysinfo.get("arch");
|
||||
@@ -64,7 +64,7 @@ function init() {
|
||||
@@ -70,7 +70,7 @@ function init() {
|
||||
}
|
||||
|
||||
let version = Services.appinfo.version;
|
||||
@@ -20,7 +20,7 @@ index f6e1391baf12abb91c85a95107bb3923118746c0..cac04aa288e8a305d0c8b28e0c919abc
|
||||
versionIdKey += "-nightly";
|
||||
let buildID = Services.appinfo.appBuildID;
|
||||
let year = buildID.slice(0, 4);
|
||||
@@ -125,14 +125,6 @@ function init() {
|
||||
@@ -158,14 +158,6 @@ function init() {
|
||||
window.close();
|
||||
});
|
||||
if (AppConstants.MOZ_UPDATER) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
|
||||
index 067eaf8d4e23f76a2423d01a1d9fa71d9ef3c65f..7a831c8ee2b73bb89bf8a82ac24958b55c16a5aa 100644
|
||||
index 067eaf8d4e23f76a2423d01a1d9fa71d9ef3c65f..e0badae05d1da7e6de43e1d517539d4b09ec90f5 100644
|
||||
--- a/browser/base/content/aboutDialog.xhtml
|
||||
+++ b/browser/base/content/aboutDialog.xhtml
|
||||
@@ -102,10 +102,6 @@
|
||||
@@ -13,7 +13,7 @@ index 067eaf8d4e23f76a2423d01a1d9fa71d9ef3c65f..7a831c8ee2b73bb89bf8a82ac24958b5
|
||||
</vbox>
|
||||
#endif
|
||||
</hbox>
|
||||
@@ -120,32 +116,22 @@
|
||||
@@ -120,12 +116,12 @@
|
||||
<vbox id="experimental" hidden="true">
|
||||
<description class="text-blurb" id="warningDesc" data-l10n-id="warningDesc-version"></description>
|
||||
<description class="text-blurb" id="communityExperimentalDesc" data-l10n-id="community-exp">
|
||||
@@ -27,19 +27,8 @@ index 067eaf8d4e23f76a2423d01a1d9fa71d9ef3c65f..7a831c8ee2b73bb89bf8a82ac24958b5
|
||||
+ <label is="text-link" href="https://github.com/zen-browser/desktop" data-l10n-name="community-mozillaLink"/>
|
||||
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
|
||||
</description>
|
||||
- <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
|
||||
- <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&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
|
||||
- </description>
|
||||
- <description class="text-blurb" id="contributeDescReferrals" data-l10n-id="helpus-referrals" hidden="true">
|
||||
- <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
|
||||
- <label is="text-link" useoriginprincipal="true" href="about:referrals" data-l10n-name="helpus-shareFirefoxLink"/>
|
||||
- <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
|
||||
- </description>
|
||||
-
|
||||
</vbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
|
||||
@@ -144,8 +140,8 @@
|
||||
<vbox id="bottomBox">
|
||||
<hbox pack="center">
|
||||
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
|
||||
|
||||
@@ -1398,7 +1398,8 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
|
||||
const tabIndexToUse = Math.max(0, initialIndex);
|
||||
return this.#withoutSplitViewTransition(() => {
|
||||
// TODO: Add support for splitting essential tabs
|
||||
tabs = tabs.filter(t => !t.hidden && !t.hasAttribute("zen-empty-tab"))
|
||||
tabs = tabs
|
||||
.filter(t => !t.hidden && !t.hasAttribute("zen-empty-tab"))
|
||||
// use glance parent tab instead of glance tab
|
||||
.map(t => gZenGlanceManager.getTabOrGlanceParent(t))
|
||||
// remove duplicates
|
||||
|
||||
@@ -1138,7 +1138,7 @@
|
||||
min-width: calc(100% + var(--zen-toolbox-padding) * 2);
|
||||
width: calc(100% + var(--zen-toolbox-padding) * 2);
|
||||
padding: 0 var(--zen-toolbox-padding);
|
||||
display: grid;
|
||||
display: grid !important; /* Override the hidden attribute */
|
||||
|
||||
position: absolute;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user