From 3f2edcaa968e77391c38515e0ca28cb5f428e477 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Mon, 11 Dec 2017 20:59:28 +0000 Subject: [PATCH] removed redundant colors, widgets --- .../components/document/document-sidebar.js | 29 -- .../{document-index.js => document-toc.js} | 0 gui/app/components/document/index-entry.js | 24 -- gui/app/components/ui/ui-selection.js | 15 - gui/app/components/ui/ui-tab.js | 35 -- gui/app/components/widget-sample.js | 64 ---- gui/app/pods/document/index/template.hbs | 80 +++-- gui/app/pods/widgets/route.js | 15 - gui/app/pods/widgets/template.hbs | 3 - gui/app/router.js | 4 - gui/app/styles/color.scss | 24 +- gui/app/styles/view/document/doc-toc.scss | 145 ++++---- gui/app/styles/view/document/wysiwyg.scss | 2 +- gui/app/styles/view/search.scss | 60 ---- gui/app/styles/view/space.scss | 11 - gui/app/styles/widget/widget-avatar.scss | 31 -- gui/app/styles/widget/widget-button.scss | 319 ------------------ gui/app/styles/widget/widget-card.scss | 68 ---- gui/app/styles/widget/widget-checkbox.scss | 9 + gui/app/styles/widget/widget-chip.scss | 21 -- gui/app/styles/widget/widget-input.scss | 264 --------------- .../styles/widget/widget-notification.scss | 2 +- gui/app/styles/widget/widget-selection.scss | 34 -- .../styles/widget/widget-sidebar-menu.scss | 27 -- gui/app/styles/widget/widget-tab.scss | 29 -- gui/app/styles/widget/widget.scss | 6 - .../components/document/content-linker.hbs | 2 +- .../components/document/document-index.hbs | 31 -- .../components/document/document-sidebar.hbs | 12 - .../components/document/document-toc.hbs | 36 ++ .../components/document/index-entry.hbs | 1 - .../components/document/view-content.hbs | 4 +- .../templates/components/password-reset.hbs | 15 +- .../templates/components/ui/ui-selection.hbs | 6 - gui/app/templates/components/ui/ui-tab.hbs | 5 - .../templates/components/widget-sample.hbs | 227 ------------- 36 files changed, 161 insertions(+), 1499 deletions(-) delete mode 100644 gui/app/components/document/document-sidebar.js rename gui/app/components/document/{document-index.js => document-toc.js} (100%) delete mode 100644 gui/app/components/document/index-entry.js delete mode 100644 gui/app/components/ui/ui-selection.js delete mode 100644 gui/app/components/ui/ui-tab.js delete mode 100644 gui/app/components/widget-sample.js delete mode 100644 gui/app/pods/widgets/route.js delete mode 100644 gui/app/pods/widgets/template.hbs delete mode 100644 gui/app/styles/widget/widget-card.scss delete mode 100644 gui/app/styles/widget/widget-chip.scss delete mode 100644 gui/app/styles/widget/widget-input.scss delete mode 100644 gui/app/styles/widget/widget-selection.scss delete mode 100644 gui/app/styles/widget/widget-sidebar-menu.scss delete mode 100644 gui/app/styles/widget/widget-tab.scss delete mode 100644 gui/app/templates/components/document/document-index.hbs delete mode 100644 gui/app/templates/components/document/document-sidebar.hbs create mode 100644 gui/app/templates/components/document/document-toc.hbs delete mode 100644 gui/app/templates/components/document/index-entry.hbs delete mode 100644 gui/app/templates/components/ui/ui-selection.hbs delete mode 100644 gui/app/templates/components/ui/ui-tab.hbs delete mode 100644 gui/app/templates/components/widget-sample.hbs diff --git a/gui/app/components/document/document-sidebar.js b/gui/app/components/document/document-sidebar.js deleted file mode 100644 index bcd296f5..00000000 --- a/gui/app/components/document/document-sidebar.js +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Component from '@ember/component'; - -export default Component.extend({ - actions: { - - onPageSequenceChange(changes) { - this.attrs.onPageSequenceChange(changes); - }, - - onPageLevelChange(changes) { - this.attrs.onPageLevelChange(changes); - }, - - onGotoPage(id) { - this.attrs.onGotoPage(id); - } - } -}); diff --git a/gui/app/components/document/document-index.js b/gui/app/components/document/document-toc.js similarity index 100% rename from gui/app/components/document/document-index.js rename to gui/app/components/document/document-toc.js diff --git a/gui/app/components/document/index-entry.js b/gui/app/components/document/index-entry.js deleted file mode 100644 index 577705d6..00000000 --- a/gui/app/components/document/index-entry.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Component from '@ember/component'; - -export default Component.extend({ - page: {}, - tagName: "li", - classNames: ["item"], - - actions: { - onClick(id) { - this.get('onClick')(id); - } - } -}); diff --git a/gui/app/components/ui/ui-selection.js b/gui/app/components/ui/ui-selection.js deleted file mode 100644 index e790b207..00000000 --- a/gui/app/components/ui/ui-selection.js +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Component from '@ember/component'; - -export default Component.extend({ -}); diff --git a/gui/app/components/ui/ui-tab.js b/gui/app/components/ui/ui-tab.js deleted file mode 100644 index c5bbccb4..00000000 --- a/gui/app/components/ui/ui-tab.js +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import { htmlSafe } from '@ember/string'; - -import { computed, set } from '@ember/object'; -import Component from '@ember/component'; - -export default Component.extend({ - myWidth: computed('tabs', function() { - let count = this.get('tabs.length'); - let width = 95 / count; - return htmlSafe("width: " + `${width}%;`); - }), - - actions: { - onTabSelect(tab) { - this.get('tabs').forEach(t => { - set(t, 'selected', false); - }); - - set(tab, 'selected', true); - - this.attrs.onTabSelect(this.get('tabs')); - } - } -}); diff --git a/gui/app/components/widget-sample.js b/gui/app/components/widget-sample.js deleted file mode 100644 index 81fa82e9..00000000 --- a/gui/app/components/widget-sample.js +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -// Copyright (c) 2015 Documize Inc. -import Component from '@ember/component'; -import NotifierMixin from '../mixins/notifier'; - -export default Component.extend(NotifierMixin, { - drop1: null, - - didInsertElement() { - this._super(...arguments); - new Tooltip({ - target: document.getElementById("sample-1") - }); - new Tooltip({ - target: document.getElementById("sample-2") - }); - new Tooltip({ - target: document.getElementById("sample-3") - }); - new Tooltip({ - target: document.getElementById("sample-4") - }); - - // let drop1 = new Drop({ - // target: document.getElementById('sample-dropdown-1'), - // content: document.getElementById('sample-dropdown-content-1'), - // classes: 'drop-theme-basic', - // position: 'bottom middle', - // openOn: 'click' - // }); - - // this.set('drop1', drop1); - - $('#test-button').popover({ - placement: 'top', - trigger: 'focus', - title: "How to Test", - content: "This is a demo that tests the suitability of Bootstrap 4 inside Documize" - }); - - $('#test-button2').tooltip({}); - $('#test-button3').tooltip({}); - }, - - actions: { - dropClose() { - this.get('drop1').close(); - }, - - addFolder() { - return true; - } - } -}); diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index 68e7f1c1..bcffacf2 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -1,45 +1,57 @@ {{toolbar/nav-bar}} -
- {{toolbar/for-document document=model.document spaces=model.folders space=model.folder permissions=model.permissions onDocumentDelete=(action 'onDocumentDelete') onSaveTemplate=(action 'onSaveTemplate')}} +
- {{document/document-heading document=model.document permissions=model.permissions onSaveDocument=(action 'onSaveDocument')}} +
- {{document/document-meta document=model.document folder=model.folder folders=model.folders permissions=model.permissions onSaveDocument=(action 'onSaveDocument')}} +
-
    -
  • Content
    • -
  • Attachments
    • -
  • Activity
    • -
  • Revisions
    • -
