mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-15 22:36:23 +00:00
Refactor CSS styles for URL bar, popups, and compact mode; add grainy background effect and adjust toast animation timing
This commit is contained in:
@@ -246,7 +246,7 @@ var gZenUIManager = {
|
|||||||
const toast = this._createToastElement(messageId, options);
|
const toast = this._createToastElement(messageId, options);
|
||||||
this._toastContainer.removeAttribute('hidden');
|
this._toastContainer.removeAttribute('hidden');
|
||||||
this._toastContainer.appendChild(toast);
|
this._toastContainer.appendChild(toast);
|
||||||
await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', bounce: 0.4 });
|
await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', bounce: 0.5, duration: 0.5 });
|
||||||
await new Promise((resolve) => setTimeout(resolve, 3000));
|
await new Promise((resolve) => setTimeout(resolve, 3000));
|
||||||
await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
|
await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
|
||||||
const toastHeight = toast.getBoundingClientRect().height;
|
const toastHeight = toast.getBoundingClientRect().height;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
|
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae402a465de 100644
|
index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1c0d9968c 100644
|
||||||
--- a/browser/base/content/navigator-toolbox.inc.xhtml
|
--- a/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
|
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
@@ -2,7 +2,7 @@
|
@@ -2,7 +2,7 @@
|
||||||
@@ -11,16 +11,20 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<script src="chrome://browser/content/navigator-toolbox.js" />
|
<script src="chrome://browser/content/navigator-toolbox.js" />
|
||||||
|
|
||||||
<!-- Menu -->
|
<!-- Menu -->
|
||||||
@@ -19,7 +19,7 @@
|
@@ -17,9 +17,11 @@
|
||||||
|
#include browser-menubar.inc
|
||||||
|
</toolbaritem>
|
||||||
<spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
|
<spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
|
||||||
|
+#if 0
|
||||||
#include titlebar-items.inc.xhtml
|
#include titlebar-items.inc.xhtml
|
||||||
|
+#endif
|
||||||
</toolbar>
|
</toolbar>
|
||||||
-
|
-
|
||||||
+<hbox id="titlebar">
|
+<hbox id="titlebar">
|
||||||
<toolbar id="TabsToolbar"
|
<toolbar id="TabsToolbar"
|
||||||
class="browser-toolbar browser-titlebar"
|
class="browser-toolbar browser-titlebar"
|
||||||
fullscreentoolbar="true"
|
fullscreentoolbar="true"
|
||||||
@@ -32,7 +32,7 @@
|
@@ -32,7 +34,7 @@
|
||||||
|
|
||||||
<hbox class="titlebar-spacer" type="pre-tabs"/>
|
<hbox class="titlebar-spacer" type="pre-tabs"/>
|
||||||
|
|
||||||
@@ -29,7 +33,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<toolbartabstop/>
|
<toolbartabstop/>
|
||||||
<hbox id="TabsToolbar-customization-target" flex="1">
|
<hbox id="TabsToolbar-customization-target" flex="1">
|
||||||
<toolbarbutton id="firefox-view-button"
|
<toolbarbutton id="firefox-view-button"
|
||||||
@@ -40,9 +40,9 @@
|
@@ -40,9 +42,9 @@
|
||||||
data-l10n-id="toolbar-button-firefox-view-2"
|
data-l10n-id="toolbar-button-firefox-view-2"
|
||||||
role="button"
|
role="button"
|
||||||
aria-pressed="false"
|
aria-pressed="false"
|
||||||
@@ -40,7 +44,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<tabs id="tabbrowser-tabs"
|
<tabs id="tabbrowser-tabs"
|
||||||
is="tabbrowser-tabs"
|
is="tabbrowser-tabs"
|
||||||
aria-multiselectable="true"
|
aria-multiselectable="true"
|
||||||
@@ -50,6 +50,10 @@
|
@@ -50,6 +52,10 @@
|
||||||
tooltip="tabbrowser-tab-tooltip"
|
tooltip="tabbrowser-tab-tooltip"
|
||||||
orient="horizontal"
|
orient="horizontal"
|
||||||
stopwatchid="FX_TAB_CLICK_MS">
|
stopwatchid="FX_TAB_CLICK_MS">
|
||||||
@@ -51,7 +55,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<hbox class="tab-drop-indicator" hidden="true"/>
|
<hbox class="tab-drop-indicator" hidden="true"/>
|
||||||
# If the name (tabbrowser-arrowscrollbox) or structure of this changes
|
# If the name (tabbrowser-arrowscrollbox) or structure of this changes
|
||||||
# significantly, there is an optimization in
|
# significantly, there is an optimization in
|
||||||
@@ -57,7 +61,7 @@
|
@@ -57,7 +63,7 @@
|
||||||
# the current structure that we may want to revisit.
|
# the current structure that we may want to revisit.
|
||||||
<html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
|
<html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
|
||||||
<html:div id="vertical-pinned-tabs-container-separator"></html:div>
|
<html:div id="vertical-pinned-tabs-container-separator"></html:div>
|
||||||
@@ -60,7 +64,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
|
<tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
|
||||||
<hbox id="tabbrowser-arrowscrollbox-periphery">
|
<hbox id="tabbrowser-arrowscrollbox-periphery">
|
||||||
<toolbartabstop/>
|
<toolbartabstop/>
|
||||||
@@ -75,6 +79,8 @@
|
@@ -75,6 +81,8 @@
|
||||||
tooltip="dynamic-shortcut-tooltip"
|
tooltip="dynamic-shortcut-tooltip"
|
||||||
data-l10n-id="tabs-toolbar-new-tab"/>
|
data-l10n-id="tabs-toolbar-new-tab"/>
|
||||||
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
|
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
|
||||||
@@ -69,12 +73,12 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
</tabs>
|
</tabs>
|
||||||
|
|
||||||
<toolbarbutton id="new-tab-button"
|
<toolbarbutton id="new-tab-button"
|
||||||
@@ -100,11 +106,12 @@
|
@@ -100,11 +108,12 @@
|
||||||
#include private-browsing-indicator.inc.xhtml
|
#include private-browsing-indicator.inc.xhtml
|
||||||
<toolbarbutton id="content-analysis-indicator"
|
<toolbarbutton id="content-analysis-indicator"
|
||||||
class="toolbarbutton-1 content-analysis-indicator-icon"/>
|
class="toolbarbutton-1 content-analysis-indicator-icon"/>
|
||||||
-
|
-
|
||||||
+ #if 0
|
+#if 0
|
||||||
#include titlebar-items.inc.xhtml
|
#include titlebar-items.inc.xhtml
|
||||||
-
|
-
|
||||||
+#endif
|
+#endif
|
||||||
@@ -85,7 +89,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae4
|
|||||||
<toolbar id="nav-bar"
|
<toolbar id="nav-bar"
|
||||||
class="browser-toolbar chromeclass-location"
|
class="browser-toolbar chromeclass-location"
|
||||||
data-l10n-id="navbar-accessible"
|
data-l10n-id="navbar-accessible"
|
||||||
@@ -490,10 +497,12 @@
|
@@ -490,10 +499,12 @@
|
||||||
consumeanchor="PanelUI-button"
|
consumeanchor="PanelUI-button"
|
||||||
data-l10n-id="appmenu-menu-button-closed2"/>
|
data-l10n-id="appmenu-menu-button-closed2"/>
|
||||||
</toolbaritem>
|
</toolbaritem>
|
||||||
|
@@ -62,6 +62,7 @@
|
|||||||
content/browser/zen-images/layouts/collapsed.png (content/zen-images/layouts/collapsed.png)
|
content/browser/zen-images/layouts/collapsed.png (content/zen-images/layouts/collapsed.png)
|
||||||
content/browser/zen-images/layouts/multiple-toolbar.png (content/zen-images/layouts/multiple-toolbar.png)
|
content/browser/zen-images/layouts/multiple-toolbar.png (content/zen-images/layouts/multiple-toolbar.png)
|
||||||
content/browser/zen-images/layouts/single-toolbar.png (content/zen-images/layouts/single-toolbar.png)
|
content/browser/zen-images/layouts/single-toolbar.png (content/zen-images/layouts/single-toolbar.png)
|
||||||
|
content/browser/zen-images/grain-bg.png (content/zen-images/grain-bg.png)
|
||||||
|
|
||||||
# Actors
|
# Actors
|
||||||
content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (zen-components/actors/ZenThemeMarketplaceParent.sys.mjs)
|
content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (zen-components/actors/ZenThemeMarketplaceParent.sys.mjs)
|
||||||
|
BIN
src/browser/base/content/zen-images/grain-bg.png
Normal file
BIN
src/browser/base/content/zen-images/grain-bg.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
File diff suppressed because one or more lines are too long
@@ -120,6 +120,20 @@
|
|||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
background-image: url(chrome://browser/content/zen-images/grain-bg.png);
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 0;
|
||||||
|
opacity: var(--zen-grainy-background-opacity, 0);
|
||||||
|
mix-blend-mode: overlay;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox:hover,
|
#navigator-toolbox:hover,
|
||||||
|
@@ -358,6 +358,8 @@ menuitem {
|
|||||||
right: calc(var(--zen-element-separation) * 2);
|
right: calc(var(--zen-element-separation) * 2);
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: end;
|
||||||
|
|
||||||
& .zen-toast {
|
& .zen-toast {
|
||||||
padding: 0.9rem 0.8rem;
|
padding: 0.9rem 0.8rem;
|
||||||
@@ -366,6 +368,7 @@ menuitem {
|
|||||||
color: var(--button-primary-color);
|
color: var(--button-primary-color);
|
||||||
box-shadow: var(--zen-big-shadow);
|
box-shadow: var(--zen-big-shadow);
|
||||||
display: flex;
|
display: flex;
|
||||||
|
font-weight: 600;
|
||||||
gap: 5px;
|
gap: 5px;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 2px;
|
gap: 2px;
|
||||||
|
@@ -71,10 +71,6 @@
|
|||||||
padding-inline-start: 8px !important;
|
padding-inline-start: 8px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#identity-box.chromeUI:not([pageproxystate='invalid']) #identity-icon-box {
|
|
||||||
margin-right: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#urlbar:not([extend='true']) #identity-box #identity-icon-box {
|
#urlbar:not([extend='true']) #identity-box #identity-icon-box {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user