mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-17 07:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(workspaces): allow users to edit existing workspaces

Browse Source
This commit is contained in:
Katelyn Dickey
2024-08-25 12:25:36 -04:00
parent d3a9ec4b3c
commit 7d55d670ee
5 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10n

Submodule l10n updated: 32ef114c44...5ef2ab9fd5

2
src/browser/base/content/zen-components

Submodule src/browser/base/content/zen-components updated: ca6aeb1c3a...0b7a125130

27
src/browser/base/content/zen-popupset.inc.xhtml
View File

@@ -78,7 +78,7 @@
<panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left"> <panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
<panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view"> <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
<panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true"> <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
<vbox> <vbox>
<hbox> <hbox>
<h3 data-l10n-id="zen-panel-ui-current-window-text"></h3> <h3 data-l10n-id="zen-panel-ui-current-window-text"></h3>
@@ -98,19 +98,19 @@
</html:div> </html:div>
</vbox> </vbox>
</panelview> </panelview>
<panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true"> <panelview id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
<vbox> <vbox>
<h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1> <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
<html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceNameChange(this);" /> <html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceCreationNameChange(this);" />
</vbox> </vbox>
<html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer"> <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
<button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" oncommand="ZenWorkspaces.saveWorkspaceFromInput();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save"> <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" oncommand="ZenWorkspaces.saveWorkspaceFromInput();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
</button> </button>
<button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel"> <button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
</button> </button>
</html:moz-button-group> </html:moz-button-group>
</panelview> </panelview>
<panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create-icons" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true"> <panelview id="PanelUI-zen-workspaces-create-icons" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
<vbox> <vbox>
<h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1> <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
<hbox id="PanelUI-zen-workspaces-create-icons-container"> <hbox id="PanelUI-zen-workspaces-create-icons-container">
@@ -119,7 +119,21 @@
<html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer"> <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
<button default="true" slot="primary" id="PanelUI-zen-workspaces-create-save-icons" oncommand="ZenWorkspaces.saveWorkspaceFromIcon();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save"> <button default="true" slot="primary" id="PanelUI-zen-workspaces-create-save-icons" oncommand="ZenWorkspaces.saveWorkspaceFromIcon();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
</button> </button>
<button id="PanelUI-zen-workspaces-create-cancel-icons" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel"> <button id="PanelUI-zen-workspaces-create-cancel-icons" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
</button>
</html:moz-button-group>
</panelview>
<panelview id="PanelUI-zen-workspaces-edit" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
<vbox>
<h1 data-l10n-id="zen-panel-ui-workspaces-edit-text"></h1>
<html:input autofocus="true" id="PanelUI-zen-workspaces-edit-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceEditChange();" />
<hbox id="PanelUI-zen-workspaces-edit-icons-container">
</hbox>
</vbox>
<html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-edit-footer">
<button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-edit-save" oncommand="ZenWorkspaces.saveWorkspaceFromEdit();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-save">
</button>
<button id="PanelUI-zen-workspaces-edit-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-cancel">
</button> </button>
</html:moz-button-group> </html:moz-button-group>
</panelview> </panelview>
@@ -132,5 +146,6 @@
<menuitem id="context_zenOpenWorkspace" oncommand="ZenWorkspaces.openWorkspace();" data-l10n-id="zen-workspaces-panel-context-open"/> <menuitem id="context_zenOpenWorkspace" oncommand="ZenWorkspaces.openWorkspace();" data-l10n-id="zen-workspaces-panel-context-open"/>
<menuseparator/> <menuseparator/>
<menuitem id="context_zenSetAsDefaultWorkspace" oncommand="ZenWorkspaces.setDefaultWorkspace();" data-l10n-id="zen-workspaces-panel-context-set-default"/> <menuitem id="context_zenSetAsDefaultWorkspace" oncommand="ZenWorkspaces.setDefaultWorkspace();" data-l10n-id="zen-workspaces-panel-context-set-default"/>
<menuitem id="context_zenEditWorkspace" oncommand="ZenWorkspaces.contextEdit(event);" data-l10n-id="zen-workspaces-panel-context-edit"/>
<menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/> <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/>
</menupopup> </menupopup>

30
src/browser/base/content/zen-styles/zen-workspaces.css
View File

@@ -62,11 +62,13 @@
min-height: 150px; min-height: 150px;
} }
#PanelUI-zen-workspaces-create-input { #PanelUI-zen-workspaces-create-input,
#PanelUI-zen-workspaces-edit-input {
margin-top: 10px; margin-top: 10px;
} }
#PanelUI-zen-workspaces-create-icons-container toolbarbutton { #PanelUI-zen-workspaces-create-icons-container toolbarbutton,
#PanelUI-zen-workspaces-edit-icons-container toolbarbutton {
width: 30px; width: 30px;
height: 30px; height: 30px;
display: flex; display: flex;
@@ -76,24 +78,32 @@
border-radius: 7px; border-radius: 7px;
} }
#PanelUI-zen-workspaces-create-icons-container toolbarbutton[selected="true"] { #PanelUI-zen-workspaces-create-icons-container toolbarbutton[selected="true"],
#PanelUI-zen-workspaces-edit-icons-container toolbarbutton[selected="true"] {
border-color: var(--zen-colors-secondary); border-color: var(--zen-colors-secondary);
} }
#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-icon { #PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-icon,
#PanelUI-zen-workspaces-edit-icons-container toolbarbutton .toolbarbutton-icon {
display: none; display: none;
} }
#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-text { #PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-text,
#PanelUI-zen-workspaces-edit-icons-container toolbarbutton .toolbarbutton-text {
min-width: unset; min-width: unset;
} }
#PanelUI-zen-workspaces-create-icons-container { #PanelUI-zen-workspaces-create-icons-container,
#PanelUI-zen-workspaces-edit-icons-container {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(30px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(30px, 1fr));
gap: 8px; gap: 8px;
} }
#PanelUI-zen-workspaces-edit-icons-container toolbarbutton.toolbarbutton-1 {
margin-top: 10px;
}
#PanelUI-zen-workspaces-list { #PanelUI-zen-workspaces-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -177,14 +187,16 @@
height: 20px; height: 20px;
} }
#PanelUI-zen-workspaces-create-footer { #PanelUI-zen-workspaces-create-footer,
#PanelUI-zen-workspaces-edit-footer {
padding-bottom: 0 !important; padding-bottom: 0 !important;
margin-top: 20px; margin-top: 10px;
margin-left: 0; margin-left: 0;
margin-bottom: 0 !important; margin-bottom: 0 !important;
width: 100%; width: 100%;
} }
#PanelUI-zen-workspaces-create-footer button[default="true"] { #PanelUI-zen-workspaces-create-footer button[default="true"],
#PanelUI-zen-workspaces-edit-footer button[default="true"] {
width: 100%; width: 100%;
} }

4
src/browser/themes/shared/zen-icons/icons.css
View File

@@ -160,6 +160,10 @@
--menu-image: url("bookmark-hollow.svg") !important; --menu-image: url("bookmark-hollow.svg") !important;
} }
#context_zenEditWorkspace {
--menu-image: url("edit.svg") !important;
}
#add-ons-button, #add-ons-button,
#appMenu-extensions-themes-button, #appMenu-extensions-themes-button,
#unified-extensions-button { #unified-extensions-button {