+ {{document/document-toc document=model.document folder=model.folder pages=model.pages page=model.page permissions=model.permissions + onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange') onGotoPage=(action 'onGotoPage')}} - {{#if (eq tab 'content')}} - {{document/view-content - document=model.document links=model.links pages=model.pages - folder=model.folder folders=model.folders sections=model.sections permissions=model.permissions pageId=pageId - onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') - onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') onGotoPage=(action 'onGotoPage') - onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}} - {{/if}} +
- {{#if (eq tab 'attachment')}} - {{document/view-attachment document=model.document permissions=model.permissions}} - {{/if}} +
- {{#if (eq tab 'activity')}} - {{document/view-activity document=model.document pages=model.pages permissions=model.permissions}} - {{/if}} + {{toolbar/for-document document=model.document spaces=model.folders space=model.folder permissions=model.permissions + onDocumentDelete=(action 'onDocumentDelete') onSaveTemplate=(action 'onSaveTemplate')}} + + {{document/document-heading document=model.document permissions=model.permissions + onSaveDocument=(action 'onSaveDocument')}} + + {{document/document-meta document=model.document folder=model.folder folders=model.folders permissions=model.permissions + onSaveDocument=(action 'onSaveDocument')}} + +
    +
  • Content
    • +
  • Attachments
    • +
  • Activity
    • +
  • Revisions
    • +
+ + {{#if (eq tab 'content')}} + {{document/view-content + document=model.document links=model.links pages=model.pages + folder=model.folder folders=model.folders sections=model.sections permissions=model.permissions pageId=pageId + onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') + onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') onGotoPage=(action 'onGotoPage') + onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}} + {{/if}} + + {{#if (eq tab 'attachment')}} + {{document/view-attachment document=model.document permissions=model.permissions}} + {{/if}} + + {{#if (eq tab 'activity')}} + {{document/view-activity document=model.document pages=model.pages permissions=model.permissions}} + {{/if}} + + {{#if (eq tab 'revision')}} + {{document/view-revision document=model.document folder=model.folder pages=model.pages onRollback=(action 'onRollback')}} + {{/if}} + +
- {{#if (eq tab 'revision')}} - {{document/view-revision document=model.document folder=model.folder pages=model.pages onRollback=(action 'onRollback')}} - {{/if}} - -
- {{document/document-sidebar tab=tab - document=model.document folder=model.folder pages=model.pages page=model.page permissions=model.permissions - onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange') - onGotoPage=(action 'onGotoPage')}}
-
\ No newline at end of file +
diff --git a/gui/app/pods/widgets/route.js b/gui/app/pods/widgets/route.js deleted file mode 100644 index 0999e0b6..00000000 --- a/gui/app/pods/widgets/route.js +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Route from '@ember/routing/route'; -import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; - -export default Route.extend(AuthenticatedRouteMixin); \ No newline at end of file diff --git a/gui/app/pods/widgets/template.hbs b/gui/app/pods/widgets/template.hbs deleted file mode 100644 index e328bebe..00000000 --- a/gui/app/pods/widgets/template.hbs +++ /dev/null @@ -1,3 +0,0 @@ -
- {{widget-sample}} -
diff --git a/gui/app/router.js b/gui/app/router.js index 15fe26fe..4e080031 100644 --- a/gui/app/router.js +++ b/gui/app/router.js @@ -109,10 +109,6 @@ export default Router.map(function () { path: 'accounts' }); - this.route('widgets', { - path: 'widgets' - }); - this.route('not-found', { path: '/*wildcard' }); diff --git a/gui/app/styles/color.scss b/gui/app/styles/color.scss index bec440e2..270f1cc5 100644 --- a/gui/app/styles/color.scss +++ b/gui/app/styles/color.scss @@ -27,6 +27,7 @@ $color-gray: #8b9096; $color-gray-light: #d8d8d8; $color-gray-light2: #eaeaea; $color-border: #d3d3d3; +// $color-wysiwyg: #3c3c3c; // colors $color-red: #9E0D1F; @@ -38,31 +39,8 @@ $color-goldy: #FFD700; $color-checkbox: #2667af; $color-symbol-box: #dce5e8; $color-symbol-icon: #a4b8be; - - -// ????? -$color-wysiwyg: #3c3c3c; - -// DEAD -$color-table-border: #e1e1e1; -$color-table-header: #f5f5f5; -$color-toolbar: #eeeeee; $color-card: #F9F9F9; -$color-input: #5a5a5a; $color-stroke: #e1e1e1; -$color-tooltip: #a1a1a1; -$color-toast: #4c4c4c; -$color-sidebar: #f5f5f5; -$color-sidebar-border: #e1e1e1; -$color-sidebar-text: $color-black; -$color-sidebar-link: $color-link; -$color-nav-button: #f2faff; -$color-nav-button-text: #2667af; -$color-nav-button-border: #dff0f9; -$color-selected-item: $color-sidebar; -$color-sidebar-navigation: #f2faff; -$color-sidebar-navigation-border: #dff0f9; -$color-sidebar-toolbar: $color-sidebar-border; // Color utility classes for direct usage in HTML .color-white { diff --git a/gui/app/styles/view/document/doc-toc.scss b/gui/app/styles/view/document/doc-toc.scss index c0057301..ad14c68b 100644 --- a/gui/app/styles/view/document/doc-toc.scss +++ b/gui/app/styles/view/document/doc-toc.scss @@ -1,98 +1,67 @@ -.document-sidebar-view-index { - margin: 0; +.document-toc { + @include border-radius(3px); + margin: 20px 0; + padding: 10px 20px; + background-color: $color-off-white; + border: 1px solid $color-border; + display: inline-block; + position: fixed; + left: 20px; + z-index: 777; - >.structure { - > .toc-controls { - margin: 0; - color: $color-gray; + > .title { + color: $color-off-black; + font-weight: bold; + font-size: 1rem; + margin-bottom: 10px; + text-align: center; + } - > .round-button-mono { - > .material-icons { - color: $color-link; - } - } + > .toc-controls { + margin: 0; + text-align: center; + + > .disabled { + cursor: not-allowed !important; - > .disabled { - cursor: not-allowed !important; - color: $color-stroke; - border-color: $color-stroke; + > .material-icons { + color: $color-gray-light; + } + } + } - > .material-icons { - color: $color-stroke; - } - } - } + > .index-list { + padding: 0; + list-style: none; + font-size: 0.9rem; + overflow-x: hidden; + list-style-type: none; + margin: 20px 0 0; - > .index-list { - padding: 0; - list-style: none; - font-size: 13px; - overflow-x: hidden; - list-style-type: none; - margin: 20px 0 0; + .item { + @extend .no-select; + padding: 4px 0; + text-overflow: ellipsis; + word-wrap: break-word; + white-space: nowrap; + overflow: hidden; + + > .link { + color: $color-dark; + font-weight: bold; + + &:hover { + color: $color-link; + } + } - .item { - padding: 4px 0; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: nowrap; - overflow: hidden; - @extend .no-select; - - > .link { - color: $color-off-black; - - &:hover { - color: $color-link; - } - } - - > .selected { - color: $color-link; - font-weight: bold; - } - } - } - } + > .selected { + color: $color-link; + // font-weight: bold; + } + } + } } -.document-sidebar-toolbar { - margin: 10px 0 0 0; - padding: 10px 0; - text-align: center; - // background-color: $color-sidebar-toolbar; - - > .round-button-mono { - background-color: $color-white; - border-color: $color-sidebar-border; - - > .material-icons { - color: $color-gray; - @include ease-in(); - } - - &:hover { - > .material-icons { - color: $color-link; - } - } - } - - > .selected { - background-color: $color-primary; - border-color: $color-primary; - - > .material-icons { - color: $color-off-white; - @include ease-in(); - } - - &:hover { - > .material-icons { - color: $color-white; - } - } - } -} diff --git a/gui/app/styles/view/document/wysiwyg.scss b/gui/app/styles/view/document/wysiwyg.scss index 1d1229ef..5a006222 100644 --- a/gui/app/styles/view/document/wysiwyg.scss +++ b/gui/app/styles/view/document/wysiwyg.scss @@ -1,7 +1,7 @@ .wysiwyg { font-size: 17px; line-height: 30px; - color: $color-wysiwyg; + color: $color-off-black; table { border: 1px solid $color-border !important; diff --git a/gui/app/styles/view/search.scss b/gui/app/styles/view/search.scss index ce72f9f3..53d4132b 100644 --- a/gui/app/styles/view/search.scss +++ b/gui/app/styles/view/search.scss @@ -72,63 +72,3 @@ } } } - -.page-search { - .input-control { - > input { - background-color: $color-sidebar; - } - } - - .examples { - color: $color-gray; - } - - .search-results { - > .heading { - font-size: 2rem; - margin-bottom: 10px; - font-weight: normal; - } - - > .list { - margin-top: 20px; - list-style: none; - - > .item { - @include content-container(); - cursor: pointer; - margin-bottom: 30px; - - > .link { - text-decoration: none; - color: $color-off-black; - - &:hover { - color: $color-link; - } - - > .title { - display: inline-block; - font-size: 1.2rem; - } - - > .folder { - font-size: 0.8rem; - color: $color-gray; - margin-top: 5px; - } - - > .excerpt { - margin-top: 1rem; - font-size: 0.9rem; - } - - > .chips { - margin-top: 1rem; - } - } - } - } - } -} diff --git a/gui/app/styles/view/space.scss b/gui/app/styles/view/space.scss index f6ad1c69..137a2096 100644 --- a/gui/app/styles/view/space.scss +++ b/gui/app/styles/view/space.scss @@ -192,17 +192,6 @@ > .action { display: inline-block; } - - > .input-control { - margin: 0; - display: inline-block; - - > input { - margin: 0 0 8px 0; - padding: 0; - font-size: 1.2rem; - } - } } } } diff --git a/gui/app/styles/widget/widget-avatar.scss b/gui/app/styles/widget/widget-avatar.scss index 9828b58f..80fd504e 100644 --- a/gui/app/styles/widget/widget-avatar.scss +++ b/gui/app/styles/widget/widget-avatar.scss @@ -24,34 +24,3 @@ margin: 0 auto; } -.avatar-picker { - background-color: $color-off-white; - @include border-radius(20px); - @include ease-in(); - padding: 7px 0 0 0; - letter-spacing: 1px; - text-align: center; - height: 35px; - width: 35px; - cursor: pointer; - - &:hover { - > i { - color: $color-link; - } - } - - > i { - color: $color-gray; - font-size: 1.4rem; - @include ease-in(); - } -} - -.avatar-remover { - &:hover { - color: $color-white; - background-color: $color-red; - cursor: pointer; - } -} diff --git a/gui/app/styles/widget/widget-button.scss b/gui/app/styles/widget/widget-button.scss index 2b931b54..b4b175e5 100644 --- a/gui/app/styles/widget/widget-button.scss +++ b/gui/app/styles/widget/widget-button.scss @@ -1,323 +1,4 @@ // Copyright (c) 2015 Documize Inc. - -@mixin button-hover-state($bg) { - &:hover { - background-color: lighten($bg, 3%); - @extend .z-depth-tiny; - } -} - -.square-button-mono { - display: inline-block; - position: relative; - overflow: hidden; - width: 32px; - height: 32px; - line-height: 31px; - padding: 0; - border-radius: 2px; - transition: .3s; - cursor: pointer; - vertical-align: middle; - border: 1px solid $color-gray; - text-align: center; - @extend .no-select; - @include ease-in(); - - &:hover { - @extend .z-depth-tiny; - } - - i { - color: $color-gray; - text-align: center; - } - - &:before { - border-radius: 0; - } -} - -.round-button-mono { - @extend .no-select; - @include ease-in(); - display: inline-block; - position: relative; - overflow: hidden; - width: 35px; - height: 35px; - line-height: 34px; - padding: 0; - border-radius: 50%; - transition: .3s; - cursor: pointer; - vertical-align: middle; - border: 1px solid $color-stroke; - text-align: center; - font-size: 1.2rem; - background-color: transparent; - - &:hover { - @extend .z-depth-tiny; - } - - i { - color: $color-stroke; - text-align: center; - width: 100%; - } - - &:before { - border-radius: 0; - } -} - -.square-button-white { - display: inline-block; - position: relative; - overflow: hidden; - width: 32px; - height: 32px; - line-height: 31px; - padding: 0; - border-radius: 2px; - transition: .3s; - cursor: pointer; - vertical-align: middle; - background-color: $color-white; - border: 1px solid $color-stroke; - text-align: center; - @extend .no-select; - @include ease-in(); - - &:hover { - @extend .z-depth-tiny; - } - - i { - color: $color-gray; - text-align: center; - } - - &:before { - border-radius: 0; - } -} - -.button-red-text { - &:hover { - > .material-icons { - @include ease-in(); - color: $color-red !important; - } - } -} - -.round-button { - display: inline-block; - position: relative; - overflow: hidden; - width: 35px; - height: 35px; - line-height: 36px; - padding: 0; - border-radius: 50%; - transition: .3s; - cursor: pointer; - vertical-align: middle; - text-align: center; - @extend .no-select; - @include ease-in(); - font-size: 1.2rem; - - > i { - color: $color-white; - } - - &:before { - border-radius: 0; - } -} - -.round-button-small { - width: 20px; - height: 20px; - line-height: 20px; - font-size: 0.9rem; - - > .material-icons { - font-size: 0.9rem; - } -} - -.square-button { - display: inline-block; - position: relative; - overflow: hidden; - width: 32px; - height: 32px; - line-height: 34px; - padding: 0; - border-radius: 2px; - transition: .3s; - cursor: pointer; - vertical-align: middle; - text-align: center; - @extend .no-select; - @include ease-in(); - - > i { - color: $color-white; - } - - &:before { - border-radius: 0; - } -} - -.regular-button { - text-decoration: none; - padding: 0 1rem; - text-align: center; - letter-spacing: .5px; - transition: .2s ease-out; - border-radius: 2px; - display: inline-block; - height: 32px; - line-height: 34px; - font-size: 0.9em; - outline: 0; - text-transform: uppercase; - vertical-align: middle; - -webkit-tap-highlight-color: transparent; - color: $color-white; - cursor: pointer; - border: none; - @extend .no-select; - @include ease-in(); - - > .name { - vertical-align: top; - display: inline-block; - } -} - -.button-red { - background-color: $color-red; - @include button-hover-state($color-red); -} - -.button-blue { - background-color: $color-blue; - @include button-hover-state($color-blue); -} - -.button-green { - background-color: $color-green; - @include button-hover-state($color-green); -} - -.button-gray { - background-color: $color-gray; - @include button-hover-state($color-gray); -} - -.button-white { - border: 1px solid $color-stroke; - background-color: $color-white; - color: $color-blue; - @include button-hover-state($color-white); -} - -.button-black { - border: none; - background-color: $color-off-black; - color: $color-white; - @include button-hover-state($color-black); -} - -.button-transparent { - background-color: transparent; - color: $color-gray; - border: 1px solid $color-gray; -} - -.button-nav { - background-color: $color-nav-button; - color: $color-nav-button-text; - border: 1px solid $color-sidebar-border; -} - -.flat-button { - box-shadow: none; - background-color: transparent; - color: $color-off-black; - cursor: pointer; - border: 1px solid transparent; - text-decoration: none; - padding: 0 0.7rem; - text-align: center; - letter-spacing: .5px; - transition: .2s ease-out; - border-radius: 2px; - display: inline-block; - height: 33px; - line-height: 34px; - font-size: 0.9em; - outline: 0; - text-transform: uppercase; - vertical-align: middle; - -webkit-tap-highlight-color: transparent; - @extend .no-select; - @include ease-in(); - - &:hover { - box-shadow: none; - border: 1px solid #e2e2e2; - } - - &:active { - background-color: $color-off-white; - } -} - -.flat-red { - color: $color-red; - - &:hover { - border: 1px solid $color-red; - } -} - -.flat-blue { - color: $color-blue; - - &:hover { - border: 1px solid $color-blue; - } -} - -.flat-green { - color: $color-green; - - &:hover { - border: 1px solid $color-green; - } -} - -.flat-gray { - color: $color-gray; - - &:hover { - border: 1px solid $color-gray; - } -} - - -// -// Bootstrap 4 compatible -// - .button-gap { width: 5px; margin: 0; diff --git a/gui/app/styles/widget/widget-card.scss b/gui/app/styles/widget/widget-card.scss deleted file mode 100644 index 5ec65366..00000000 --- a/gui/app/styles/widget/widget-card.scss +++ /dev/null @@ -1,68 +0,0 @@ -.base-card { - border: 1px solid $color-border; - display: inline-block; - border-radius : 3px; - background-color: $color-white; - - &:hover { - @extend .z-depth-half; - background-color: $color-selected-item; - border-color: $color-selected-item; - transition: 0.2s all ease; - } -} - -.content-card { - @extend .base-card; - margin: 0 12px 12px 0; - padding: 20px 20px; - width: 200px; - height: 250px; - position: relative; - - .title { - font-size: 1rem; - font-family: "open_sanssemibold"; - height: 3rem; - overflow: hidden; - margin-bottom: 0.75rem; - } - - .snippet { - font-size: 0.8rem; - line-height: 1.1rem; - height: 2rem; - overflow: hidden; - margin-bottom: 0.75rem; - } -} - -.stacked-card { - @extend .base-card; - padding: 20px 20px; - position: relative; - - .title { - font-size: 1rem; - font-family: "open_sanssemibold"; - margin-bottom: 0.75rem; - color: $color-off-black; - } - - .snippet { - font-size: 0.8rem; - line-height: 1.1rem; - margin-bottom: 0.75rem; - color: $color-stroke; - } -} - -.cards-list { - margin: 0; - padding: 0; - - > li { - list-type: none; - float: left; - } -} diff --git a/gui/app/styles/widget/widget-checkbox.scss b/gui/app/styles/widget/widget-checkbox.scss index 82b5ab5c..1321e530 100644 --- a/gui/app/styles/widget/widget-checkbox.scss +++ b/gui/app/styles/widget/widget-checkbox.scss @@ -31,3 +31,12 @@ .ui-checkbox-selected { color: $color-link; } + +.widget-checkbox { + color: $color-link; + cursor: pointer; +} + +.checkbox-gray { + color: $color-gray !important; +} diff --git a/gui/app/styles/widget/widget-chip.scss b/gui/app/styles/widget/widget-chip.scss deleted file mode 100644 index dd483ef0..00000000 --- a/gui/app/styles/widget/widget-chip.scss +++ /dev/null @@ -1,21 +0,0 @@ -.chip { - display: inline-block; - border-radius: 3px; - padding: 0; - height: 25px; - line-height: 0; - margin: 0 5px 10px 0; - border: 1px solid $color-gray; - background-color: $color-gray; - color: $color-white; - - > .chip-text { - display: inline-block; - font-weight: 400; - font-size: 1rem; - color: $color-white; - padding: 11px 10px 0 10px; - letter-spacing: 0.7px; - line-height: 0; - } -} diff --git a/gui/app/styles/widget/widget-input.scss b/gui/app/styles/widget/widget-input.scss deleted file mode 100644 index c3b3da7c..00000000 --- a/gui/app/styles/widget/widget-input.scss +++ /dev/null @@ -1,264 +0,0 @@ -* { - box-sizing: border-box; -} - -.input-control { - position: relative; - margin-bottom: 50px; - - > label { - color: $color-input; - font-size: 1.1em; - font-weight: normal; - font-family: $font-semibold; - pointer-events: none; - } - - > .tip { - color: $color-gray; - font-size: 0.9em; - margin: 5px 0 10px; - padding: 0; - text-align: left; - font-family: $font-light; - } - - > input, - textarea { - font-size: 1em; - padding: 8px 0 10px; - margin: 0 0 15px; - display: block; - width: 100%; - border: none; - border-bottom: 1px solid $color-input; - height: 2.5rem; - outline: none; - - &:focus { - outline: none; - border-bottom: 1px solid $color-primary !important; - box-shadow: 0 1px 0 0 $color-primary !important; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - } - - > textarea { - resize: none; - height: auto !important; - overflow-y: hidden; - } - - > select, - > div select { - background-color: $color-white; - padding: 5px; - border: 1px solid $color-input; - border-radius: 2px; - height: 2.5rem; - font-size: 1rem; - display: inline-block; - - &:focus { - outline: none; - border: 1px solid $color-input !important; - box-shadow: none !important; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - } - - > .checkbox { - width: 100%; - font-size: 1em; - padding: 8px 0 10px; - margin: 0 0 15px; - display: inline-block; - border: none; - border-bottom: 1px solid $color-input; - height: 2.5rem; - outline: none; - - &:hover { - outline: none; - border-bottom: 1px solid $color-input !important; - box-shadow: 0 1px 0 0 $color-input !important; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - - > input[type='checkbox'] { - font-size: 1em; - padding: 8px 0 10px; - margin: 0 0 15px 5px; - display: inline-block; - border: none; - border-bottom: none; - height: 1rem; - outline: none; - - &:focus { - outline: none; - border-bottom: none !important; - box-shadow: none !important; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - } - - > label { - color: $color-off-black; - font-size: 1em; - font-weight: normal; - pointer-events: none; - display: inline-block; - margin-left: 5px; - } - } - - .error { - border-color: $color-red; - - &:focus { - border-bottom: 1px solid $color-red !important; - box-shadow: 0 1px 0 0 $color-red !important; - } - } - - select.error { - border-color: $color-red; - - &:focus { - border: 1px solid $color-red !important; - box-shadow: none !important; - } - } -} - -.input-inline { - display: inline-block; - cursor: default; - width: 97%; - - > input { - font-size: 1em; - padding: 0; - margin: 0; - width: 100%; - border: none; - height: auto; - outline: none; - display: inline-block; - - &:focus { - outline: none; - border-bottom: none !important; - box-shadow: none !important; - } - } - - .error-inline { - border-left: 3px solid $color-red; - } -} - -.input-transparent { - background-color: transparent !important; - - > input, textarea { - background-color: transparent !important; - } -} - -.form-bordered { - padding: 30px 40px; - border: 10px solid $color-border; - @include border-radius(15px); -} - -.form-header { - > .title { - font-size: 1.4rem; - font-weight: normal; - font-family: $font-semibold; - pointer-events: none; - font-weight: bold; - color: $color-off-black; - @extend .no-select; - } - - > .tip { - color: $color-input; - font-size: 1.2rem; - margin: 5px 0 30px; - padding: 0; - font-family: $font-light; - text-align: left; - @extend .no-select; - } -} - -.form-header-sticky { - @include sticky(); - top: 0; - padding: 20px 0; - background-color: $color-white; - - > .left-zone { - float: left; - text-align: left; - width: 65%; - background-color: $color-white; - - > .title { - font-size: 1.4rem; - font-weight: normal; - font-family: $font-semibold; - pointer-events: none; - font-weight: bold; - color: $color-off-black; - @extend .no-select; - } - - > .tip { - color: $color-input; - font-size: 1.2rem; - margin: 5px 0 30px; - padding: 0; - font-family: $font-light; - text-align: left; - @extend .no-select; - } - } - - > .right-zone { - float: right; - text-align: right; - width: 30%; - background-color: $color-white; - } -} - -.form-divider { - margin-top: 30px; -} - -.widget-checkbox { - color: $color-link; - cursor: pointer; -} - -.checkbox-gray { - color: $color-gray !important; -} - - - -// -// Bootstrap 4 compatible -// diff --git a/gui/app/styles/widget/widget-notification.scss b/gui/app/styles/widget/widget-notification.scss index 831ec9e1..5b899230 100644 --- a/gui/app/styles/widget/widget-notification.scss +++ b/gui/app/styles/widget/widget-notification.scss @@ -3,7 +3,7 @@ display: none; top: 20px; right: 20px; - background-color: $color-toast; + background-color: $color-off-black; color: $color-white; padding: 10px 15px; text-align: left; diff --git a/gui/app/styles/widget/widget-selection.scss b/gui/app/styles/widget/widget-selection.scss deleted file mode 100644 index aa761381..00000000 --- a/gui/app/styles/widget/widget-selection.scss +++ /dev/null @@ -1,34 +0,0 @@ -.widget-selection { - > .option { - width: 100%; - margin: 0; - padding: 5px 10px; - text-align: left; - @extend .no-select; - cursor: pointer; - // border: 1px solid $color-border; - color: $color-off-black; - position: relative; - - > i.material-icons { - display: none; - } - } - - &:hover { - @include ease-in(); - background-color: $color-off-white; - } - - > .selected { - background-color: $color-selected-item !important; - color: $color-primary !important; - - > i.material-icons { - display: inline-block; - position: absolute; - right: 10px; - top: 5px; - } - } -} diff --git a/gui/app/styles/widget/widget-sidebar-menu.scss b/gui/app/styles/widget/widget-sidebar-menu.scss deleted file mode 100644 index 03fd9496..00000000 --- a/gui/app/styles/widget/widget-sidebar-menu.scss +++ /dev/null @@ -1,27 +0,0 @@ -.sidebar-menu { - margin: 0; - - > .options { - padding: 0; - margin: 0; - - > .option { - margin-bottom: 15px; - font-size: 1.3rem; - list-style: none; - cursor: pointer; - color: $color-off-black; - @extend .no-select; - @include ease-in(); - - &:hover { - color: $color-link; - } - } - - > .selected { - color: $color-link; - font-weight: bold; - } - } -} diff --git a/gui/app/styles/widget/widget-tab.scss b/gui/app/styles/widget/widget-tab.scss deleted file mode 100644 index 281ddfef..00000000 --- a/gui/app/styles/widget/widget-tab.scss +++ /dev/null @@ -1,29 +0,0 @@ -.widget-tab { - width: 100%; - margin: 0; - padding: 0 10px; - text-align: center; - @extend .no-select; - - > .tab { - display: inline-block; - margin: 0; - padding: 5px 10px; - background-color: $color-off-white; - color: $color-gray; - text-align: center; - cursor: pointer; - margin-right: -3px; - - &:hover { - @include ease-in(); - background-color: $color-gray; - color: $color-off-white; - } - } - - > .selected { - background-color: $color-gray; - color: $color-off-white; - } -} diff --git a/gui/app/styles/widget/widget.scss b/gui/app/styles/widget/widget.scss index 03d5070a..e91acd3d 100644 --- a/gui/app/styles/widget/widget.scss +++ b/gui/app/styles/widget/widget.scss @@ -63,16 +63,10 @@ @import "widget-avatar"; @import "widget-button"; -@import "widget-card"; @import "widget-checkbox"; -@import "widget-chip"; -@import "widget-input"; @import "widget-list-picker"; @import "widget-notification"; @import "widget-radio"; -@import "widget-selection"; -@import "widget-sidebar-menu"; @import "widget-symbol"; -@import "widget-tab"; @import "widget-table"; @import "widget-tabnav"; diff --git a/gui/app/templates/components/document/content-linker.hbs b/gui/app/templates/components/document/content-linker.hbs index 971148fd..c1aafcac 100644 --- a/gui/app/templates/components/document/content-linker.hbs +++ b/gui/app/templates/components/document/content-linker.hbs @@ -51,7 +51,7 @@ {{#if showSearch}}
-
+
For content or attachments
{{focus-input id="content-linker-search" type="input" value=keywords placeholder="keyword search" autocomplete="off"}} diff --git a/gui/app/templates/components/document/document-index.hbs b/gui/app/templates/components/document/document-index.hbs deleted file mode 100644 index 4e206757..00000000 --- a/gui/app/templates/components/document/document-index.hbs +++ /dev/null @@ -1,31 +0,0 @@ -
-
- {{#if session.authenticated}} - {{#unless emptyState}} -