diff --git a/gui/app/pods/setup/template.hbs b/gui/app/pods/setup/template.hbs index b185f295..80acf30b 100644 --- a/gui/app/pods/setup/template.hbs +++ b/gui/app/pods/setup/template.hbs @@ -1,6 +1,8 @@ -
-
-
+{{ui/ui-spacer size=700}} + +
+
+
Documize
@@ -8,7 +10,7 @@ Setup new database
-
+
{{setup/documize-setup model=model save=(action "save")}}
diff --git a/gui/app/styles/core/bootstrap.scss b/gui/app/styles/core/bootstrap.scss index 8e73cc79..d70abc2a 100644 --- a/gui/app/styles/core/bootstrap.scss +++ b/gui/app/styles/core/bootstrap.scss @@ -93,7 +93,7 @@ $link-hover-decoration: none; // Optional @import "node_modules/bootstrap/scss/reboot"; -@import "node_modules/bootstrap/scss/grid"; +// @import "node_modules/bootstrap/scss/grid"; // @import "node_modules/bootstrap/scss/buttons"; // @import "node_modules/bootstrap/scss/button-group"; @import "node_modules/bootstrap/scss/forms"; diff --git a/gui/app/styles/core/print.scss b/gui/app/styles/core/print.scss index 77fcbf9f..4b505003 100644 --- a/gui/app/styles/core/print.scss +++ b/gui/app/styles/core/print.scss @@ -47,19 +47,10 @@ } .non-printable, - header, - footer, - .tabnav-control, - .document-toolbar, - .document-toc, - .tabnav-control, - #nav-bar, + .no-print, + .master-sidebar-container .page-toolbar, .start-section, - .start-button, - #top-bar, - #sidebar, - #sub-nav, .new-section-wizard { float: none !important; display: none !important; @@ -111,20 +102,7 @@ color: #000000 !important; } - .container { - width: auto !important; - min-width: 100% !important; - margin: 0 !important; - padding: 0 !important; - } - - - [class*="col-"] { - float: left !important; - width: 100% !important; - } - - .layout-body, .layout-content { + .master-content { padding: 0 !important; margin: 0 !important; display: block !important; diff --git a/gui/app/styles/core/view/customize.scss b/gui/app/styles/core/view/customize.scss index 54db2f74..88333a92 100644 --- a/gui/app/styles/core/view/customize.scss +++ b/gui/app/styles/core/view/customize.scss @@ -179,12 +179,15 @@ margin: 10px 0; > .group-name { + display: inline-block; color: map-get($gray-shades, 800); font-size: 1rem; + font-weight: 500; > .group-purpose { color: map-get($gray-shades, 700); font-size: 0.9rem; + font-weight: 400; } } } diff --git a/gui/app/styles/core/view/document/section-editor.scss b/gui/app/styles/core/view/document/section-editor.scss index 15b2f5df..efcbebc1 100644 --- a/gui/app/styles/core/view/document/section-editor.scss +++ b/gui/app/styles/core/view/document/section-editor.scss @@ -9,6 +9,21 @@ .content-linker-modal-container { height: 500px; overflow-y: auto; + padding: 20px; + + > p { + color: map-get($gray-shades, 800); + font-size: 1.1rem; + font-weight: 400; + margin: 1.5rem 0 0.7rem 0; + } + + > .nothing { + color: map-get($red-shades, 700); + font-size: 1.1rem; + font-weight: 400; + margin: 0; + } .dicon { margin-right: 5px; diff --git a/gui/app/styles/core/widget/widget-tabnav.scss b/gui/app/styles/core/widget/widget-tabnav.scss index 0676b762..6a0e493f 100644 --- a/gui/app/styles/core/widget/widget-tabnav.scss +++ b/gui/app/styles/core/widget/widget-tabnav.scss @@ -8,9 +8,8 @@ display: inline-block; margin: 0; padding: 5px 15px; - background-color: $color-white; - color: $theme-500; - border: 1px solid map-get($gray-shades, 300); + background-color: map-get($gray-shades, 100); + border: 1px solid map-get($gray-shades, 200); font-weight: 500; font-size: 1.1rem; text-align: center; @@ -29,7 +28,7 @@ } &:hover { - background-color: $theme-100; + background-color: map-get($gray-shades, 200); } } @@ -47,8 +46,9 @@ } > .selected { - background-color: $theme-100; - font-weight: 700; + color: map-get($yellow-shades, 700); + background-color: map-get($yellow-shades, 100); + font-weight: 500; } } diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs index 713d90f1..c18afb4b 100644 --- a/gui/app/templates/components/customize/user-list.hbs +++ b/gui/app/templates/components/customize/user-list.hbs @@ -188,22 +188,16 @@ {{input id="edit-email" type="text" class="form-control" value=editUser.email}}
{{#if isAuthProviderDocumize}} -
-
-
- - {{input id="edit-password" type="password" class="form-control" value=password.password}} - Optional new password -
+
+ + {{input id="edit-password" type="password" class="form-control" value=password.password}} + Optional new password
-
-
- - {{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}} - Confirm new password -
+
+ + {{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}} + Confirm new password
-
{{/if}}
@@ -236,26 +230,36 @@
{{selectedUser.fullname}}
-
-
- {{#each groups as |group|}} -
-
{{group.name}} - {{#if group.purpose}} -  — {{group.purpose}} - {{/if}} -
-
- {{#if group.isMember}} - {{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Leave onClick=(action "onLeaveGroup" group.id)}} - {{else}} - {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Join onClick=(action "onJoinGroup" group.id)}} - {{/if}} + {{#each groups as |group|}} +
+
+
+
+
+
{{group.name}} + {{#if group.purpose}} +  — {{group.purpose}} + {{/if}} +
+
+
+
+
+
+
+
+
+ {{#if group.isMember}} + {{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Leave onClick=(action "onLeaveGroup" group.id)}} + {{else}} + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Join onClick=(action "onJoinGroup" group.id)}} + {{/if}} +
+
- {{/each}}
-
+ {{/each}}
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}} diff --git a/gui/app/templates/components/document/add-section.hbs b/gui/app/templates/components/document/add-section.hbs index 47a30122..8d4e29d1 100644 --- a/gui/app/templates/components/document/add-section.hbs +++ b/gui/app/templates/components/document/add-section.hbs @@ -5,57 +5,43 @@
-
- -
-
-
- {{focus-input type="text" id="new-section-name" value=newSectionName - class=(if newSectionNameMissing "mousetrap form-control form-control-lg is-invalid" "mousetrap form-control form-control-lg") - placeholder="Enter section name" autocomplete="off"}} -
-
+
+
+ {{focus-input type="text" id="new-section-name" value=newSectionName + class=(if newSectionNameMissing "mousetrap form-control form-control-lg is-invalid" "mousetrap form-control form-control-lg") + placeholder="Enter section name" autocomplete="off"}}
- -
-
-
-
Select Section Type
-
    - {{#each sections as |section|}} -
  • -
    - -
    -
    {{section.title}}
    -
    • - {{/each}} -
-
-
-
-
Select Re-usable Content
- {{#if hasBlocks}} -
    - {{#each blocks as |block|}} -
  • - {{#attach-tooltip showDelay=1000}}Published by {{block.firstname}} {{block.lastname}}, {{time-ago block.created}} — used {{ block.used }} times{{/attach-tooltip}} -
    -
    {{block.title}}
    -
    {{block.excerpt}}
    -
    -
    • - {{/each}} -
- {{else}} -
You have no reusable content — publish any document section as a template for others to reuse
- {{/if}} -
+
+
Select Section Type
+
    + {{#each sections as |section|}} +
  • +
    + +
    +
    {{section.title}}
    +
    • + {{/each}} +
- +
Select Re-usable Content
+ {{#if hasBlocks}} +
    + {{#each blocks as |block|}} +
  • + {{#attach-tooltip showDelay=1000}}Published by {{block.firstname}} {{block.lastname}}, {{time-ago block.created}} — used {{ block.used }} times{{/attach-tooltip}} +
    +
    {{block.title}}
    +
    {{block.excerpt}}
    +
    +
    • + {{/each}} +
+ {{else}} +
You have no reusable content — publish any document section as a template for others to reuse
+ {{/if}}
-
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} diff --git a/gui/app/templates/components/document/block-editor.hbs b/gui/app/templates/components/document/block-editor.hbs index b0161be9..8b2c2d26 100644 --- a/gui/app/templates/components/document/block-editor.hbs +++ b/gui/app/templates/components/document/block-editor.hbs @@ -1,10 +1,3 @@ -
-
-
-
- {{component editorType document=document space=space page=page meta=meta blockMode=true onCancel=(action "onCancel") onAction=(action "onAction")}} -
-
-
+
+ {{component editorType document=document space=space page=page meta=meta blockMode=true onCancel=(action "onCancel") onAction=(action "onAction")}}
- diff --git a/gui/app/templates/components/document/content-linker.hbs b/gui/app/templates/components/document/content-linker.hbs index a0c9b06e..71bdd262 100644 --- a/gui/app/templates/components/document/content-linker.hbs +++ b/gui/app/templates/components/document/content-linker.hbs @@ -3,113 +3,98 @@
Insert Link
-
-
-
-
    -
  • Section
    • -
  • Attachment
    • -
  • Search
    • -
  • Network
    • +
      +
    • Section
      • +
    • Attachment
      • +
    • Search
      • +
    • Network
      • +
    + + {{#if showSections}} +
    +

    Link to content within this document

    + {{ui/ui-list-picker items=candidates.pages nameField="title" singleSelect=true onSelect=(action "setSelection")}} +
    + {{/if}} + + {{#if showAttachments}} +
    +

    Link to an attachment within this document

    +
    +
      + {{#each candidates.attachments as |item|}} +
    • +
      + + {{item.title}} +
      + {{#if item.selected}} + + {{/if}} +
      • + {{/each}}
    + {{/if}} - {{#if showSections}} -
    -
    -

    Link to content within this document

    - {{ui/ui-list-picker items=candidates.pages nameField="title" singleSelect=true onSelect=(action "setSelection")}} -
    + {{#if showSearch}} +
    +
    + + {{focus-input id="content-linker-search" type="input" class="form-control" value=keywords placeholder="keyword search" autocomplete="off"}} + Document name, content, attachment name
    - {{/if}} - - {{#if showAttachments}} -
    -
    -

    Link to an attachment within this document

    -
    -
      - {{#each candidates.attachments as |item|}} -
    • -
      - - {{item.title}} -
      - {{#if item.selected}} - - {{/if}} -
      • - {{/each}} -
    -
    -
    + {{#unless hasMatches}} +

    Nothing found.

    + {{/unless}} +
    +
      + {{#each matches.documents as |item|}} +
    • +
      + {{item.title}}
      {{item.context}} +
      + {{#if item.selected}} + + {{/if}} +
      • + {{/each}} + {{#each matches.pages as |item|}} +
    • +
      + {{item.title}}
      {{item.context}} +
      + {{#if item.selected}} + + {{/if}} +
      • + {{/each}} + {{#each matches.attachments as |item|}} +
    • +
      + + {{item.title}} +
      + {{#if item.selected}} + + {{/if}} +
      • + {{/each}} +
    - {{/if}} +
    + {{/if}} - {{#if showSearch}} -
    -
    -
    - - {{focus-input id="content-linker-search" type="input" class="form-control" value=keywords placeholder="keyword search" autocomplete="off"}} - Document name, content, attachment name -
    - {{#unless hasMatches}} - Nothing found. - {{/unless}} -
    -
      - {{#each matches.documents as |item|}} -
    • -
      - {{item.title}}
      {{item.context}} -
      - {{#if item.selected}} - - {{/if}} -
      • - {{/each}} - {{#each matches.pages as |item|}} -
    • -
      - {{item.title}}
      {{item.context}} -
      - {{#if item.selected}} - - {{/if}} -
      • - {{/each}} - {{#each matches.attachments as |item|}} -
    • -
      - - {{item.title}} -
      - {{#if item.selected}} - - {{/if}} -
      • - {{/each}} -
    -
    -
    + {{#if showNetwork}} +
    +

    Specify network drive/share/folder location

    +
    + {{focus-input id="content-linker-networklocation" type="input" class="form-control" value=networkLocation placeholder="e.g. //share/folder" autocomplete="off"}} +
    - {{/if}} - - {{#if showNetwork}} -
    -
    -

    Specify network drive/share/folder location

    -
    - {{focus-input id="content-linker-networklocation" type="input" class="form-control" value=networkLocation placeholder="e.g. //share/folder" autocomplete="off"}} - -
    -
    -
    - {{/if}} - -
    +
    + {{/if}}
    {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}} diff --git a/gui/app/templates/components/onboard/share-folder.hbs b/gui/app/templates/components/onboard/share-folder.hbs index 3791efd5..8c911140 100644 --- a/gui/app/templates/components/onboard/share-folder.hbs +++ b/gui/app/templates/components/onboard/share-folder.hbs @@ -1,53 +1,40 @@
    -
    -
    - -
    -
    - - - -
    -

    Let's set up your account

    -
    - - - Nickname or otherwise -
    -
    - - - Usually not the same as your firstname -
    - {{ui/ui-spacer size=300}} - {{ui/ui-button id="stage-1-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.Next}} -
    - -
    -

    Let's set up your account

    -
    - - - Between 6 and 50 characters - -
    -
    - - - Re-type your chosen password -
    - {{ui/ui-spacer size=300}} - {{ui/ui-button id="stage-2-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.SignIn}} -
    - -
    -

    Please wait...

    -
    - -
    +
    + +
    +

    Let's set up your account

    +
    + + + Nickname or otherwise
    +
    + + + Usually not the same as your firstname +
    + {{ui/ui-spacer size=300}} + {{ui/ui-button id="stage-1-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.Next}} +
    +
    +

    Let's set up your account

    +
    + + + Between 6 and 50 characters -
    -
    +
    +
    + + + Re-type your chosen password +
    + {{ui/ui-spacer size=300}} + {{ui/ui-button id="stage-2-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.SignIn}} +
    +
    +

    Please wait...

    +
    +
    diff --git a/gui/app/templates/components/section/github/type-editor.hbs b/gui/app/templates/components/section/github/type-editor.hbs index 27578bab..d460bf1f 100644 --- a/gui/app/templates/components/section/github/type-editor.hbs +++ b/gui/app/templates/components/section/github/type-editor.hbs @@ -1,47 +1,38 @@ {{#section/base-editor document=document folder=folder page=page busy=busy tip="GitHub is how people build software. (https://github.com)" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} - -
    +
    {{#if authenticated}} -
    -
    - - {{ui/ui-select id="owners-dropdown" content=owners action=(action "onOwnerChange") optionValuePath="id" optionLabelPath="name" selection=config.owner}} - Select organization or user whose repository you want to show -
    -
    - - {{input id="branch-since" value=config.branchSince type="text" class="form-control"}} - default is 7 days ago -
    -
    - -
    - {{input id="show-milestone" checked=config.showMilestones type="checkbox"}} - -
    - {{input id="show-issues" checked=config.showIssues type="checkbox"}} - -
    - {{input id="show-commits" checked=config.showCommits type="checkbox" }} - -
    - Select the views you want to show -
    +
    + + {{ui/ui-select id="owners-dropdown" content=owners action=(action "onOwnerChange") optionValuePath="id" optionLabelPath="name" selection=config.owner}} + Select organization or user whose repository you want to show
    - -
    -
    -
    - - {{ui/ui-list-picker items=config.lists nameField="repo" singleSelect=true}} -
    +
    + + {{input id="branch-since" value=config.branchSince type="text" class="form-control"}} + default is 7 days ago +
    +
    + +
    + {{input id="show-milestone" checked=config.showMilestones type="checkbox"}} + +
    + {{input id="show-issues" checked=config.showIssues type="checkbox"}} + +
    + {{input id="show-commits" checked=config.showCommits type="checkbox" }} + +
    + Select the views you want to show +
    +
    +
    + + {{ui/ui-list-picker items=config.lists nameField="repo" singleSelect=true}}
    {{else}} -
    -
    Authenticate
    -
    +
    Authenticate
    {{/if}}
    - {{/section/base-editor}}