From 36634be6f5d151be2b19488f13871d1243bdb4de Mon Sep 17 00:00:00 2001 From: sauls8t Date: Wed, 23 Jan 2019 15:45:47 +0000 Subject: [PATCH] Put back to space button in sidebar (doc view) --- gui/app/components/document/page-heading.js | 4 +++ gui/app/pods/document/index/template.hbs | 35 +++++++------------ gui/app/styles/core/layout/spacing.scss | 3 ++ gui/app/styles/core/view/document/all.scss | 1 - gui/app/styles/core/view/document/meta.scss | 2 +- .../styles/core/view/document/sidebar.scss | 0 .../components/document/sidebar-meta.hbs | 6 ++++ 7 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 gui/app/styles/core/view/document/sidebar.scss diff --git a/gui/app/components/document/page-heading.js b/gui/app/components/document/page-heading.js index 15f5f800..b2ab04c3 100644 --- a/gui/app/components/document/page-heading.js +++ b/gui/app/components/document/page-heading.js @@ -101,6 +101,10 @@ export default Component.extend(ModalMixin, { }, actions: { + onShowSectionWizard(beforePage) { + this.get('onShowSectionWizard')(beforePage); + }, + onEdit() { let page = this.get('page'); diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index fe1cdf78..ca15dadb 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -59,28 +59,19 @@ {{/layout/master-sidebar}} {{#layout/master-content}} -
-
- {{#link-to "folder.index" folder.id folder.slug class="no-print"}} - {{ui/ui-button light=true color=constants.Color.Yellow 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")}} -
+
+ {{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 diff --git a/gui/app/styles/core/layout/spacing.scss b/gui/app/styles/core/layout/spacing.scss index 269d501e..b09903c6 100644 --- a/gui/app/styles/core/layout/spacing.scss +++ b/gui/app/styles/core/layout/spacing.scss @@ -67,5 +67,8 @@ $i: 100; .width-#{$i} { width: #{$i}#{"%"} !important; } + .max-width-#{$i} { + max-width: #{$i}#{"%"} !important; + } $i: $i - 1; } diff --git a/gui/app/styles/core/view/document/all.scss b/gui/app/styles/core/view/document/all.scss index a8def036..18b5ecdb 100644 --- a/gui/app/styles/core/view/document/all.scss +++ b/gui/app/styles/core/view/document/all.scss @@ -3,7 +3,6 @@ @import "meta.scss"; @import "section.scss"; @import "section-editor.scss"; -@import "sidebar.scss"; @import "sidebar-toc.scss"; @import "sidebar-attachment.scss"; @import "view-activity.scss"; diff --git a/gui/app/styles/core/view/document/meta.scss b/gui/app/styles/core/view/document/meta.scss index 78064bea..19d2b1ce 100644 --- a/gui/app/styles/core/view/document/meta.scss +++ b/gui/app/styles/core/view/document/meta.scss @@ -78,7 +78,7 @@ font-size: 1.1rem; font-weight: 500; background-color: map-get($red-shades, 700); - color: map-get($red-shades, 300); + color: map-get($red-shades, 100); text-transform: uppercase; } diff --git a/gui/app/styles/core/view/document/sidebar.scss b/gui/app/styles/core/view/document/sidebar.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/gui/app/templates/components/document/sidebar-meta.hbs b/gui/app/templates/components/document/sidebar-meta.hbs index c9bea0dd..f1589b95 100644 --- a/gui/app/templates/components/document/sidebar-meta.hbs +++ b/gui/app/templates/components/document/sidebar-meta.hbs @@ -1,4 +1,10 @@
+ {{#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}} + {{ui/ui-spacer size=200}} + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
VERSION
{{#if (gt versions.length 0)}}