diff --git a/gui/app/components/layout/grid/sidebar-go-top.js b/gui/app/components/layout/grid/sidebar-go-top.js new file mode 100644 index 00000000..7d0e70c0 --- /dev/null +++ b/gui/app/components/layout/grid/sidebar-go-top.js @@ -0,0 +1,24 @@ +// 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 browser from '../../../services/browser'; +import Component from '@ember/component'; + +export default Component.extend({ + tagName: 'div', + classNames: ['goto-top'], + + actions: { + onClick() { + this.get('browser').scrollTo('html'); + } + } +}); diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index c5e2428c..cc5f1a83 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -232,6 +232,7 @@ let constants = EmberObject.extend({ Export2: 'dicon-upload', Filter: 'dicon-sort-tool', Grid: 'dicon-grid-interface', + GoTop: 'dicon-move-layer-up', Handshake: 'dicon-handshake', Index: 'dicon-menu-8', Integrations: 'dicon-geometry', diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index 98b4a04b..6a01bf2e 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -23,8 +23,8 @@
+
-
{{#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" diff --git a/gui/app/styles/core/icon-ui.scss b/gui/app/styles/core/icon-ui.scss index ed1d46ff..d82178ff 100644 --- a/gui/app/styles/core/icon-ui.scss +++ b/gui/app/styles/core/icon-ui.scss @@ -434,3 +434,7 @@ icons .dicon-menu-5::before { content: "\ea5c"; } + +.dicon-move-layer-up::before { + content: "\ea5d"; +} diff --git a/gui/app/styles/core/layout/layout.scss b/gui/app/styles/core/layout/layout.scss index 25516af1..a8385596 100644 --- a/gui/app/styles/core/layout/layout.scss +++ b/gui/app/styles/core/layout/layout.scss @@ -36,6 +36,9 @@ $sidebar-height: auto; // overflow-x: hidden; // overflow-y: auto; padding: 20px 10px 20px 20px; + height: calc(100vh - 150px); + @include sticky(); + top: 0px; } .master-content { diff --git a/gui/app/styles/core/layout/sidebar.scss b/gui/app/styles/core/layout/sidebar.scss index f9ea09fd..6cfe007b 100644 --- a/gui/app/styles/core/layout/sidebar.scss +++ b/gui/app/styles/core/layout/sidebar.scss @@ -7,6 +7,19 @@ // background-color: map-get($gray-shades, 100); @include border-radius(6px); + > .goto-top { + position: absolute; + top: 7px; + left: 10px; + cursor: pointer; + color: map-get($gray-shades, 500); + font-size: 1rem; + + &:hover { + color: map-get($gray-shades, 800); + } + } + > .section { margin: 0; padding: 0 7px; diff --git a/gui/app/templates/components/layout/grid/sidebar-go-top.hbs b/gui/app/templates/components/layout/grid/sidebar-go-top.hbs new file mode 100644 index 00000000..343ebf6a --- /dev/null +++ b/gui/app/templates/components/layout/grid/sidebar-go-top.hbs @@ -0,0 +1,3 @@ + + {{#attach-tooltip showDelay=750}}Scroll to top{{/attach-tooltip}} + diff --git a/gui/public/assets/font/dmzui.eot b/gui/public/assets/font/dmzui.eot index ea2447d0..262d1001 100644 Binary files a/gui/public/assets/font/dmzui.eot and b/gui/public/assets/font/dmzui.eot differ diff --git a/gui/public/assets/font/dmzui.svg b/gui/public/assets/font/dmzui.svg index 5a5e3014..6a2e7171 100644 --- a/gui/public/assets/font/dmzui.svg +++ b/gui/public/assets/font/dmzui.svg @@ -214,6 +214,9 @@ + diff --git a/gui/public/assets/font/dmzui.ttf b/gui/public/assets/font/dmzui.ttf index 0c96e1cb..778514ff 100644 Binary files a/gui/public/assets/font/dmzui.ttf and b/gui/public/assets/font/dmzui.ttf differ diff --git a/gui/public/assets/font/dmzui.woff b/gui/public/assets/font/dmzui.woff index 3592138d..b31d3de8 100644 Binary files a/gui/public/assets/font/dmzui.woff and b/gui/public/assets/font/dmzui.woff differ diff --git a/gui/public/assets/font/dmzui.woff2 b/gui/public/assets/font/dmzui.woff2 index 30319f9e..da545caf 100644 Binary files a/gui/public/assets/font/dmzui.woff2 and b/gui/public/assets/font/dmzui.woff2 differ