diff --git a/gui/app/components/layout/bottom-bar.js b/gui/app/components/layout/bottom-bar.js index 53d32cf2..caa42c42 100644 --- a/gui/app/components/layout/bottom-bar.js +++ b/gui/app/components/layout/bottom-bar.js @@ -9,10 +9,11 @@ // // https://documize.com -// import $ from 'jquery'; +import { inject as service } from '@ember/service'; import Component from '@ember/component'; export default Component.extend({ classNames: ['layout-footer'], - tagName: 'footer' + tagName: 'footer', + appMeta: service() }); diff --git a/gui/app/components/layout/content-area.js b/gui/app/components/layout/middle-zone-content.js similarity index 100% rename from gui/app/components/layout/content-area.js rename to gui/app/components/layout/middle-zone-content.js diff --git a/gui/app/components/layout/side-bar.js b/gui/app/components/layout/middle-zone-sidebar.js similarity index 100% rename from gui/app/components/layout/side-bar.js rename to gui/app/components/layout/middle-zone-sidebar.js diff --git a/gui/app/components/layout/middle-zone.js b/gui/app/components/layout/middle-zone.js new file mode 100644 index 00000000..c9ddc68b --- /dev/null +++ b/gui/app/components/layout/middle-zone.js @@ -0,0 +1,18 @@ +// 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 $ from 'jquery'; +import Component from '@ember/component'; + +export default Component.extend({ + classNames: ['layout-body'], + tagName: 'main' +}); diff --git a/gui/app/pods/theming/template.hbs b/gui/app/pods/theming/template.hbs index 60e42df8..4381679b 100644 --- a/gui/app/pods/theming/template.hbs +++ b/gui/app/pods/theming/template.hbs @@ -7,8 +7,8 @@ {{/layout/top-bar}} -
- {{#layout/content-area}} +{{#layout/middle-zone}} + {{#layout/middle-zone-content}}

How to install this

Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment. @@ -40,21 +40,22 @@

Podcasting operational change management inside of workflows to establish a framework. Taking seamless key performance indicators offline to maximise the long tail. Keeping your eye on the ball while performing a deep dive on the start-up mentality to derive convergence on cross-platform integration.

- {{/layout/content-area}} + {{/layout/middle-zone-content}} - {{#layout/side-bar}} -

Hello Sidebar

-

Something

-

Something

-

Something

-

Something

-

Something

-

Something

-

Something

-

Something

- {{/layout/side-bar}} -
+ {{#layout/middle-zone-sidebar}} + + {{/layout/middle-zone-sidebar}} +{{/layout/middle-zone}} {{#layout/bottom-bar}} - Hello {{/layout/bottom-bar}} \ No newline at end of file diff --git a/gui/app/styles/color.scss b/gui/app/styles/color.scss index c51ce3ad..d200d287 100644 --- a/gui/app/styles/color.scss +++ b/gui/app/styles/color.scss @@ -18,6 +18,7 @@ $color-link: #348A37; // theme purple $color-primary: #280A42; $color-primary-light: #F7F2FF; +$color-link: #348A37; // black, white $color-black: #000000; diff --git a/gui/app/styles/layout/layout-footer.scss b/gui/app/styles/layout/layout-footer.scss index 42e8d704..e8a02457 100644 --- a/gui/app/styles/layout/layout-footer.scss +++ b/gui/app/styles/layout/layout-footer.scss @@ -1,9 +1,20 @@ -.footer { +footer { background-color: $color-off-white; background-color: $color-primary-light; - // border-top: 1px solid $color-gray-light2; - color: $color-gray; + color: $color-dark; font-weight: 500; font-size: 0.9rem; padding: 10px 2rem; } + +.footer { + a, a:visited { + @include ease-in(); + color: $color-primary; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } +} diff --git a/gui/app/styles/layout/layout-sidebar.scss b/gui/app/styles/layout/layout-sidebar.scss index a259c456..0b810a15 100644 --- a/gui/app/styles/layout/layout-sidebar.scss +++ b/gui/app/styles/layout/layout-sidebar.scss @@ -1,13 +1,7 @@ .sidebar { - padding: 2rem; - background-color: $color-white; - // border: 1px solid $color-border; - // @include border-radius(4px); - - // @include border-radius(4px); - // border: 1px solid $color-gray-light2; - // padding: 1rem; - // // padding: 30px 20px; - // height: calc(100vh - 145px); - // width: 350px; + padding: 1rem; +} + +.sidebar-white { + background-color: $color-white; } diff --git a/gui/app/templates/components/layout/bottom-bar.hbs b/gui/app/templates/components/layout/bottom-bar.hbs index a45dae2c..c87a1427 100644 --- a/gui/app/templates/components/layout/bottom-bar.hbs +++ b/gui/app/templates/components/layout/bottom-bar.hbs @@ -1,3 +1,12 @@ -