Skip to content

Zen library #7550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
+73 −323
Draft

Zen library #7550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee063a1
Refactor Zen components: remove zen-rices, add zen-library, and updat…
mauro-balades Apr 12, 2025
92d1c06
Refactor ZenLibrary: remove unnecessary whitespace, move toggle metho…
mauro-balades Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion l10n
Open in desktop
Submodule l10n updated 2 files
+0 −32 en-US/browser/browser/zen-general.ftl
+3 −0 en-US/browser/browser/zen-vertical-tabs.ftl
16 changes: 7 additions & 9 deletions src/browser/base/content/browser-xhtml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00adec9807 100644
index 0d0a559a6473149b50f4bf18d059e86907c4acd3..7f271dacadaabc569cedd437ee4b3dc52900100b 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -26,6 +26,7 @@
Expand Down Expand Up @@ -27,18 +27,16 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00
</head>
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
# All sets except for popupsets (commands, keys, and stringbundles)
@@ -169,9 +173,11 @@
@@ -169,9 +173,12 @@
</vbox>
</html:template>

-#include navigator-toolbox.inc.xhtml
-
-#include browser-box.inc.xhtml
+ <hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode">
+ <vbox id="zen-toast-container"></vbox>
+ #include navigator-toolbox.inc.xhtml
+ #include browser-box.inc.xhtml
+ </hbox>
+#include zen-app-wrapper-content.inc.xhtml
#include navigator-toolbox.inc.xhtml

#include browser-box.inc.xhtml
+ </hbox> <!-- zen-main-app-wrapper -->

<html:template id="customizationPanel">
<box id="customization-container" flex="1" hidden="true"><![CDATA[
2 changes: 2 additions & 0 deletions src/browser/base/content/zen-app-wrapper-content.inc.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<vbox id="zen-toast-container"></vbox>
#include zen-library.inc.xhtml
5 changes: 1 addition & 4 deletions src/browser/base/content/zen-assets.inc.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-tabs.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-ui.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-gradient-generator.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-rices.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-panel-ui.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-single-components.css" />
<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-container.css" />
Expand Down Expand Up @@ -43,7 +42,5 @@ Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/Zen
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenGlanceManager.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenMediaController.mjs", this);

// Unimportant scripts
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenRices.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenLibrary.mjs", this);
</script>
3 changes: 1 addition & 2 deletions src/browser/base/content/zen-assets.jar.inc.mn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
content/browser/zen-components/ZenGlanceManager.mjs (zen-components/ZenGlanceManager.mjs)
content/browser/zen-components/ZenFolders.mjs (zen-components/ZenFolders.mjs)
content/browser/zen-components/ZenActorsManager.mjs (zen-components/ZenActorsManager.mjs)
content/browser/zen-components/ZenRices.mjs (zen-components/ZenRices.mjs)
content/browser/zen-components/ZenEmojies.mjs (zen-components/ZenEmojies.mjs)
content/browser/zen-components/ZenWelcome.mjs (zen-components/ZenWelcome.mjs)
content/browser/zen-components/ZenLibrary.mjs (zen-components/ZenLibrary.mjs)
content/browser/zen-components/ZenMediaController.mjs (zen-components/ZenMediaController.mjs)

content/browser/zen-styles/zen-theme.css (content/zen-styles/zen-theme.css)
Expand All @@ -46,7 +46,6 @@
content/browser/zen-styles/zen-urlbar.css (content/zen-styles/zen-urlbar.css)
content/browser/zen-styles/zen-popup.css (content/zen-styles/zen-popup.css)
content/browser/zen-styles/zen-gradient-generator.css (content/zen-styles/zen-gradient-generator.css)
content/browser/zen-styles/zen-rices.css (content/zen-styles/zen-rices.css)
content/browser/zen-styles/zen-branding.css (content/zen-styles/zen-branding.css)
content/browser/zen-styles/zen-welcome.css (content/zen-styles/zen-welcome.css)
content/browser/zen-styles/zen-media-controls.css (content/zen-styles/zen-media-controls.css)
Expand Down
6 changes: 6 additions & 0 deletions src/browser/base/content/zen-library.inc.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<hbox id="zen-library">
<vbox id="zen-library-sidebar">
</vbox>
<vbox id="zen-library-content">
</vbox>
</hbox>
76 changes: 0 additions & 76 deletions src/browser/base/content/zen-styles/zen-animations.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,82 +221,6 @@
}
}

@keyframes zen-rice-form-out {
0% {
transform: translateX(0);
max-height: 350px;
opacity: 1;
position: relative;
}

50% {
transform: translateX(-100%);
opacity: 0;
position: relative;
}

99% {
transform: translateX(-100%);
opacity: 0;
max-height: 15px;
position: relative;
}

100% {
transform: translateX(-100%);
opacity: 0;
pointer-events: none;
position: absolute;
}
}

@keyframes zen-rice-form-in {
0% {
position: absolute;
transform: translateX(100%);
opacity: 0;
}

99% {
position: absolute;
transform: translateX(0);
opacity: 1;
}

100% {
position: relative;
}
}

@keyframes zen-rice-form-in-2 {
from {
opacity: 0;
transform: translateX(100%);
max-height: 50px;
}

to {
opacity: 1;
transform: translateX(0);
max-height: 450px;
}
}

@keyframes zen-rice-submit-animation {
/* Scale and shake the dialog */
0% {
transform: scale(1);
}

50% {
transform: scale(1.1);
}

100% {
transform: scale(1);
}
}

@keyframes zen-back-and-forth-text {
0%,
10% {
Expand Down
226 changes: 0 additions & 226 deletions src/browser/base/content/zen-styles/zen-rices.css
View file
Open in desktop

This file was deleted.

Loading