mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 21:49:58 +02:00
fix: Fixed about dialog and compact mode on twilight, b=no-bug, c=common, compact-mode, workspaces
This commit is contained in:
parent
ed5740c24d
commit
2a701bd2b9
5 changed files with 13 additions and 14 deletions
|
@ -1,5 +1,5 @@
|
||||||
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
|
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
|
||||||
index c64980810570fcea84e33fdc2d66ac42a79f4e46..11fe00e84dbac781b3da90abb1251c70bd3b094a 100644
|
index c64980810570fcea84e33fdc2d66ac42a79f4e46..aa629ebb38a9aa74048fe3fc759f716fad57d6f3 100644
|
||||||
--- a/browser/base/content/aboutDialog.xhtml
|
--- a/browser/base/content/aboutDialog.xhtml
|
||||||
+++ b/browser/base/content/aboutDialog.xhtml
|
+++ b/browser/base/content/aboutDialog.xhtml
|
||||||
@@ -102,10 +102,6 @@
|
@@ -102,10 +102,6 @@
|
||||||
|
@ -13,7 +13,13 @@ index c64980810570fcea84e33fdc2d66ac42a79f4e46..11fe00e84dbac781b3da90abb1251c70
|
||||||
</vbox>
|
</vbox>
|
||||||
#endif
|
#endif
|
||||||
</hbox>
|
</hbox>
|
||||||
@@ -125,21 +121,17 @@
|
@@ -120,26 +116,22 @@
|
||||||
|
<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">
|
||||||
|
- <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-name="community-exp-mozillaLink"/>
|
||||||
|
+ <label is="text-link" href="https://zen-browser.app/about" data-l10n-name="community-exp-mozillaLink"/>
|
||||||
|
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
|
||||||
</description>
|
</description>
|
||||||
</vbox>
|
</vbox>
|
||||||
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
|
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
|
||||||
|
|
|
@ -117,8 +117,8 @@
|
||||||
--zen-button-padding: 0.6rem 1.2rem;
|
--zen-button-padding: 0.6rem 1.2rem;
|
||||||
|
|
||||||
--zen-toolbar-element-bg: light-dark(
|
--zen-toolbar-element-bg: light-dark(
|
||||||
color-mix(in srgb, currentColor 10%, transparent 90%),
|
color-mix(in srgb, var(--toolbox-textcolor) 10%, transparent 90%),
|
||||||
color-mix(in srgb, currentColor 15%, transparent 85%)
|
color-mix(in srgb, var(--toolbox-textcolor) 15%, transparent 85%)
|
||||||
);
|
);
|
||||||
|
|
||||||
/* Toolbar */
|
/* Toolbar */
|
||||||
|
|
|
@ -185,15 +185,7 @@
|
||||||
#navigator-toolbox:has(.tabbrowser-tab:active),
|
#navigator-toolbox:has(.tabbrowser-tab:active),
|
||||||
&[zen-renaming-tab='true'] #navigator-toolbox,
|
&[zen-renaming-tab='true'] #navigator-toolbox,
|
||||||
#navigator-toolbox:has(
|
#navigator-toolbox:has(
|
||||||
*:is(
|
*:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)
|
||||||
[panelopen='true'],
|
|
||||||
[open='true'],
|
|
||||||
#urlbar:focus-within,
|
|
||||||
[breakout-extend='true']
|
|
||||||
)
|
|
||||||
:not(#urlbar[zen-floating-urlbar='true'])
|
|
||||||
:not(tab)
|
|
||||||
:not(.zen-compact-mode-ignore)
|
|
||||||
) {
|
) {
|
||||||
&:not([animate='true']) {
|
&:not([animate='true']) {
|
||||||
--zen-compact-mode-func: linear(
|
--zen-compact-mode-func: linear(
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
} else {
|
} else {
|
||||||
this.insertBefore(draggedTab, tab.nextSibling);
|
this.insertBefore(draggedTab, tab.nextSibling);
|
||||||
}
|
}
|
||||||
|
Services.zen.playHapticFeedback();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -711,7 +711,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
||||||
document.getElementById('zen-sidebar-splitter').getBoundingClientRect().width * 2;
|
document.getElementById('zen-sidebar-splitter').getBoundingClientRect().width * 2;
|
||||||
let translateX = this._swipeState.lastDelta + delta;
|
let translateX = this._swipeState.lastDelta + delta;
|
||||||
// Add a force multiplier as we are translating the strip depending on how close to the edge we are
|
// Add a force multiplier as we are translating the strip depending on how close to the edge we are
|
||||||
let forceMultiplier = Math.min(1, 1 - Math.abs(translateX) / (stripWidth * 5)); // 4.5 instead of 4 to add a bit of a buffer
|
let forceMultiplier = Math.min(1, 1 - Math.abs(translateX) / (stripWidth * 4.5)); // 4.5 instead of 4 to add a bit of a buffer
|
||||||
if (forceMultiplier > 0.5) {
|
if (forceMultiplier > 0.5) {
|
||||||
translateX *= forceMultiplier;
|
translateX *= forceMultiplier;
|
||||||
this._swipeState.lastDelta = delta + (translateX - delta) * 0.5;
|
this._swipeState.lastDelta = delta + (translateX - delta) * 0.5;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue