diff --git a/gui/app/components/folder/space-sidebar.js b/gui/app/components/folder/space-sidebar.js index 6b672725..12574aad 100644 --- a/gui/app/components/folder/space-sidebar.js +++ b/gui/app/components/folder/space-sidebar.js @@ -17,6 +17,9 @@ import AuthMixin from '../../mixins/auth'; import Component from '@ember/component'; export default Component.extend(AuthMixin, { + tagName: 'div', + classNames: ['master-sidebar'], + router: service(), documentService: service('document'), folderService: service('folder'), diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index 6a55d2e3..e64b3fe6 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -1,7 +1,78 @@ -{{#layout/master-sidebar}} - + + +
+ {{#link-to "folder.index" folder.id folder.slug class="no-print"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=folder.name}} + {{/link-to}} +
+
+
+ {{document/document-toolbar + tab=tab + roles=roles + space=folder + spaces=folders + document=document + versions=versions + permissions=permissions + refresh=(action "refresh") + onSaveTemplate=(action "onSaveTemplate") + onSaveDocument=(action "onSaveDocument") + onDocumentDelete=(action "onDocumentDelete")}} +
+ + + + +
+
+ +
+ {{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}} + {{ui/ui-toolbar-icon icon=constants.Icon.Index color=constants.Color.Gray tooltip="Table of contents" + selected=(eq sidebarTab "toc") onClick=(action "onSidebarChange" "toc")}} + {{ui/ui-toolbar-icon icon=constants.Icon.Attachment color=constants.Color.Gray tooltip="Attachments" + selected=(eq sidebarTab "files") onClick=(action "onSidebarChange" "files")}} + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} + {{ui/ui-toolbar-icon icon=constants.Icon.Chat color=constants.Color.Gray tooltip="Comments & Feedback" + selected=(eq sidebarTab "feedback") onClick=(action "onSidebarChange" "feedback")}} + {{/if}} + {{/ui/ui-toolbar}} +
+
+ + + + {{#if (eq sidebarTab "toc")}} + {{document/sidebar-toc + page=page + roles=roles + pages=pages + folder=folder + document=document + permissions=permissions + currentPageId=currentPageId + onShowPage=(action "onShowPage") + onPageLevelChange=(action "onPageLevelChange") + onPageSequenceChange=(action "onPageSequenceChange")}} + {{/if}} + + {{#if (eq sidebarTab "files")}} + {{document/sidebar-attachment + document=document + permissions=permissions}} + {{/if}} + + {{#if (eq sidebarTab "feedback")}} + {{enterprise/sidebar-feedback + document=document + permissions=permissions}} + {{/if}} +
+ + + -
{{document/sidebar-meta roles=roles pages=pages @@ -13,125 +84,69 @@ contributionStatus=contributionStatus approvalStatus=approvalStatus}} - - -
- {{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}} - {{ui/ui-toolbar-icon icon=constants.Icon.Index color=constants.Color.Gray tooltip="Table of contents" - selected=(eq sidebarTab "toc") onClick=(action "onSidebarChange" "toc")}} - {{ui/ui-toolbar-icon icon=constants.Icon.Attachment color=constants.Color.Gray tooltip="Attachments" - selected=(eq sidebarTab "files") onClick=(action "onSidebarChange" "files")}} - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{ui/ui-toolbar-icon icon=constants.Icon.Chat color=constants.Color.Gray tooltip="Comments & Feedback" - selected=(eq sidebarTab "feedback") onClick=(action "onSidebarChange" "feedback")}} - {{/if}} - {{/ui/ui-toolbar}} -
-
- - - - {{#if (eq sidebarTab "toc")}} - {{document/sidebar-toc - page=page + {{document/document-meta + tab=tab roles=roles pages=pages - folder=folder + space=folder + spaces=folders document=document + versions=versions permissions=permissions - currentPageId=currentPageId - onShowPage=(action "onShowPage") - onPageLevelChange=(action "onPageLevelChange") - onPageSequenceChange=(action "onPageSequenceChange")}} - {{/if}} + contributionStatus=contributionStatus + approvalStatus=approvalStatus}} - {{#if (eq sidebarTab "files")}} - {{document/sidebar-attachment - document=document - permissions=permissions}} - {{/if}} - - {{#if (eq sidebarTab "feedback")}} - {{enterprise/sidebar-feedback - document=document - permissions=permissions}} - {{/if}} -{{/layout/master-sidebar}} - -{{#layout/master-content}} - {{document/document-toolbar - tab=tab - roles=roles - space=folder - spaces=folders - document=document - versions=versions - permissions=permissions - refresh=(action "refresh") - onSaveTemplate=(action "onSaveTemplate") - onSaveDocument=(action "onSaveDocument") - onDocumentDelete=(action "onDocumentDelete")}} - - {{document/document-meta - tab=tab - roles=roles - pages=pages - space=folder - spaces=folders - document=document - versions=versions - permissions=permissions - contributionStatus=contributionStatus - approvalStatus=approvalStatus}} - - {{#if contributionStatus}} - -
-
- {{contributionStatus}} -
-
- {{else}} - {{#if approvalStatus}} + {{#if contributionStatus}}
- {{approvalStatus}} + {{contributionStatus}}
+ {{else}} + {{#if approvalStatus}} + +
+
+ {{approvalStatus}} +
+
+ {{/if}} {{/if}} - {{/if}} - + -
-
-

{{document.name}}

-

{{document.excerpt}}

+
+
+

{{document.name}}

+

{{document.excerpt}}

+
-
- {{document/view-content - roles=roles - links=links - pages=pages - blocks=blocks - folder=folder - folders=folders - sections=sections - document=document - permissions=permissions - attachments=attachments - currentPageId=currentPageId - refresh=(action "refresh") - onSavePage=(action "onSavePage") - onCopyPage=(action "onCopyPage") - onMovePage=(action "onMovePage") - onDeletePage=(action "onPageDeleted") - onInsertSection=(action "onInsertSection") - onSavePageAsBlock=(action "onSavePageAsBlock") - onPageLevelChange=(action "onPageLevelChange") - onPageSequenceChange=(action "onPageSequenceChange") - onAttachmentUpload=(action "onAttachmentUpload") - onAttachmentDelete=(action "onAttachmentDelete")}} -{{/layout/master-content}} + {{document/view-content + roles=roles + links=links + pages=pages + blocks=blocks + folder=folder + folders=folders + sections=sections + document=document + permissions=permissions + attachments=attachments + currentPageId=currentPageId + refresh=(action "refresh") + onSavePage=(action "onSavePage") + onCopyPage=(action "onCopyPage") + onMovePage=(action "onMovePage") + onDeletePage=(action "onPageDeleted") + onInsertSection=(action "onInsertSection") + onSavePageAsBlock=(action "onSavePageAsBlock") + onPageLevelChange=(action "onPageLevelChange") + onPageSequenceChange=(action "onPageSequenceChange") + onAttachmentUpload=(action "onAttachmentUpload") + onAttachmentDelete=(action "onAttachmentDelete")}} + + + + diff --git a/gui/app/pods/document/revisions/template.hbs b/gui/app/pods/document/revisions/template.hbs index f196307b..44adb1b7 100644 --- a/gui/app/pods/document/revisions/template.hbs +++ b/gui/app/pods/document/revisions/template.hbs @@ -1,38 +1,46 @@ -{{#layout/master-sidebar}} - - -
+ + +
{{#link-to "document.index"}} - {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=document.name}} {{/link-to}} - - - -
REVISIONS
-
- {{#each revisions as |revision|}} -
- -
{{formatted-date revision.created}}
-
- {{/each}} -
-{{/layout/master-sidebar}} +
+
+ -{{#layout/master-content}} - {{layout/logo-heading - title="Content Revisions" - desc="Review previous content changes and roll back edits" - icon=constants.Icon.TimeBack}} + + +
+
+
REVISIONS
+
+ {{#each revisions as |revision|}} +
+ +
{{formatted-date revision.created}}
+
+ {{/each}} +
+
+
+ + + + {{layout/logo-heading + title="Content Revisions" + desc="Review previous content changes and roll back edits" + icon=constants.Icon.TimeBack}} + + {{document/view-revision + pages=pages + folder=folder + document=document + permissions=permissions + revisions=revisions + revision=selectedRevision + onRollback=(action "onRollback")}} + + - {{document/view-revision - pages=pages - folder=folder - document=document - permissions=permissions - revisions=revisions - revision=selectedRevision - onRollback=(action "onRollback")}} -{{/layout/master-content}} diff --git a/gui/app/pods/document/section/template.hbs b/gui/app/pods/document/section/template.hbs index 2fe1a4da..b20ba564 100644 --- a/gui/app/pods/document/section/template.hbs +++ b/gui/app/pods/document/section/template.hbs @@ -1,14 +1,15 @@ -{{#layout/master-sidebar}} - - -
+ + +
{{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug}} - {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.document.name}} {{/link-to}}
-{{/layout/master-sidebar}} +
+
+ -{{#layout/master-content}} + {{document/document-editor document=model.document folder=model.folder @@ -22,4 +23,4 @@ files=model.attachments onAttachmentUpload=(action "onAttachmentUpload") onAttachmentDelete=(action "onAttachmentDelete")}} -{{/layout/master-content}} + diff --git a/gui/app/pods/document/settings/template.hbs b/gui/app/pods/document/settings/template.hbs index 1efd2ea8..db153bd6 100644 --- a/gui/app/pods/document/settings/template.hbs +++ b/gui/app/pods/document/settings/template.hbs @@ -1,87 +1,95 @@ -{{#layout/master-sidebar}} - -
+ + +
{{#link-to "document.index"}} - {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.document.name}} {{/link-to}} - - - -
Document Options
-
-
- -
Content Settings
-
-
- -
Categories
-
-
- -
Tags
-
- {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#if model.permissions.documentApprove}} -
- -
Change Control
-
- {{/if}} - {{#if model.permissions.documentVersion}} -
- -
Versions
-
- {{/if}} - {{/if}} -
-{{/layout/master-sidebar}} +
+
+ -{{#layout/master-content}} - {{#if (eq tab "general")}} - {{document/settings-general - space=model.folder - document=model.document - permissions=model.permissions - onSaveDocument=(action "onSaveDocument")}} - {{/if}} + + +
+
+
Options
+
+
+ +
Content Settings
+
+
+ +
Categories
+
+
+ +
Tags
+
+ {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} + {{#if model.permissions.documentApprove}} +
+ +
Change Control
+
+ {{/if}} + {{#if model.permissions.documentVersion}} +
+ +
Versions
+
+ {{/if}} + {{/if}} +
+
+
+ - {{#if (eq tab "category")}} - {{document/settings-category - space=model.folder - document=model.document - permissions=model.permissions - onSaveDocument=(action "onSaveDocument")}} - {{/if}} + + {{#if (eq tab "general")}} + {{document/settings-general + space=model.folder + document=model.document + permissions=model.permissions + onSaveDocument=(action "onSaveDocument")}} + {{/if}} - {{#if (eq tab "tag")}} - {{document/settings-tag - space=model.folder - document=model.document - permissions=model.permissions - onSaveDocument=(action "onSaveDocument")}} - {{/if}} + {{#if (eq tab "category")}} + {{document/settings-category + space=model.folder + document=model.document + permissions=model.permissions + onSaveDocument=(action "onSaveDocument")}} + {{/if}} - {{#if (eq tab "protection")}} - {{document/settings-protection - space=model.folder - spaces=model.folders - document=model.document - permissions=model.permissions - onRefresh=(action "onRefresh") - onSaveDocument=(action "onSaveDocument")}} - {{/if}} + {{#if (eq tab "tag")}} + {{document/settings-tag + space=model.folder + document=model.document + permissions=model.permissions + onSaveDocument=(action "onSaveDocument")}} + {{/if}} - {{#if (eq tab "versions")}} - {{enterprise/settings-version - space=model.folder - spaces=model.folders - document=model.document - permissions=model.permissions - versions=model.versions - onRefresh=(action "onRefresh") - onSaveDocument=(action "onSaveDocument")}} - {{/if}} -{{/layout/master-content}} + {{#if (eq tab "protection")}} + {{document/settings-protection + space=model.folder + spaces=model.folders + document=model.document + permissions=model.permissions + onRefresh=(action "onRefresh") + onSaveDocument=(action "onSaveDocument")}} + {{/if}} + + {{#if (eq tab "versions")}} + {{enterprise/settings-version + space=model.folder + spaces=model.folders + document=model.document + permissions=model.permissions + versions=model.versions + onRefresh=(action "onRefresh") + onSaveDocument=(action "onSaveDocument")}} + {{/if}} + + diff --git a/gui/app/pods/folder/block/template.hbs b/gui/app/pods/folder/block/template.hbs index a364840d..ba520661 100644 --- a/gui/app/pods/folder/block/template.hbs +++ b/gui/app/pods/folder/block/template.hbs @@ -1,18 +1,29 @@ -{{#layout/master-sidebar}} - -
+ + +
{{#link-to "folder.settings"}} - {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space Settings"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.folder.name}} {{/link-to}}
-{{/layout/master-sidebar}} + -{{#layout/master-content}} - {{layout/logo-heading - title="Content Blocks" - desc="Content blocks provide re-usable content that can be inserted into any document" - icon=constants.Icon.Integrations}} + + +
+
+
about
+
+
+
+ - {{document/block-editor document=model.document folder=model.folder block=model.block - onCancel=(action "onCancel") onAction=(action "onAction")}} -{{/layout/master-content}} + + {{layout/logo-heading + title="Content Blocks" + desc="Content blocks provide re-usable content that can be inserted into any document" + icon=constants.Icon.Integrations}} + + {{document/block-editor document=model.document folder=model.folder block=model.block + onCancel=(action "onCancel") onAction=(action "onAction")}} + + diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs index 4ff81db2..8fad8fd4 100644 --- a/gui/app/pods/folder/index/template.hbs +++ b/gui/app/pods/folder/index/template.hbs @@ -3,6 +3,15 @@
+ {{folder/space-toolbar + spaces=model.folders + space=model.folder + permissions=model.permissions + templates=model.templates + category=category + categories=model.categories + documents=filteredDocs + onRefresh=(action "onRefresh")}}
@@ -26,76 +35,28 @@ onFiltered=(action "onFiltered") onRefresh=(action "onRefresh")}} - - -
-
-
ABOUT
-
- Documize product updates are released frequently for both - cloud and self-hosted customers. -
-
- Have an idea, suggestion or some feedback? Get in touch. -
-
-
- - {{layout/logo-heading - title="Product News" - desc="Latest product news and updates" - icon=constants.Icon.Announce}} + {{#if (eq model.folder.labelId "")}} +
Unclassified
+ {{else}} +
{{model.label.name}}
+ {{/if}} -
- {{{newsContent}}} -
- Have an idea? Suggestion or feedback? Get in touch! -
-
+ {{layout/logo-heading + title=model.folder.name + desc=model.folder.desc + meta=model.folder.icon}} + + {{folder/documents-list + documents=filteredDocs + spaces=model.folders + space=model.folder + templates=model.templates + permissions=model.permissions + sortBy=sortBy + onFiltered=(action "onFiltered") + onExportDocument=(action "onExportDocument") + onDeleteDocument=(action "onDeleteDocument") + onMoveDocument=(action "onMoveDocument")}} - - - - - - -{{#layout/master-content}} -
-
- {{#if (eq model.folder.labelId "")}} -
Unclassified
- {{else}} -
{{model.label.name}}
- {{/if}} - {{layout/logo-heading - title=model.folder.name - desc=model.folder.desc - meta=model.folder.icon}} -
-
- {{folder/space-toolbar - spaces=model.folders - space=model.folder - permissions=model.permissions - templates=model.templates - category=category - categories=model.categories - documents=filteredDocs - onRefresh=(action "onRefresh")}} -
-
- - {{folder/documents-list - documents=filteredDocs - spaces=model.folders - space=model.folder - templates=model.templates - permissions=model.permissions - sortBy=sortBy - onFiltered=(action "onFiltered") - onExportDocument=(action "onExportDocument") - onDeleteDocument=(action "onDeleteDocument") - onMoveDocument=(action "onMoveDocument")}} -{{/layout/master-content}} diff --git a/gui/app/pods/folder/settings/template.hbs b/gui/app/pods/folder/settings/template.hbs index 7c29aa01..8e886027 100644 --- a/gui/app/pods/folder/settings/template.hbs +++ b/gui/app/pods/folder/settings/template.hbs @@ -1,75 +1,80 @@ -{{#layout/master-sidebar}} - - -
+ + +
{{#link-to "folder.index"}} - {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space"}} + {{ui/ui-button color=constants.Color.Gray outline=true uppercase=false icon=constants.Icon.ArrowLeft label=model.folder.name}} {{/link-to}} - - - -
space management
-
-
- -
Meta
-
-
- -
Categories
-
-
- -
Permissions
-
-
- -
Content Blocks
-
- {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} -
- -
Archived Content
-
- {{/if}} - {{#if model.permissions.spaceOwner}} -
- -
Deletion
-
- {{/if}} -
-{{/layout/master-sidebar}} + -{{#layout/master-content}} - {{#if (eq tab "general")}} - {{folder/settings-general permissions=model.permissions space=model.folder labels=model.labels}} - {{/if}} + + +
+
+
space management
+
+
+ +
Meta
+
+
+ +
Categories
+
+
+ +
Permissions
+
+
+ +
Content Blocks
+
+ {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} +
+ +
Archived Content
+
+ {{/if}} + {{#if model.permissions.spaceOwner}} +
+ +
Deletion
+
+ {{/if}} +
+
+
+ - {{#if (eq tab "permissions")}} - {{folder/settings-permissions permissions=model.permissions folders=model.folders folder=model.folder onRefresh=(action "onRefresh")}} - {{/if}} - - {{#if (eq tab "templates")}} - {{folder/settings-templates permissions=model.permissions space=model.folder templates=model.templates}} - {{/if}} - - {{#if (eq tab "blocks")}} - {{folder/settings-blocks permissions=model.permissions space=model.folder}} - {{/if}} - - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#if (eq tab "archived")}} - {{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}} + + {{#if (eq tab "general")}} + {{folder/settings-general permissions=model.permissions space=model.folder labels=model.labels}} {{/if}} - {{/if}} - {{#if (eq tab "categories")}} - {{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}} - {{/if}} + {{#if (eq tab "permissions")}} + {{folder/settings-permissions permissions=model.permissions folders=model.folders folder=model.folder onRefresh=(action "onRefresh")}} + {{/if}} - {{#if (eq tab "deletion")}} - {{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}} - {{/if}} -{{/layout/master-content}} + {{#if (eq tab "templates")}} + {{folder/settings-templates permissions=model.permissions space=model.folder templates=model.templates}} + {{/if}} + + {{#if (eq tab "blocks")}} + {{folder/settings-blocks permissions=model.permissions space=model.folder}} + {{/if}} + + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} + {{#if (eq tab "archived")}} + {{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}} + {{/if}} + {{/if}} + + {{#if (eq tab "categories")}} + {{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}} + {{/if}} + + {{#if (eq tab "deletion")}} + {{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}} + {{/if}} + + diff --git a/gui/app/styles/colors.scss b/gui/app/styles/colors.scss index 8783e2b4..7cff15d0 100644 --- a/gui/app/styles/colors.scss +++ b/gui/app/styles/colors.scss @@ -17,7 +17,7 @@ **************************************************************/ /************************************************************** -* Gray, Grey shades +* Gray shades **************************************************************/ $gray-shades: ( 900: #1F2833, @@ -155,7 +155,7 @@ $color-white-dark-1: #f5f5f5; // Documents and spaces card background color $color-card: #F6F4EE; -$color-sidebar: #F6F4EE; +$color-sidebar: #f2f8fd; // $color-card: #F6F4EE; // $color-sidebar: #f2f8fd; diff --git a/gui/app/styles/core/layout/layout.scss b/gui/app/styles/core/layout/layout.scss index dd6a7243..d61f0a21 100644 --- a/gui/app/styles/core/layout/layout.scss +++ b/gui/app/styles/core/layout/layout.scss @@ -162,7 +162,7 @@ $sidebar-height: auto; height: $sidebar-height; // overflow-x: hidden; // overflow-y: auto; - padding: 20px 15px; + padding: 20px 10px 20px 20px; } .master-content { @@ -199,7 +199,7 @@ $sidebar-height: auto; .master-sidebar { width: 300px; - padding: 40px 20px; + padding: 40px 10px 40px 20px; } .master-content { @@ -214,11 +214,11 @@ $sidebar-height: auto; @media (min-width: $display-break-4) and (min-height: 650px) { .master-grid-container { display: grid; - grid-template-columns: 350px minmax(auto, 1200px); + grid-template-columns: 400px minmax(auto, 1200px); .master-sidebar { - width: 350px; - padding: 40px 20px; + width: 400px; + padding: 40px 10px 40px 20px; } .master-content { @@ -264,6 +264,6 @@ $sidebar-height: auto; @media (min-width: $display-break-4) and (min-height: 650px) { .master-container { padding: 40px; - max-width: 1200px; + // max-width: 1200px; } } diff --git a/gui/app/styles/core/layout/sidebar.scss b/gui/app/styles/core/layout/sidebar.scss index 212cc4ae..f9ea09fd 100644 --- a/gui/app/styles/core/layout/sidebar.scss +++ b/gui/app/styles/core/layout/sidebar.scss @@ -1,10 +1,11 @@ .sidebar-content { display: block; position: relative; - padding: 20px 10px 10px 10px; + padding: 20px 5px 20px 10px; + // background-color: $theme-100; background-color: $color-sidebar; - @include border-radius(4px); - border: 1px solid map-get($gray-shades, 100); + // background-color: map-get($gray-shades, 100); + @include border-radius(6px); > .section { margin: 0; diff --git a/gui/app/styles/core/view/document/sidebar-attachment.scss b/gui/app/styles/core/view/document/sidebar-attachment.scss index 62d65100..815e2f0e 100644 --- a/gui/app/styles/core/view/document/sidebar-attachment.scss +++ b/gui/app/styles/core/view/document/sidebar-attachment.scss @@ -10,7 +10,6 @@ padding: 0; > .file { - @include card(); list-style-type: none; margin: 10px 0 0 0; padding: 5px; @@ -25,11 +24,6 @@ margin-right: 10px; width: 90%; @extend .text-truncate; - color: map-get($gray-shades, 800); - - &:hover { - color: map-get($gray-shades, 900); - } } > .menu { diff --git a/gui/app/styles/core/view/document/sidebar-toc.scss b/gui/app/styles/core/view/document/sidebar-toc.scss index d38e3f6b..d3ef73ea 100644 --- a/gui/app/styles/core/view/document/sidebar-toc.scss +++ b/gui/app/styles/core/view/document/sidebar-toc.scss @@ -26,21 +26,24 @@ padding: 0; list-style: none; font-size: 1rem; - overflow-x: hidden; list-style-type: none; margin: 0 0 0 0; .item { @extend .no-select; padding: 5px 0; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: nowrap; - overflow: hidden; + // text-overflow: ellipsis; + // word-wrap: break-word; + // white-space: nowrap; + // overflow: hidden; > .link { color: map-get($gray-shades, 800); - font-weight: 500; + // font-weight: 300; + // text-overflow: ellipsis; + // word-wrap: break-word; + // white-space: nowrap; + overflow: hidden; &:hover { color: map-get($yellow-shades, 600); @@ -48,7 +51,7 @@ > .numbering { color: map-get($gray-shades, 600); - font-weight: 500; + font-weight: 300; display: inline-block; margin-right: 10px; font-size: 0.9rem; diff --git a/gui/app/styles/core/view/space.scss b/gui/app/styles/core/view/space.scss index c981e69a..fa93f8d1 100644 --- a/gui/app/styles/core/view/space.scss +++ b/gui/app/styles/core/view/space.scss @@ -17,7 +17,6 @@ > .document { @include card(); - box-shadow: none; list-style-type: none; margin: 0 0 2rem 0; padding: 15px 20px; diff --git a/gui/app/templates/components/document/sidebar-meta.hbs b/gui/app/templates/components/document/sidebar-meta.hbs index 01070aa7..fa664c7b 100644 --- a/gui/app/templates/components/document/sidebar-meta.hbs +++ b/gui/app/templates/components/document/sidebar-meta.hbs @@ -1,10 +1,4 @@
- {{#link-to "folder.index" space.id space.slug class="no-print"}} - {{ui/ui-button light=true color=constants.Color.Yellow uppercase=false - icon=constants.Icon.ArrowLeft label=space.name stretch=true truncate=true}} - {{/link-to}} - - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
VERSION
{{#if (gt versions.length 0)}} diff --git a/gui/app/templates/components/folder/space-sidebar.hbs b/gui/app/templates/components/folder/space-sidebar.hbs index 0ad4db7d..3a9313ae 100644 --- a/gui/app/templates/components/folder/space-sidebar.hbs +++ b/gui/app/templates/components/folder/space-sidebar.hbs @@ -1,5 +1,5 @@ - -
+
+
filter
@@ -39,9 +39,11 @@
Updated recently ({{recentUpdate.length}})
+
- + +
category
{{#if categories}} @@ -55,4 +57,4 @@ {{/if}}
- +
diff --git a/gui/app/templates/components/folder/space-toolbar.hbs b/gui/app/templates/components/folder/space-toolbar.hbs index 62686b53..cc0f3a7f 100644 --- a/gui/app/templates/components/folder/space-toolbar.hbs +++ b/gui/app/templates/components/folder/space-toolbar.hbs @@ -18,7 +18,7 @@ {{/ui/ui-toolbar}} {{#if permissions.documentAdd}} - {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}} + {{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}} {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green}} {{ui/ui-toolbar-label label="CONTENT" color=constants.Color.Green}} {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}