diff --git a/domain/section/papertrail/model.go b/domain/section/papertrail/model.go index e61f056f..ad952a19 100644 --- a/domain/section/papertrail/model.go +++ b/domain/section/papertrail/model.go @@ -28,7 +28,7 @@ const renderTemplate = ` {{range $item := .Events}} - {{ $item.Dated }} + {{ $item.Dated }} {{ $item.Severity }} {{ $item.Message }} diff --git a/gui/app/components/layout/master-sidebar.js b/gui/app/components/layout/master-sidebar.js index 5b1df645..3cc9a5ac 100644 --- a/gui/app/components/layout/master-sidebar.js +++ b/gui/app/components/layout/master-sidebar.js @@ -13,10 +13,9 @@ import $ from 'jquery'; import { notEmpty } from '@ember/object/computed'; import { inject as service } from '@ember/service' import Modals from '../../mixins/modal'; -import Tooltips from '../../mixins/tooltip'; import Component from '@ember/component'; -export default Component.extend(Tooltips, Modals, { +export default Component.extend(Modals, { tagName: 'div', classNames: ['master-sidebar-container', 'non-printable'], selectedItem: 'spaces', @@ -71,8 +70,6 @@ export default Component.extend(Tooltips, Modals, { this.eventBus.subscribe('pinChange', this, 'setupPins'); this.setupPins(); } - - this.renderTooltips(); }, setupPins() { @@ -91,7 +88,6 @@ export default Component.extend(Tooltips, Modals, { willDestroyElement() { this._super(...arguments); - this.removeTooltips(); this.eventBus.unsubscribe('pinChange'); }, diff --git a/gui/app/models/document-activity.js b/gui/app/models/document-activity.js index 166a7299..5e3b9347 100644 --- a/gui/app/models/document-activity.js +++ b/gui/app/models/document-activity.js @@ -76,37 +76,37 @@ export default Model.extend({ switch (this.get('activityType')) { case constants.UserActivityType.Created: - color = 'color-blue'; + color = 'color-gray-700'; break; case constants.UserActivityType.Read: color = 'color-black'; break; case constants.UserActivityType.Edited: - color = 'color-green'; + color = 'color-green-700'; break; case constants.UserActivityType.Deleted: - color = 'color-red'; + color = 'color-red-600'; break; case constants.UserActivityType.Archived: - color = 'color-gray'; + color = 'color-gray-700'; break; case constants.UserActivityType.Approved: - color = 'color-green'; + color = 'color-green-700'; break; case constants.UserActivityType.Reverted: - color = 'color-red'; + color = 'color-red-600'; break; case constants.UserActivityType.PublishedTemplate: - color = 'color-blue'; + color = 'color-gray-700'; break; case constants.UserActivityType.PublishedBlock: - color = 'color-blue'; + color = 'color-gray-700'; break; case constants.UserActivityType.Rejected: - color = 'color-red'; + color = 'color-red-600'; break; case constants.UserActivityType.Published: - color = 'color-green'; + color = 'color-green-700'; break; default: break; diff --git a/gui/app/pods/auth/forgot/route.js b/gui/app/pods/auth/forgot/route.js index 47806f38..be4422c1 100644 --- a/gui/app/pods/auth/forgot/route.js +++ b/gui/app/pods/auth/forgot/route.js @@ -31,10 +31,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Forgot Password'); - $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').addClass('background-color-theme-100 d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').removeClass('background-color-theme-100 d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/login/route.js b/gui/app/pods/auth/login/route.js index f5475f82..d63f044c 100644 --- a/gui/app/pods/auth/login/route.js +++ b/gui/app/pods/auth/login/route.js @@ -62,10 +62,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Login'); - $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').addClass('background-color-theme-100 d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').removeClass('background-color-theme-100 d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs index 30521edb..674ccb3f 100644 --- a/gui/app/pods/auth/login/template.hbs +++ b/gui/app/pods/auth/login/template.hbs @@ -27,7 +27,7 @@ {{/if}} -
Invalid credentials
+
Invalid credentials
{{#if isAuthProviderDocumize}} {{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}} {{/if}} diff --git a/gui/app/pods/auth/reset/route.js b/gui/app/pods/auth/reset/route.js index de103902..b8777d84 100644 --- a/gui/app/pods/auth/reset/route.js +++ b/gui/app/pods/auth/reset/route.js @@ -19,10 +19,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Reset Password'); - $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').addClass('background-color-theme-100 d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); + $('body').removeClass('background-color-theme-100 d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/share/route.js b/gui/app/pods/auth/share/route.js index 6d574501..4c4a9797 100644 --- a/gui/app/pods/auth/share/route.js +++ b/gui/app/pods/auth/share/route.js @@ -37,10 +37,10 @@ export default Route.extend(AuthenticatedRouteMixin, { activate() { this.get('browser').setTitle('Share Space'); - $('body').addClass('background-color-off-white'); + $('body').addClass('background-color-gray-200'); }, deactivate() { - $('body').removeClass('background-color-off-white'); + $('body').removeClass('background-color-gray-200'); } }); diff --git a/gui/app/pods/setup/route.js b/gui/app/pods/setup/route.js index 57c74bd8..f2edf261 100644 --- a/gui/app/pods/setup/route.js +++ b/gui/app/pods/setup/route.js @@ -38,11 +38,11 @@ export default Route.extend({ }, activate() { - $('body').addClass('background-color-theme-light'); + $('body').addClass('background-color-theme-100'); document.title = "Documize Setup"; }, deactivate() { - $('body').removeClass('background-color-theme-light'); + $('body').removeClass('background-color-theme-100'); } }); diff --git a/gui/app/styles/app.scss b/gui/app/styles/app.scss index 190ec425..5d0ae085 100644 --- a/gui/app/styles/app.scss +++ b/gui/app/styles/app.scss @@ -9,21 +9,6 @@ // // https://documize.com -@import "core/color.scss"; -@import "core/font.scss"; -@import "core/icon.scss"; -@import "core/mixins.scss"; -@import "core/base.scss"; -@import "core/bootstrap.scss"; +@import "colors.scss"; +@import "core/all.scss"; -@import "core/view/common.scss"; -@import "core/widget/widget.scss"; -@import "core/view/toolbar.scss"; -@import "core/view/views.scss"; -@import "core/layout/all.scss"; - -@import "core/vendor.scss"; -@import "core/print.scss"; -@import "core/news.scss"; -@import "core/section/all.scss"; -@import "core/enterprise/all.scss"; diff --git a/gui/app/styles/colors.scss b/gui/app/styles/colors.scss new file mode 100644 index 00000000..04ea1f53 --- /dev/null +++ b/gui/app/styles/colors.scss @@ -0,0 +1,179 @@ +// 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 + +/************************************************************** +* A color has 9 shades. +* The base of the color is (usually) anchored with a suffix of 500. +* The lightest shade is suffixed as 100. +* The darkest shade is suffixed as 900. +**************************************************************/ + +/************************************************************** +* Gray, Grey shades +**************************************************************/ +$gray-shades: ( + 900: #1F2833, + 800: #404B5A, + 700: #6E7A89, + 600: #929FB1, + 500: #AEBECC, + 400: #CBD4DB, + 300: #D5DDE5, + 200: #E1E7EB, + 100: #F8F9FA +); + +// Generate handy classes for text color and background color. +$i: 900; +@while $i > 0 { + .color-gray-#{$i} { + color: map-get($gray-shades, $i); + } + .background-color-gray-#{$i} { + background-color: map-get($gray-shades, $i); + } + $i: $i - 100; +} + +/************************************************************** +* Danger color ("red") shades +**************************************************************/ +$red-shades: ( + 900: #431010, + 800: #621111, + 700: #8E1818, + 600: #AB1D1D, + 500: #D72424, + 400: #E14D4D, + 300: #E66A6A, + 200: #F2B3B3, + 100: #FCEDED +); + +$i: 900; +@while $i > 0 { + .color-red-#{$i} { + color: map-get($red-shades, $i); + } + .background-color-red-#{$i} { + background-color: map-get($red-shades, $i); + } + $i: $i - 100; +} + +/************************************************************** +* Information color ("yellow") shades +**************************************************************/ +$yellow-shades: ( + 900: #433105, + 800: #936B0A, + 700: #C28E0E, + 600: #EEAF15, + 500: #F4CA64, + 400: #F7DA94, + 300: #FAE5B3, + 200: #FCF0D3, + 100: #FDF5E3 +); + +$i: 900; +@while $i > 0 { + .color-yellow-#{$i} { + color: map-get($yellow-shades, $i); + } + .background-color-yellow-#{$i} { + background-color: map-get($yellow-shades, $i); + } + $i: $i - 100; +} + +/************************************************************** +* Success color ("green") shades +**************************************************************/ +$green-shades: ( + 900: #0E311D, + 800: #164B2C, + 700: #227243, + 600: #2D9A5A, + 500: #39C171, + 400: #6BD396, + 300: #92DFB2, + 200: #B9EACE, + 100: #E1F6EA +); + +$i: 900; +@while $i > 0 { + .color-green-#{$i} { + color: map-get($green-shades, $i); + } + .background-color-green-#{$i} { + background-color: map-get($green-shades, $i); + } + $i: $i - 100; +} + +/************************************************************** +* Black to lighter shades +**************************************************************/ +$color-black: #000000; +$color-black-light-1: #1c1c1c; +$color-black-light-2: #252525; +$color-black-light-3: #434343; + +.color-black { color: $color-black; } +.color-black-light-1 { color: $color-black-light-1; } +.color-black-light-2 { color: $color-black-light-2; } +.color-black-light-3 { color: $color-black-light-3; } +.background-color-black { background-color: $color-black; } +.background-color-black-light-1 { background-color: $color-black-light-1; } +.background-color-black-light-2 { background-color: $color-black-light-2; } +.background-color-black-light-3 { background-color: $color-black-light-3; } + +/************************************************************** +* White to darker shades +**************************************************************/ +$color-white: #ffffff; +$color-white-dark-1: #f5f5f5; + +.color-white { color: $color-white; } +.color-white-dark-1 { color: $color-white-dark-1; } +.background-color-white { background-color: $color-white; } +.background-color-white-dark-1 { background-color: $color-white-dark-1; } + +/************************************************************** +* Specialty colors +**************************************************************/ + +// Documents, spaces card background color +$color-card: #F6F4EE; + +/************************************************************** +* Theme colors. +* +* This is the default theme of PURPLE. +* +* We go from 100 (lightest) to 900 (darkest). +* Base shade is 500 and is used prominmently as the +* left-side navigation sidebar color. +**************************************************************/ +$theme-900: #160624; +$theme-800: #1F0833; +$theme-700: #310C51; +$theme-600: #4C137D; +$theme-500: #43116E; +$theme-400: #9237E1; +$theme-300: #CA9EF0; +$theme-200: #EAD9F9; +$theme-100: #FBF7FE; + +// Set hyperlink color for theme +$color-link: map-get($green-shades, 700); diff --git a/gui/app/styles/core/all.scss b/gui/app/styles/core/all.scss new file mode 100644 index 00000000..57ccbfee --- /dev/null +++ b/gui/app/styles/core/all.scss @@ -0,0 +1,49 @@ +// 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 + +// Theme color utility classes. +.color-theme-900 { color: $theme-900; } +.color-theme-800 { color: $theme-800; } +.color-theme-700 { color: $theme-700; } +.color-theme-600 { color: $theme-600; } +.color-theme-500 { color: $theme-500; } +.color-theme-400 { color: $theme-400; } +.color-theme-300 { color: $theme-300; } +.color-theme-200 { color: $theme-200; } +.color-theme-100 { color: $theme-100; } +.background-color-theme-900 { background-color: $theme-900; } +.background-color-theme-800 { background-color: $theme-800; } +.background-color-theme-700 { background-color: $theme-700; } +.background-color-theme-600 { background-color: $theme-600; } +.background-color-theme-500 { background-color: $theme-500; } +.background-color-theme-400 { background-color: $theme-400; } +.background-color-theme-300 { background-color: $theme-300; } +.background-color-theme-200 { background-color: $theme-200; } +.background-color-theme-100 { background-color: $theme-100; } + +@import "font.scss"; +@import "icon.scss"; +@import "mixins.scss"; +@import "base.scss"; +@import "bootstrap.scss"; + +@import "view/common.scss"; +@import "widget/widget.scss"; +@import "ui/all.scss"; +@import "view/toolbar.scss"; +@import "view/views.scss"; +@import "layout/all.scss"; + +@import "vendor.scss"; +@import "print.scss"; +@import "news.scss"; +@import "section/all.scss"; +@import "enterprise/all.scss"; diff --git a/gui/app/styles/core/base.scss b/gui/app/styles/core/base.scss index 75f5d3da..12d5785b 100644 --- a/gui/app/styles/core/base.scss +++ b/gui/app/styles/core/base.scss @@ -34,7 +34,6 @@ a { cursor: pointer; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - // text-shadow: 1px 1px 1px rgba(0,0,0,0.004); a:focus, a:hover { @@ -43,7 +42,6 @@ a { } a.admin-link { - // color: $color-gray; text-decoration: none; font-weight: bold; @@ -54,7 +52,7 @@ a.admin-link { } a.broken-link { - color: $color-red; + color: map-get($red-shades, 600); text-decoration: line-through; } @@ -118,7 +116,7 @@ input:-webkit-autofill { } .bordered { - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); } .text-truncate { @@ -131,13 +129,13 @@ input:-webkit-autofill { width: 7px; } ::-webkit-scrollbar-track { - background: $color-off-white; + background: map-get($gray-shades, 100); } ::-webkit-scrollbar-thumb { - background: $color-gray-light; + background: map-get($gray-shades, 300); &:hover { - background: $color-gray; + background: map-get($gray-shades, 600); } } diff --git a/gui/app/styles/core/bootstrap.scss b/gui/app/styles/core/bootstrap.scss index c9221e8f..8ce20717 100644 --- a/gui/app/styles/core/bootstrap.scss +++ b/gui/app/styles/core/bootstrap.scss @@ -18,20 +18,20 @@ // $font-family-sans-serif: "Helvetica", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; // colors -$blue: $color-primary; -$red: $color-red; -$green: $color-green; -$secondary: $color-gray; +$blue: $theme-500; +$red: map-get($red-shades, 600); +$green: map-get($green-shades, 700); +$secondary: map-get($gray-shades, 600); $light: $color-white; -$dark: $color-off-black; +$dark: $color-black-light-1; // popover $popover-bg: $color-white; -$popover-header-bg: $color-dark; +$popover-header-bg: map-get($gray-shades, 800); $popover-header-color: $color-white; // tooltip -$tooltip-bg: $color-dark; +$tooltip-bg: map-get($gray-shades, 800); $tooltip-color: $color-white; // modal @@ -40,8 +40,8 @@ $modal-header-border-color: $color-white; $modal-footer-border-color: $color-white; .modal-header { - background-color: $color-primary; - color: $color-off-white; + background-color: $theme-500; + color: map-get($gray-shades, 100); font-size: 1.2rem; } @@ -54,7 +54,7 @@ $border-radius-lg: .15rem; $border-radius-sm: .1rem; // dropdown -$dropdown-link-color: $color-off-black; +$dropdown-link-color: $color-black-light-1; $dropdown-link-hover-color: $color-link; $dropdown-link-hover-bg: $color-white; $dropdown-link-active-color: $color-link; @@ -62,20 +62,20 @@ $dropdown-link-active-bg: $color-white; $dropdown-header-color: $color-black; // form -$input-color: $color-off-black; -$input-border-color: $color-stroke; +$input-color: $color-black-light-1; +$input-border-color: map-get($gray-shades, 200); $input-focus-bg: $color-white; -$input-focus-border-color: $color-gray; -$input-focus-color: $color-off-black; -$input-placeholder-color: $color-gray; -$input-focus-border-color: $color-stroke; +$input-focus-border-color: map-get($gray-shades, 600); +$input-focus-color: $color-black-light-1; +$input-placeholder-color: map-get($gray-shades, 600); +$input-focus-border-color: map-get($gray-shades, 200); $input-btn-focus-width: .2rem; -$input-btn-focus-color: rgba($color-primary, .25); +$input-btn-focus-color: rgba($theme-500, .25); // form labels .form-group { > label { - color: $color-dark; + color: map-get($gray-shades, 800); font-size: 1.2rem; font-weight: 500; } @@ -86,7 +86,7 @@ $input-btn-focus-color: rgba($color-primary, .25); > small.highlight, > div[class*="col"] > small.highlight { font-size: 1rem; - color: $color-orange !important; + color: map-get($yellow-shades, 700) !important; } } @@ -142,7 +142,7 @@ body.modal-open { border: none !important; > span { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 2rem; } } diff --git a/gui/app/styles/core/color.scss b/gui/app/styles/core/color.scss deleted file mode 100644 index 142bc92f..00000000 --- a/gui/app/styles/core/color.scss +++ /dev/null @@ -1,108 +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 - -// default theme makes things tick -$color-primary: #280A42; -$color-primary-light: #F7F2FF; -$color-link: #348A37; - -// black, white -$color-black: #000000; -$color-off-black: #111111; -$color-white: #ffffff; -$color-off-white: #f5f5f5; - -// gray -$color-dark: #434343; -$color-gray: #8b9096; -$color-gray-light: #d8d8d8; -$color-gray-light2: #eaeaea; -$color-gray-light3: #f9f9f9; -$color-border: #d3d3d3; - -// colors -$color-red: #9E0D1F; -$color-green: #348A37; -$color-blue: #2667af; -$color-goldy: #FFD700; -$color-yellow: #fff8dc; -$color-orange: #FFAD15; - -// widgets -$color-checkbox: #2667af; -$color-symbol-box: #dce5e8; -$color-symbol-icon: #a4b8be; -$color-card: #F9F9F9; -$color-stroke: #e1e1e1; -$color-whats-new: #fc1530; - -// Color utility classes for direct usage in HTML -.color-white { - color: $color-white !important; -} -.color-off-white { - color: $color-off-white !important; -} -.color-black { - color: $color-black !important; -} -.color-off-black { - color: $color-off-black !important; -} -.color-primary { - color: $color-primary !important; -} -.color-link { - color: $color-link !important; -} -.color-blue { - color: $color-blue !important; -} -.color-red { - color: $color-red !important; -} -.color-green { - color: $color-green !important; -} -.color-gray { - color: $color-gray !important; -} -.color-gold { - color: $color-goldy !important; -} -.color-orange { - color: $color-orange !important; -} -.color-whats-new { - color: $color-whats-new !important; -} - -.background-color-white { - background-color: $color-white !important; -} -.background-color-off-white { - background-color: $color-off-white !important; -} -.background-color-off-black { - background-color: $color-off-black !important; -} -.background-color-green { - background-color: $color-green !important; -} -.background-color-theme { - background-color: $color-primary !important; -} -.background-color-theme-light { - background-color: $color-primary-light !important; -} -.background-color-gold { - background-color: $color-goldy !important; -} diff --git a/gui/app/styles/core/layout/layout-content.scss b/gui/app/styles/core/layout/layout-content.scss index c78d9e01..a315fce5 100644 --- a/gui/app/styles/core/layout/layout-content.scss +++ b/gui/app/styles/core/layout/layout-content.scss @@ -1,6 +1,6 @@ .content-zone { > .explainer-header { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.5rem; font-weight: 500; } @@ -8,14 +8,14 @@ > .explainer-text { margin: 3px 0; padding: 0; - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.1rem; } > .explainer-list { margin: 5px 20px; padding: 0; - color: $color-gray; + color: map-get($gray-shades, 600); > li { margin: 0; diff --git a/gui/app/styles/core/layout/layout-footer.scss b/gui/app/styles/core/layout/layout-footer.scss index 8668902b..df208a6b 100644 --- a/gui/app/styles/core/layout/layout-footer.scss +++ b/gui/app/styles/core/layout/layout-footer.scss @@ -1,6 +1,6 @@ footer { - background-color: $color-primary-light; - color: $color-gray; + background-color: $theme-100; + color: map-get($gray-shades, 600); font-weight: 500; font-size: 1rem; padding: 5px 2rem; @@ -12,7 +12,7 @@ footer { a, a:visited { @include ease-in(); - color: $color-gray; + color: map-get($gray-shades, 600); text-decoration: none; &:hover { @@ -33,7 +33,7 @@ footer { } > .progress-done { - background-color: $color-green; + background-color: map-get($green-shades, 600); color: $color-white; text-align: center; font-size: 1rem; @@ -45,7 +45,7 @@ footer { > .progress-notification { display: inline-block; font-size: 1rem; - color: $color-green; + color: map-get($green-shades, 600); font-weight: 500; } } diff --git a/gui/app/styles/core/layout/layout-master.scss b/gui/app/styles/core/layout/layout-master.scss index f360bb13..10a37229 100644 --- a/gui/app/styles/core/layout/layout-master.scss +++ b/gui/app/styles/core/layout/layout-master.scss @@ -22,7 +22,7 @@ $break-5: 1800px; .layout-sidebar { order: -1; - background-color: $color-gray-light2; + background-color: map-get($gray-shades, 200); padding: 1rem; } diff --git a/gui/app/styles/core/layout/layout-sidebar.scss b/gui/app/styles/core/layout/layout-sidebar.scss index a2a063fa..3ebfb37f 100644 --- a/gui/app/styles/core/layout/layout-sidebar.scss +++ b/gui/app/styles/core/layout/layout-sidebar.scss @@ -37,8 +37,8 @@ } .sidebar-view-switcher { - color: $color-primary; - background-color: $color-primary-light; + color: $theme-500; + background-color: map-get($gray-shades, 600); padding: 5px 20px; text-align: center; height: 50px; diff --git a/gui/app/styles/core/layout/layout-topbar.scss b/gui/app/styles/core/layout/layout-topbar.scss index f3bc0e48..c8306a8c 100644 --- a/gui/app/styles/core/layout/layout-topbar.scss +++ b/gui/app/styles/core/layout/layout-topbar.scss @@ -3,7 +3,7 @@ } .top-bar { - background-color: $color-primary; + background-color: $theme-500; color: $color-white; padding: 0 2rem; font-size: 1rem; @@ -40,12 +40,12 @@ } > .selected { - background-color: $color-primary-light !important; - color: $color-primary !important; + background-color: $theme-500 !important; + color: $theme-500 !important; padding: 5px 10px !important; &:hover { - color: darken($color-primary, 15%) !important; + color: darken($theme-500, 15%) !important; } } } @@ -63,23 +63,23 @@ > .hamburger { @include ease-in(); @include border-radius(3px); - background-color: $color-primary; - border: 1px solid $color-primary-light; + background-color: $theme-500; + border: 1px solid $theme-100; > i { font-size: 1.8rem; line-height: 2.1rem; padding: 0px 3px 0px 3px; - color: $color-primary-light; + color: $theme-100; cursor: pointer; vertical-align: sub; } &:hover { - background-color: $color-primary-light; + background-color: $theme-100; > i { - color: $color-primary; + color: $theme-500; } } } diff --git a/gui/app/styles/core/layout/master-internal.scss b/gui/app/styles/core/layout/master-internal.scss index 6aa70b39..e8750dbb 100644 --- a/gui/app/styles/core/layout/master-internal.scss +++ b/gui/app/styles/core/layout/master-internal.scss @@ -10,12 +10,14 @@ $display-break-5: 1800px; display: block; height: auto; width: 100%; + // z-index: 777; .master-content { display: block; height: auto; width: 100%; padding: 10px; + // z-index: 666; } } .master-sidebar-container { @@ -27,7 +29,7 @@ $display-break-5: 1800px; display: block; height: auto; width: 100%; - background-color: $color-primary; + background-color: $theme-500; text-align: center; padding: 0; z-index: 999; @@ -91,7 +93,7 @@ $display-break-5: 1800px; border-radius: 50%; font-size: 0.75rem; text-align: center; - color: $color-primary; + color: $theme-500; font-weight: bold; background-color: $color-white; @extend .no-select; @@ -107,7 +109,7 @@ $display-break-5: 1800px; width: 100%; padding: 5px 10px; z-index: 888; - background-color: $color-off-white; + background-color: map-get($gray-shades, 100); } } diff --git a/gui/app/styles/core/mixins.scss b/gui/app/styles/core/mixins.scss index 9118badb..b6c13b38 100644 --- a/gui/app/styles/core/mixins.scss +++ b/gui/app/styles/core/mixins.scss @@ -50,7 +50,7 @@ @mixin content-container($pad-tb: 25px, $pad-lr: 50px) { @include border-radius(2px); padding: $pad-tb $pad-lr; - box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; + box-shadow: 0 0 0 0.75pt map-get($gray-shades, 200),0 0 3pt 0.75pt map-get($gray-shades, 200); background-color: $color-white; } @@ -64,17 +64,7 @@ } } -@mixin card-theme() { - background-color: $color-primary-light; - box-shadow: 1px 1px 3px 0px rgba(211,211,211,1); - - &:hover { - background-color: darken($color-primary-light, 5%); - color: $color-primary; - } -} @mixin shadow() { box-shadow: 1px 1px 3px 0px rgba(211,211,211,1); } - diff --git a/gui/app/styles/core/news.scss b/gui/app/styles/core/news.scss index f5c7b58c..d88d9108 100644 --- a/gui/app/styles/core/news.scss +++ b/gui/app/styles/core/news.scss @@ -4,14 +4,14 @@ > .update-summary { padding: 25px; - border: 1px solid $color-orange; - background-color: $color-off-white; + border: 1px solid map-get($yellow-shades, 700); + background-color: map-get($gray-shades, 100); @include border-radius(2px); > .caption { font-weight: bold; font-size: 1.5rem; - color: $color-orange; + color: map-get($yellow-shades, 700); margin-bottom: 15px; display: inline-block; } @@ -19,13 +19,13 @@ > .instructions { font-weight: normal; font-size: 1.3rem; - color: $color-gray; + color: map-get($gray-shades, 600); } > .version { margin: 30px 0 0 20px; font-size: 1.3rem; - color: $color-gray; + color: map-get($gray-shades, 600); font-weight: bold; } @@ -41,8 +41,8 @@ > .tag-edition { margin: 10px 10px 10px 10px; padding: 5px 10px; - background-color: $color-gray-light; - color: $color-primary; + background-color: map-get($gray-shades, 300); + color: $theme-500; font-weight: bold; font-size: 0.9rem; } @@ -65,7 +65,7 @@ > .version { font-weight: bold; font-size: 1.1rem; - color: $color-gray; + color: map-get($gray-shades, 600); margin-bottom: 20px; } @@ -80,7 +80,7 @@ text-align: center; font-weight: normal; font-size: 1rem; - color: $color-off-black; + color: $color-black-light-1; margin-bottom: 20px; } @@ -88,7 +88,7 @@ text-align: left; font-weight: normal; font-size: 1rem; - color: $color-gray; + color: map-get($gray-shades, 600); } } @@ -96,7 +96,7 @@ border-radius: 10px; width: 10px; height: 10px; - background-color: $color-orange; + background-color: map-get($yellow-shades, 700); position: absolute; bottom: 0; right: 0; @@ -106,7 +106,7 @@ border-radius: 10px; width: 10px; height: 10px; - background-color: $color-whats-new; + background-color: map-get($red-shades, 600); position: absolute; top: 0; right: 0; @@ -120,23 +120,23 @@ margin: 0 0 10px 0; text-align: center; font-size: 2rem; - color: $color-off-black; + color: $color-black-light-1; } > .news-item { padding: 30px 0; - border-bottom: 1px solid $color-border; + border-bottom: 1px solid map-get($gray-shades, 300); text-align: center; > .title { - color: $color-primary; + color: $theme-500; font-size: 1.5rem; font-weight: bold; margin-bottom: 5px; } > .date { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1rem; font-weight: 600; margin-bottom: 10px; @@ -152,8 +152,8 @@ > .tag-edition { margin: 10px 10px 10px 10px; padding: 5px 10px; - background-color: $color-off-white; - color: $color-gray; + background-color: map-get($gray-shades, 100); + color: map-get($gray-shades, 600); font-weight: 700; font-size: 0.9rem; display: inline-block; @@ -168,7 +168,7 @@ > .action { margin: 20px 0; text-align: center; - color: $color-gray; + color: map-get($gray-shades, 600); font-weight: 800; font-size: 1.3rem; } diff --git a/gui/app/styles/core/print.scss b/gui/app/styles/core/print.scss index 3b42609a..77fcbf9f 100644 --- a/gui/app/styles/core/print.scss +++ b/gui/app/styles/core/print.scss @@ -15,19 +15,19 @@ @top-right { font-size: 12px; - color: $color-off-black; + color: $color-black-light-1; // content: string(doctitle); } @bottom-left { font-size: 12px; - color: $color-off-black; + color: $color-black-light-1; // content: 'Exported from Documize'; } @bottom-right { font-size: 12px; - color: $color-off-black; + color: $color-black-light-1; // content: counter(page); } } diff --git a/gui/app/styles/core/ui/all.scss b/gui/app/styles/core/ui/all.scss new file mode 100644 index 00000000..46602392 --- /dev/null +++ b/gui/app/styles/core/ui/all.scss @@ -0,0 +1 @@ +@import "ui-tooltip"; diff --git a/gui/app/styles/core/ui/ui-tooltip.scss b/gui/app/styles/core/ui/ui-tooltip.scss new file mode 100644 index 00000000..ade5658d --- /dev/null +++ b/gui/app/styles/core/ui/ui-tooltip.scss @@ -0,0 +1,23 @@ +// https://github.com/kybishop/ember-attacher + +.ember-attacher-popper { + background-color: $color-white; + font-size: 1rem; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.16), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + @include border-radius(3px); + + > p { + margin: 4px; + padding: 0; + } + + > .menu { + margin: 0; + padding: 0.5rem 0.75rem; + } +} + +.ember-attacher-tooltip { + font-size: 0.9rem; + padding: 0.5rem 0.75rem; +} diff --git a/gui/app/styles/core/view/auth.scss b/gui/app/styles/core/view/auth.scss index afdc383c..ecdc2edf 100644 --- a/gui/app/styles/core/view/auth.scss +++ b/gui/app/styles/core/view/auth.scss @@ -13,7 +13,7 @@ max-width: 500px; padding: 20px 50px; background-color: $color-white; - color: $color-off-black; + color: $color-black-light-1; @include border-radius(3px); @include shadow(); @@ -28,7 +28,7 @@ > .url { margin: 20px 0; - color: $color-gray; + color: map-get($gray-shades, 600); font-weight: 0.9rem; } } @@ -38,5 +38,5 @@ text-align: center; margin-top: 150px; font-size: 3rem; - color: $color-gray; + color: map-get($gray-shades, 600); } diff --git a/gui/app/styles/core/view/common.scss b/gui/app/styles/core/view/common.scss index 886acb02..e75caa7c 100644 --- a/gui/app/styles/core/view/common.scss +++ b/gui/app/styles/core/view/common.scss @@ -9,27 +9,27 @@ max-width: 500px; padding: 30px; @include border-radius(5px); - background-color: $color-off-white; + background-color: map-get($gray-shades, 100); display: block; opacity: 0.8; > p { font-size: 1.5rem; line-height: 2.5rem; - color: $color-gray; + color: map-get($gray-shades, 600); display: block; } > .material-icons { font-size: 5rem; - color: $color-stroke; + color: map-get($gray-shades, 200); } } .not-found { text-align: center; font-size: 2rem; - color: $color-gray; + color: map-get($gray-shades, 600); margin: 5rem 0; } @@ -50,12 +50,12 @@ margin: 0 20px 20px 0; padding: 10px 0 0 0; cursor: default; - border: 7px solid $color-gray-light; + border: 7px solid map-get($gray-shades, 300); @include border-radius(3px); @include ease-in(); &:hover { - border: 7px solid $color-gray; + border: 7px solid map-get($gray-shades, 600); } .tick { diff --git a/gui/app/styles/core/view/customize.scss b/gui/app/styles/core/view/customize.scss index 92eb3d3a..2f9d2688 100644 --- a/gui/app/styles/core/view/customize.scss +++ b/gui/app/styles/core/view/customize.scss @@ -7,7 +7,7 @@ > .sub-heading { font-size: 1.1rem; - color: $color-gray; + color: map-get($gray-shades, 600); } .user-table { @@ -26,7 +26,7 @@ > .email { font-size: 0.9rem; - color: $color-off-black; + color: $color-black-light-1; margin: 0; display: inline-block; font-weight: normal; @@ -37,7 +37,7 @@ cursor: pointer; margin: 5px 0 0 10px; font-size: 1rem; - color: $color-gray; + color: map-get($gray-shades, 600); &:hover { color: $color-link; @@ -46,19 +46,19 @@ .inactive-user { - @extend .color-red; + color: map-get($red-shades, 600); font-weight: normal; text-decoration: line-through; } .admin-user { - @extend .color-primary; + color: map-get($green-shades, 600); font-weight: normal; } .checkbox { - color: $color-checkbox; + color: map-get($gray-shades, 900); cursor: pointer; } } @@ -71,7 +71,7 @@ margin: 15px 0; padding: 15px 0; font-size: 1.2rem; - color: $color-primary; + color: $theme-500; } } @@ -83,13 +83,13 @@ margin: 15px 0; .name { - color: $color-off-black; + color: $color-black-light-1; font-size: 1.3rem; font-weight: 600; > .purpose { font-size: 1rem; - color: $color-gray; + color: map-get($gray-shades, 600); } } } @@ -101,7 +101,7 @@ margin: 10px 0; > .fullname { - color: $color-primary; + color: $theme-500; font-size: 1.2rem; } } @@ -113,7 +113,7 @@ margin: 10px 0; > .group-name { - color: $color-primary; + color: $theme-500; font-size: 1.2rem; > .group-purpose { @@ -126,13 +126,13 @@ > .smtp-failure, .admin-setting-failure { font-size: 1.2rem; font-weight: bold; - color: $color-red; + color: map-get($red-shades, 600); } > .smtp-success, .admin-setting-success { font-size: 1.2rem; font-weight: bold; - color: $color-green; + color: map-get($green-shades, 600); } > .archive-admin { @@ -142,7 +142,7 @@ padding: 15px 0; @include ease-in(); font-size: 1.2rem; - color: $color-primary; + color: $theme-500; } } } @@ -157,38 +157,38 @@ > .backup-zone { @include border-radius(3px); - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); padding: 20px 20px; - background-color: lighten($color-green, 60%); - color: $color-off-black; + background-color: map-get($green-shades, 200); + color: $color-black-light-1; > .backup-fail { margin: 10px 0; - color: $color-red; + color: map-get($red-shades, 600); } > .backup-success { margin: 10px 0; - color: $color-green; + color: map-get($green-shades, 800); } } > .restore-zone { @include border-radius(3px); - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); margin: 50px 0; padding: 20px 20px; - background-color: lighten($color-red, 60%); - color: $color-off-black; + background-color: map-get($red-shades, 200); + color: $color-black-light-1; > .restore-fail { margin: 10px 0; - color: $color-red; + color: map-get($red-shades, 800); } > .restore-success { margin: 10px 0; - color: $color-green; + color: map-get($green-shades, 700); } > .upload-backup-file { @@ -209,12 +209,12 @@ } > .wait { - color: $color-gray; + color: map-get($gray-shades, 600); margin: 10px 0; } > .ready { - color: $color-green; + color: map-get($green-shades, 700); margin: 10px 0; } } @@ -223,10 +223,10 @@ > .deactivation-zone { @include border-radius(3px); - border: 1px solid $color-red; + border: 1px solid map-get($red-shades, 600); margin: 30px 0; padding: 20px 20px; - background-color: lighten($color-red, 60%); - color: $color-off-black; + background-color: map-get($red-shades, 100); + color: $color-black-light-1; } } diff --git a/gui/app/styles/core/view/document/add-section.scss b/gui/app/styles/core/view/document/add-section.scss index 1c64389f..f1eac52a 100644 --- a/gui/app/styles/core/view/document/add-section.scss +++ b/gui/app/styles/core/view/document/add-section.scss @@ -9,7 +9,7 @@ text-align: center; margin: 30px 0 20px 0; position: relative; - color: $color-gray-light; + color: map-get($gray-shades, 300); > .cta { @include ease-in(); @@ -17,7 +17,7 @@ letter-spacing: 0.22rem; &:hover { - color: $color-green; + color: map-get($green-shades, 700); } } } @@ -29,14 +29,14 @@ .new-section-caption { margin: 20px 0 10px 0; - color: $color-primary; + color: $theme-500; font-size: 1.4rem; font-weight: bold; } .new-section-empty { font-size: 1.2rem; - color: $color-gray; + color: map-get($gray-shades, 600); } .preset-list { @@ -52,12 +52,12 @@ margin: 0 20px 20px 0; padding: 12px 0 0 20px; height: 60px; - border: 1px solid $color-border; - background-color: $color-off-white; + border: 1px solid map-get($gray-shades, 300); + background-color: map-get($gray-shades, 100); &:hover { - border-color: $color-primary; - background-color: $color-primary-light; + border-color: $theme-500; + background-color: $theme-100; } .icon { @@ -78,7 +78,7 @@ display: inline-block; font-size: 1.1rem; font-weight: 500; - color: $color-off-black; + color: $color-black-light-1; letter-spacing: 0.5px; margin-top: 6px; } @@ -99,12 +99,12 @@ padding: 12px 20px; width: 100%; position: relative; - border: 1px solid $color-border; - background-color: $color-off-white; + border: 1px solid map-get($gray-shades, 300); + background-color: map-get($gray-shades, 100); &:hover { - border-color: $color-primary; - background-color: $color-primary-light; + border-color: $theme-500; + background-color: $theme-100; } > .actions { @@ -118,12 +118,12 @@ > .title { font-size: 1.1rem; font-weight: 500; - color: $color-off-black; + color: $color-black-light-1; letter-spacing: 0.5px; } > .desc { - color: $color-off-black; + color: $color-black-light-1; font-size: 1rem; } } diff --git a/gui/app/styles/core/view/document/copy-move.scss b/gui/app/styles/core/view/document/copy-move.scss index 70af570c..ef95d3c4 100644 --- a/gui/app/styles/core/view/document/copy-move.scss +++ b/gui/app/styles/core/view/document/copy-move.scss @@ -8,8 +8,8 @@ @include ease-in(); margin: 0 0 5px 0; padding: 10px 15px; - color: $color-gray; - background-color: $color-off-white; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 100); cursor: pointer; position: relative; list-style-type: none; @@ -19,12 +19,12 @@ } > .title { - color : $color-off-black; + color : $color-black-light-1; font-size: 1rem; } > .space { - color : $color-gray; + color : map-get($gray-shades, 600); font-size: 0.8rem; font-style: italic; font-weight: bold; @@ -32,7 +32,7 @@ } > .snippet { - color : $color-gray; + color : map-get($gray-shades, 600); font-size: 0.9rem; } diff --git a/gui/app/styles/core/view/document/doc-meta.scss b/gui/app/styles/core/view/document/doc-meta.scss index d8053338..889e128b 100644 --- a/gui/app/styles/core/view/document/doc-meta.scss +++ b/gui/app/styles/core/view/document/doc-meta.scss @@ -8,7 +8,7 @@ .doc-excerpt { font-size: 1.2rem; - color: $color-gray; + color: map-get($gray-shades, 600); margin: 0 0 20px; } } @@ -18,24 +18,24 @@ @include border-radius(3px); @include ease-in(); display: inline-block; - border: 2px solid $color-green; + border: 2px solid map-get($green-shades, 700); padding: 2px 10px; - color: $color-gray; - background-color: $color-off-white; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 100); font-weight: 800; font-size: 1rem; &:hover { - color: $color-green; + color: map-get($green-shades, 500); } } .document-lifecycle-draft { @extend .document-lifecycle-live; - border: 2px solid $color-orange; + border: 2px solid map-get($yellow-shades, 700); &:hover { - color: $color-orange; + color: map-get($yellow-shades, 700); } } @@ -46,30 +46,30 @@ padding: 2px 10px; font-weight: 800; font-size: 1rem; - color: $color-gray; - background-color: $color-off-white; - border: 2px solid $color-gray; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 100); + border: 2px solid map-get($gray-shades, 600); &:hover { - color: $color-dark; + color: map-get($gray-shades, 800); } } .document-protection-review { @extend .document-protection-unlocked; - border: 2px solid $color-orange; + border: 2px solid map-get($yellow-shades, 700); &:hover { - color: $color-orange; + color: map-get($yellow-shades, 700); } } .document-protection-locked { @extend .document-protection-unlocked; - border: 2px solid $color-red; + border: 2px solid map-get($red-shades, 600); &:hover { - color: $color-red; + color: map-get($red-shades, 600); } } @@ -78,10 +78,10 @@ padding: 2px 10px; font-weight: 600; font-size: 1rem; - color: $color-gray; - background-color: $color-off-white; - border: 2px solid $color-gray; - border-left: 13px solid $color-gray; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 100); + border: 2px solid map-get($gray-shades, 600); + border-left: 13px solid map-get($gray-shades, 600); margin-right: 20px; } @@ -91,6 +91,6 @@ font-size: 1.1rem; font-weight: 600; font-style: italic; - color: $color-gray; + color: map-get($gray-shades, 600); margin-right: 20px; } diff --git a/gui/app/styles/core/view/document/doc-structure.scss b/gui/app/styles/core/view/document/doc-structure.scss index 6884a500..890a0cb4 100644 --- a/gui/app/styles/core/view/document/doc-structure.scss +++ b/gui/app/styles/core/view/document/doc-structure.scss @@ -10,8 +10,8 @@ margin: 0 0 2rem 0; > .page-number { - color: $color-gray; - background-color: $color-gray-light2; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 200); padding: 0.2rem 1rem; font-size: 1.8rem; margin: 0 1.5rem 0 0; @@ -21,11 +21,11 @@ } > .page-state-pending { - color: $color-red; + color: map-get($red-shades, 600); } > .page-state-review { - color: $color-green; + color: map-get($green-shades, 600); } > .page-title { @@ -33,7 +33,7 @@ font-size: 2.0rem; font-weight: bold; margin: 16px 0; - color: $color-dark; + color: map-get($gray-shades, 800); } } @@ -55,8 +55,8 @@ > thead { > tr { > th { - background-color: $color-off-white; - color: $color-gray; + background-color: map-get($gray-shades, 100); + color: map-get($gray-shades, 600); } > th:first-child { diff --git a/gui/app/styles/core/view/document/doc-toc.scss b/gui/app/styles/core/view/document/doc-toc.scss index 4024f4a2..8d0b070a 100644 --- a/gui/app/styles/core/view/document/doc-toc.scss +++ b/gui/app/styles/core/view/document/doc-toc.scss @@ -19,7 +19,7 @@ cursor: not-allowed !important; > .material-icons { - color: $color-gray-light; + color: map-get($gray-shades, 300); } } } @@ -42,7 +42,7 @@ overflow: hidden; > .link { - color: $color-dark; + color: map-get($gray-shades, 800); font-weight: bold; &:hover { @@ -50,7 +50,7 @@ } > .numbering { - color: $color-gray; + color: map-get($gray-shades, 600); font-weight: bold; display: inline-block; margin-right: 10px; diff --git a/gui/app/styles/core/view/document/section-editor.scss b/gui/app/styles/core/view/document/section-editor.scss index a7a4229c..559e170e 100644 --- a/gui/app/styles/core/view/document/section-editor.scss +++ b/gui/app/styles/core/view/document/section-editor.scss @@ -6,7 +6,7 @@ > .canvas { // margin: 34px 0 0 0; padding: 30px 20px; - box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; + box-shadow: 0 0 0 0.75pt map-get($gray-shades, 200),0 0 3pt 0.75pt map-get($gray-shades, 200); } } diff --git a/gui/app/styles/core/view/document/view-activity.scss b/gui/app/styles/core/view/document/view-activity.scss index ba2e718e..e428c470 100644 --- a/gui/app/styles/core/view/document/view-activity.scss +++ b/gui/app/styles/core/view/document/view-activity.scss @@ -5,7 +5,7 @@ font-size: 1.8rem; font-weight: bold; margin: 0 0 30px 0; - color: $color-gray; + color: map-get($gray-shades, 600); } > .list { @@ -25,7 +25,7 @@ position: absolute; top: 19px; left: -20px; - background-color: $color-border; + background-color: map-get($gray-shades, 300); height: 3px; width: 10px; } @@ -43,21 +43,21 @@ > .doc { font-size: 1.2rem; font-weight: normal; - color: $color-off-black; + color: $color-black-light-1; letter-spacing: 0.5px; } > .note { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1rem; margin-top: 2px; } } } } - + > .list-timeline { - border-left: 5px solid $color-border; + border-left: 5px solid map-get($gray-shades, 300); padding-left: 20px; margin-left: 30px; } diff --git a/gui/app/styles/core/view/document/view-attachment.scss b/gui/app/styles/core/view/document/view-attachment.scss index 5ac0fcb9..b87806d4 100644 --- a/gui/app/styles/core/view/document/view-attachment.scss +++ b/gui/app/styles/core/view/document/view-attachment.scss @@ -17,7 +17,7 @@ padding: 0; font-size: 1.1rem; list-style-type: none; - border-left: 6px solid $color-gray-light; + border-left: 6px solid map-get($gray-shades, 300); padding-left: 15px; margin-left: 3px; @@ -27,7 +27,7 @@ font-size: 1.1rem; vertical-align: text-top; margin-right: 10px; - color: $color-gray; + color: map-get($gray-shades, 600); &:hover { color: $color-link; diff --git a/gui/app/styles/core/view/document/view-revision.scss b/gui/app/styles/core/view/document/view-revision.scss index 01211fb6..a3533486 100644 --- a/gui/app/styles/core/view/document/view-revision.scss +++ b/gui/app/styles/core/view/document/view-revision.scss @@ -5,7 +5,7 @@ @include ease-in(); position: relative; padding: 25px 50px; - box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; + box-shadow: 0 0 0 0.75pt map-get($gray-shades, 200),0 0 3pt 0.75pt map-get($gray-shades, 200); background-color: $color-white; margin: 50px 0; diff --git a/gui/app/styles/core/view/document/vote-likes.scss b/gui/app/styles/core/view/document/vote-likes.scss index 07d584b1..edbe3f3b 100644 --- a/gui/app/styles/core/view/document/vote-likes.scss +++ b/gui/app/styles/core/view/document/vote-likes.scss @@ -3,14 +3,14 @@ padding: 30px 50px; text-align: center; max-width: 400px; - border: 1px dotted $color-border; - background: $color-off-white; + border: 1px dotted map-get($gray-shades, 300); + background: map-get($gray-shades, 100); @include border-radius(3px); > .prompt { font-size: 1.5rem; font-weight: 600; - color: $color-dark; + color: map-get($gray-shades, 800); } > .buttons { @@ -20,6 +20,6 @@ > .ack { font-size: 1.2rem; font-weight: 600; - color: $color-green; + color: map-get($green-shades, 600); } } diff --git a/gui/app/styles/core/view/document/wysiwyg.scss b/gui/app/styles/core/view/document/wysiwyg.scss index 8c8d6554..7b8917ec 100644 --- a/gui/app/styles/core/view/document/wysiwyg.scss +++ b/gui/app/styles/core/view/document/wysiwyg.scss @@ -1,20 +1,20 @@ .wysiwyg { font-size: 17px; line-height: 25px; - color: $color-off-black; + color: $color-black-light-1; table { - border: 1px solid $color-border !important; + border: 1px solid map-get($gray-shades, 300) !important; th { padding: 5px 7px !important; - border: 1px solid $color-border !important; - background-color: $color-off-white; + border: 1px solid map-get($gray-shades, 300) !important; + background-color: map-get($gray-shades, 100); } td { padding: 5px 7px !important; - border: 1px solid $color-border !important; + border: 1px solid map-get($gray-shades, 300) !important; p { margin: 0 !important; @@ -52,7 +52,7 @@ h6 { font-weight: bold; margin: 16px 0; - color: $color-dark; + color: map-get($gray-shades, 800); } h1 { font-size: 2.0rem; } @@ -63,9 +63,9 @@ h6 { font-size: 1.1rem; } pre { - background-color: $color-off-white; + background-color: map-get($gray-shades, 100); padding: 10px; - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); @include border-radius(3px); } diff --git a/gui/app/styles/core/view/exceptions.scss b/gui/app/styles/core/view/exceptions.scss index f64a11b3..071c0cb2 100644 --- a/gui/app/styles/core/view/exceptions.scss +++ b/gui/app/styles/core/view/exceptions.scss @@ -1,12 +1,12 @@ .documize-base-exception { - background-color: $color-off-white; - border: 1px solid $color-border !important; + background-color: map-get($gray-shades, 100); + border: 1px solid map-get($gray-shades, 300) !important; margin: 20px; padding: 20px; text-align: left; font-size: 14px; - color: $color-off-black; + color: $color-black-light-1; display: none !important; diff --git a/gui/app/styles/core/view/import.scss b/gui/app/styles/core/view/import.scss index a5246935..c6a374e2 100644 --- a/gui/app/styles/core/view/import.scss +++ b/gui/app/styles/core/view/import.scss @@ -10,7 +10,7 @@ > p { font-size: 1.1rem; - color: $color-off-black; + color: $color-black-light-1; } } } diff --git a/gui/app/styles/core/view/onboard.scss b/gui/app/styles/core/view/onboard.scss index f9ea5a6e..d4e549c3 100644 --- a/gui/app/styles/core/view/onboard.scss +++ b/gui/app/styles/core/view/onboard.scss @@ -1,7 +1,7 @@ .onboarding-container { width: 100%; text-align: left; - color: $color-off-black; + color: $color-black-light-1; letter-spacing: 1px; margin: 50px 0; @@ -48,13 +48,13 @@ { font-size: 0.9rem;; font-style: italic; - color: $color-stroke; + color: map-get($gray-shades, 500); } .mismatch { display: none; - color: $color-red; + color: map-get($red-shades, 700); font-weight: 700; } @@ -155,14 +155,14 @@ h2 { font-size: 2rem;; - color: $color-primary; + color: $theme-500; margin-bottom: 30px; } p { font-size: 1.3rem; - color: $color-primary; + color: $theme-500; } p.note @@ -192,7 +192,7 @@ // padding: 10px 15px; // background: #12A936; // border: 0; - // color: $color-off-white; + // color: map-get($gray-shades, 100); // border-radius: 3px; // font-weight: 500; // font-size: 16px; @@ -220,7 +220,7 @@ // background: white; // border: 1px solid #e2e2e2; // @include border-radius(3px); - // color: $color-off-black; + // color: $color-black-light-1; // font-weight: bold; // font-size: 16px; // -webkit-appearance: none; diff --git a/gui/app/styles/core/view/search.scss b/gui/app/styles/core/view/search.scss index 177f96cf..e416214d 100644 --- a/gui/app/styles/core/view/search.scss +++ b/gui/app/styles/core/view/search.scss @@ -4,7 +4,7 @@ > .heading { font-size: 1.5rem; font-weight: bold; - color: $color-dark; + color: map-get($gray-shades, 800); margin-top: 30px; } @@ -66,18 +66,18 @@ > .version { font-size: 1.1rem; font-weight: bold; - color: $color-gray; + color: map-get($gray-shades, 600); } } > .space { - color: $color-off-black; + color: $color-black-light-1; font-size: 1.2rem; margin-bottom: 5px; } > .snippet { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.1rem; margin-bottom: 10px; } @@ -93,7 +93,7 @@ > .hashtag { display: inline-block; margin: 5px 10px 0 5px; - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1rem; font-style: italic; @@ -114,13 +114,13 @@ font-weight: 600; font-size: 1.1rem; font-style: italic; - color: $color-dark; + color: map-get($gray-shades, 800); } > .explain { margin: 10px 0 20px 0px; font-size: 1.2rem; - color: $color-gray; + color: map-get($gray-shades, 600); } } } diff --git a/gui/app/styles/core/view/space.scss b/gui/app/styles/core/view/space.scss index 6d705502..a08d3a44 100644 --- a/gui/app/styles/core/view/space.scss +++ b/gui/app/styles/core/view/space.scss @@ -1,7 +1,7 @@ .view-space { > .filter-caption { margin: 10px 0; - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.1rem; font-weight: 500; text-align: center; @@ -39,13 +39,13 @@ } > .snippet { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1rem; line-height: 24px; } &:hover { - color: $color-gray; + color: map-get($gray-shades, 600); } } @@ -60,7 +60,7 @@ width: 10px; margin: 0; padding: 0; - color: $color-checkbox; + color: map-get($gray-shades, 900); } } @@ -74,7 +74,7 @@ } > .selected { - background-color: $color-primary-light !important; + background-color: $theme-100 !important; > .checkbox { display: block; @@ -90,7 +90,7 @@ > .hashtag { display: inline-block; margin: 5px 10px 0 5px; - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 0.875rem; font-style: italic; @@ -105,12 +105,12 @@ > .title { font-size: 1.5rem; font-weight: bold; - color: $color-dark; + color: map-get($gray-shades, 800); } > .sub-title { font-size: 1.1rem; - color: $color-gray; + color: map-get($gray-shades, 600); } > .permission-table { @@ -131,8 +131,8 @@ > thead { > tr { > th { - background-color: $color-off-white; - color: $color-gray; + background-color: map-get($gray-shades, 100); + color: map-get($gray-shades, 600); } > th:first-child { @@ -158,13 +158,13 @@ > .name { font-size: 1.2rem; - color: $color-primary; + color: $theme-500; } > .info { font-size: 0.9rem; margin-top: 8px; - color: $color-gray; + color: map-get($gray-shades, 600); } } diff --git a/gui/app/styles/core/view/spaces.scss b/gui/app/styles/core/view/spaces.scss index 5e1ce145..65e93c17 100644 --- a/gui/app/styles/core/view/spaces.scss +++ b/gui/app/styles/core/view/spaces.scss @@ -2,13 +2,13 @@ > .heading { font-size: 1.3rem; font-weight: bold; - color: $color-dark; + color: map-get($gray-shades, 800); text-transform: uppercase; > .counter { font-size: 0.9rem; font-weight: normal; - color: $color-gray; + color: map-get($gray-shades, 600); display: inline-block; margin-left: 10px; } @@ -16,7 +16,7 @@ > .empty { font-size: 1.2rem; - color: $color-gray; + color: map-get($gray-shades, 600); font-weight: normal; margin: 20px 0 50px 0; } diff --git a/gui/app/styles/core/view/toolbar.scss b/gui/app/styles/core/view/toolbar.scss index e067dbef..89f963b5 100644 --- a/gui/app/styles/core/view/toolbar.scss +++ b/gui/app/styles/core/view/toolbar.scss @@ -5,7 +5,7 @@ display: inlne-block; > .link, div > .link { - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.1rem; font-weight: bold; display: inline-block; @@ -13,7 +13,6 @@ cursor: pointer; text-transform: uppercase; @include ease-in(); - // border-bottom: 2px solid $color-gray-light; &:hover { color: $color-link; diff --git a/gui/app/styles/core/widget/widget-avatar.scss b/gui/app/styles/core/widget/widget-avatar.scss index 80fd504e..daf8aab7 100644 --- a/gui/app/styles/core/widget/widget-avatar.scss +++ b/gui/app/styles/core/widget/widget-avatar.scss @@ -1,6 +1,6 @@ .avatar { color: $color-white; - background-color: $color-gray; + background-color: map-get($gray-shades, 600); @include border-radius(20px); @include ease-in(); padding: 10px 0 0 0; @@ -12,7 +12,7 @@ .avatar-large { color: $color-white; - background-color: $color-gray; + background-color: map-get($gray-shades, 600); @include border-radius(100px); @include ease-in(); height: 100px; diff --git a/gui/app/styles/core/widget/widget-button.scss b/gui/app/styles/core/widget/widget-button.scss index a5209ec0..bb35a4e0 100644 --- a/gui/app/styles/core/widget/widget-button.scss +++ b/gui/app/styles/core/widget/widget-button.scss @@ -31,14 +31,14 @@ @include ease-in(); > i { - color: $color-gray-light; + color: map-get($gray-shades, 300); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-gray-light, 15%); + color: darken(map-get($gray-shades, 300), 15%); } } } @@ -49,14 +49,14 @@ @include ease-in(); > i { - color: $color-goldy; + color: map-get($yellow-shades, 700); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-goldy, 5%); + color: darken(map-get($yellow-shades, 700), 5%); } } } @@ -67,14 +67,14 @@ @include ease-in(); > i { - color: $color-gray-light; + color: map-get($gray-shades, 300); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: $color-red; + color: map-get($red-shades, 700); } } } @@ -85,14 +85,14 @@ @include ease-in(); > i { - color: $color-blue; + color: map-get($gray-shades, 800); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-blue, 5%); + color: map-get($gray-shades, 600); } } } @@ -103,14 +103,14 @@ @include ease-in(); > i { - color: $color-red; + color: map-get($red-shades, 700); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-red, 5%); + color: map-get($red-shades, 400); } } } @@ -121,14 +121,14 @@ @include ease-in(); > i { - color: $color-green; + color: map-get($green-shades, 600); font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-green, 5%); + color: map-get($green-shades, 700); } } } @@ -139,14 +139,14 @@ @include ease-in(); > i { - color: $color-off-black; + color: $color-black-light-1; font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-off-black, 5%); + color: darken($color-black-light-1, 5%); } } } @@ -157,14 +157,14 @@ @include ease-in(); > i { - color: $color-primary; + color: $theme-500; font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-primary, 5%); + color: darken($theme-500, 5%); } } } @@ -175,14 +175,14 @@ @include ease-in(); > i { - color: $color-primary-light; + color: $theme-100; font-size: 2rem; @include ease-in(); } &:hover { > i { - color: darken($color-primary-light, 5%); + color: darken($theme-100, 5%); } } } diff --git a/gui/app/styles/core/widget/widget-checkbox.scss b/gui/app/styles/core/widget/widget-checkbox.scss index 460119a1..9addbcf8 100644 --- a/gui/app/styles/core/widget/widget-checkbox.scss +++ b/gui/app/styles/core/widget/widget-checkbox.scss @@ -8,35 +8,35 @@ > .material-icons { font-size: 1.5rem; - color: $color-gray; + color: map-get($gray-shades, 600); vertical-align: top; } > .selected { - color: $color-blue; + color: map-get($gray-shades, 800); } &:hover { - color: $color-blue; + color: map-get($gray-shades, 800); } > .text { display: inline-block; font-size: 1.1rem; vertical-align: sub; - color: $color-off-black; + color: $color-black-light-1; } } .ui-checkbox-selected { - color: $color-blue; + color: map-get($gray-shades, 800); } .widget-checkbox { - color: $color-blue; + color: map-get($gray-shades, 800); cursor: pointer; } .checkbox-gray { - color: $color-gray !important; + color: map-get($gray-shades, 600) !important; } diff --git a/gui/app/styles/core/widget/widget-list-picker.scss b/gui/app/styles/core/widget/widget-list-picker.scss index ba945570..752f4c1e 100644 --- a/gui/app/styles/core/widget/widget-list-picker.scss +++ b/gui/app/styles/core/widget/widget-list-picker.scss @@ -10,9 +10,9 @@ @include border-radius(3px); margin: 0 0 15px 0; padding: 10px 15px; - color: $color-gray; - background-color: $color-off-white; - border: 1px solid $color-gray; + color: map-get($gray-shades, 600); + background-color: map-get($gray-shades, 100); + border: 1px solid map-get($gray-shades, 600); cursor: pointer; position: relative; list-style-type: none; @@ -20,13 +20,13 @@ &:hover { > .text-header, > .text { - color: $color-off-black; + color: $color-black-light-1; } } > .text-header { @include ease-in(); - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1.3rem; font-weight: 600; margin-bottom: 5px; @@ -38,7 +38,7 @@ > .text { @include ease-in(); - color: $color-gray; + color: map-get($gray-shades, 600); font-size: 1rem; font-weight: 500; overflow: hidden; @@ -51,7 +51,7 @@ position: absolute; top: 10px; right: 10px; - color: $color-green; + color: map-get($green-shades, 600); font-weight: 700; font-size: 1.3rem; } @@ -59,11 +59,11 @@ > .selected { > .text-header, > .text { - color: $color-off-black; + color: $color-black-light-1; } - background-color: $color-yellow !important; - border: 1px solid $color-goldy !important; + background-color: map-get($yellow-shades, 700) !important; + border: 1px solid map-get($yellow-shades, 700) !important; } } } @@ -96,12 +96,12 @@ display: inline-block; font-size: 1.3rem; font-weight: 700; - color: $color-gray; + color: map-get($gray-shades, 600); cursor: pointer; } > .selected { - color: $color-green; - border-bottom: 1px solid $color-green; + color: map-get($green-shades, 600); + border-bottom: 1px solid map-get($green-shades, 600); } } diff --git a/gui/app/styles/core/widget/widget-notification.scss b/gui/app/styles/core/widget/widget-notification.scss index 5b899230..be73e6d9 100644 --- a/gui/app/styles/core/widget/widget-notification.scss +++ b/gui/app/styles/core/widget/widget-notification.scss @@ -3,7 +3,7 @@ display: none; top: 20px; right: 20px; - background-color: $color-off-black; + background-color: $color-black-light-1; color: $color-white; padding: 10px 15px; text-align: left; diff --git a/gui/app/styles/core/widget/widget-radio.scss b/gui/app/styles/core/widget/widget-radio.scss index 700acbcc..d633aba2 100644 --- a/gui/app/styles/core/widget/widget-radio.scss +++ b/gui/app/styles/core/widget/widget-radio.scss @@ -8,28 +8,28 @@ > .material-icons { font-size: 1.5rem; - color: $color-gray; + color: map-get($gray-shades, 600); vertical-align: top; margin-right: 5px; } > .selected { - color: $color-blue; + color: map-get($gray-shades, 800); } &:hover { - color: $color-blue; + color: map-get($gray-shades, 800); } > .text { display: inline-block; font-size: 1.1rem; vertical-align: sub; - color: $color-off-black; + color: $color-black-light-1; } } .ui-radio-selected { - color: $color-blue; + color: map-get($gray-shades, 800); } diff --git a/gui/app/styles/core/widget/widget-symbol.scss b/gui/app/styles/core/widget/widget-symbol.scss index 9c062a94..12c5fc4b 100644 --- a/gui/app/styles/core/widget/widget-symbol.scss +++ b/gui/app/styles/core/widget/widget-symbol.scss @@ -7,11 +7,11 @@ line-height: 0; margin: 0; text-align: center; - background-color: $color-symbol-box; + background-color: map-get($gray-shades, 300); > .material-icons { font-size: 22px; margin-top: 20px; - color: $color-symbol-icon; + color: map-get($gray-shades, 600); } } diff --git a/gui/app/styles/core/widget/widget-table.scss b/gui/app/styles/core/widget/widget-table.scss index 03258a9d..8912eef2 100644 --- a/gui/app/styles/core/widget/widget-table.scss +++ b/gui/app/styles/core/widget/widget-table.scss @@ -3,7 +3,7 @@ margin: 0 0 25px 0; width: 100%; font-size: 1rem; - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); border-radius: 2px; border-collapse: collapse; @@ -19,35 +19,35 @@ > thead { > tr { - background-color: $color-off-white; + background-color: map-get($gray-shades, 100); > th { vertical-align: top; text-align: left; font-weight: bold; padding: 10px; - border-bottom: 1px solid $color-border; + border-bottom: 1px solid map-get($gray-shades, 300); } } } .bordered { - border: 1px solid $color-border; + border: 1px solid map-get($gray-shades, 300); } .border-top { - border-top: 1px solid $color-border; + border-top: 1px solid map-get($gray-shades, 300); } .border-bottom { - border-bottom: 1px solid $color-border; + border-bottom: 1px solid map-get($gray-shades, 300); } .action-link { font-size: 0.8rem; margin-left: 5px; } - + .no-width { white-space: nowrap; width: 1%; diff --git a/gui/app/styles/core/widget/widget-tabnav.scss b/gui/app/styles/core/widget/widget-tabnav.scss index 7619a0e4..32529bcf 100644 --- a/gui/app/styles/core/widget/widget-tabnav.scss +++ b/gui/app/styles/core/widget/widget-tabnav.scss @@ -10,8 +10,8 @@ margin: 0; padding: 5px 15px; background-color: $color-white; - color: $color-primary; - border: 1px solid $color-border; + color: $theme-500; + border: 1px solid map-get($gray-shades, 300); font-weight: 500; font-size: 1.1rem; text-align: center; @@ -30,7 +30,7 @@ } &:hover { - background-color: $color-primary-light; + background-color: $theme-100; } } @@ -48,7 +48,7 @@ } > .selected { - background-color: $color-primary-light; + background-color: $theme-100; font-weight: 700; } } diff --git a/gui/app/styles/core/widget/widget.scss b/gui/app/styles/core/widget/widget.scss index 3b409793..49fd41e3 100644 --- a/gui/app/styles/core/widget/widget.scss +++ b/gui/app/styles/core/widget/widget.scss @@ -63,18 +63,18 @@ .drag-handle { font-size: 1.5rem; - color: $color-gray-light; + color: map-get($gray-shades, 300); cursor: pointer; } .drag-indicator-dropzone { opacity: 1 !important; - border: 2px dotted $color-border; + border: 2px dotted map-get($gray-shades, 300); } .drag-indicator-chosen { opacity: 1 !important; - background: $color-off-white; + background: map-get($gray-shades, 100); } .drag-indicator-dragged { diff --git a/gui/app/styles/themes/blue.scss b/gui/app/styles/themes/blue.scss index b795e159..34d322cb 100644 --- a/gui/app/styles/themes/blue.scss +++ b/gui/app/styles/themes/blue.scss @@ -9,7 +9,8 @@ // // https://documize.com -@import "../core/color.scss"; +@import "../colors.scss"; + $color-primary: #176091; $color-primary-light: #E6F1F8; $color-link: #348A37; @@ -27,20 +28,4 @@ $color-link: #348A37; background-color: $color-primary-light !important; } -@import "../core/font.scss"; -@import "../core/icon.scss"; -@import "../core/mixins.scss"; -@import "../core/base.scss"; -@import "../core/bootstrap.scss"; - -@import "../core/view/common.scss"; -@import "../core/widget/widget.scss"; -@import "../core/view/toolbar.scss"; -@import "../core/view/views.scss"; -@import "../core/layout/all.scss"; - -@import "../core/vendor.scss"; -@import "../core/print.scss"; -@import "../core/news.scss"; -@import "../core/section/all.scss"; -@import "../core/enterprise/all.scss"; +@import "../core/all.scss"; diff --git a/gui/app/styles/themes/deep-orange.scss b/gui/app/styles/themes/deep-orange.scss index 56ef2b0c..b5b644bd 100644 --- a/gui/app/styles/themes/deep-orange.scss +++ b/gui/app/styles/themes/deep-orange.scss @@ -9,7 +9,8 @@ // // https://documize.com -@import "../core/color.scss"; +@import "../colors.scss"; + $color-primary: #BF360C; $color-primary-light: #FBE9E7; $color-link: #FF8A65; @@ -27,20 +28,4 @@ $color-link: #FF8A65; background-color: $color-primary-light !important; } -@import "../core/font.scss"; -@import "../core/icon.scss"; -@import "../core/mixins.scss"; -@import "../core/base.scss"; -@import "../core/bootstrap.scss"; - -@import "../core/view/common.scss"; -@import "../core/widget/widget.scss"; -@import "../core/view/toolbar.scss"; -@import "../core/view/views.scss"; -@import "../core/layout/all.scss"; - -@import "../core/vendor.scss"; -@import "../core/print.scss"; -@import "../core/news.scss"; -@import "../core/section/all.scss"; -@import "../core/enterprise/all.scss"; +@import "../core/all.scss"; diff --git a/gui/app/styles/themes/teal.scss b/gui/app/styles/themes/teal.scss index 8ab3d6fa..32d2f961 100644 --- a/gui/app/styles/themes/teal.scss +++ b/gui/app/styles/themes/teal.scss @@ -9,7 +9,8 @@ // // https://documize.com -@import "../core/color.scss"; +@import "../colors.scss"; + $color-primary: #00695C; $color-primary-light: #E0F2F1; $color-link: #348A37; @@ -27,20 +28,4 @@ $color-link: #348A37; background-color: $color-primary-light !important; } -@import "../core/font.scss"; -@import "../core/icon.scss"; -@import "../core/mixins.scss"; -@import "../core/base.scss"; -@import "../core/bootstrap.scss"; - -@import "../core/view/common.scss"; -@import "../core/widget/widget.scss"; -@import "../core/view/toolbar.scss"; -@import "../core/view/views.scss"; -@import "../core/layout/all.scss"; - -@import "../core/vendor.scss"; -@import "../core/print.scss"; -@import "../core/news.scss"; -@import "../core/section/all.scss"; -@import "../core/enterprise/all.scss"; +@import "../core/all.scss"; diff --git a/gui/app/templates/components/customize/change-log.hbs b/gui/app/templates/components/customize/change-log.hbs index 08684686..2efb8549 100644 --- a/gui/app/templates/components/customize/change-log.hbs +++ b/gui/app/templates/components/customize/change-log.hbs @@ -20,16 +20,16 @@
Release Summary
{{/if}}

- Community Edition {{appMeta.communityLatest}}    + Community Edition {{appMeta.communityLatest}}    Windows · Linux · macOS 

- Enterprise Edition {{appMeta.enterpriseLatest}}    - Windows · - Linux · - macOS  + Enterprise Edition {{appMeta.enterpriseLatest}}    + Windows · + Linux · + macOS 

{{{changelog}}} diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs index 1977c334..6f737b5c 100644 --- a/gui/app/templates/components/customize/user-list.hbs +++ b/gui/app/templates/components/customize/user-list.hbs @@ -95,7 +95,7 @@
{{#if user.me}} - check_box_outline_blank + check_box_outline_blank {{else if user.selected}} check_box {{else}} @@ -131,7 +131,7 @@ {{#if user.me}} - check_box + check_box {{else if user.admin}} check_box {{else}} @@ -147,7 +147,7 @@ {{#if user.me}} - check_box + check_box {{else if user.active}} check_box {{else}} diff --git a/gui/app/templates/components/document/document-toc.hbs b/gui/app/templates/components/document/document-toc.hbs index 2954cc9a..ce019db5 100644 --- a/gui/app/templates/components/document/document-toc.hbs +++ b/gui/app/templates/components/document/document-toc.hbs @@ -34,11 +34,11 @@ title={{item.page.title}}> {{item.page.numbering}} {{#if (or item.userHasChangePending userHasNewPagePending)}} - [*]  + [*]  {{/if}} {{#if (or permissions.documentApprove roles.documentApprove)}} {{#if item.changeAwaitingReview}} - [*]  + [*]  {{/if}} {{/if}} {{item.page.title}} diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs index 79417417..537a3fc3 100644 --- a/gui/app/templates/components/folder/settings-permissions.hbs +++ b/gui/app/templates/components/folder/settings-permissions.hbs @@ -51,7 +51,7 @@ people -  {{permission.name}} +  {{permission.name}} ({{permission.members}}) {{else}} @@ -59,7 +59,7 @@ language -  {{permission.name}} +  {{permission.name}} {{else}} person diff --git a/gui/app/templates/components/layout/master-sidebar.hbs b/gui/app/templates/components/layout/master-sidebar.hbs index 716cf92a..187f910b 100644 --- a/gui/app/templates/components/layout/master-sidebar.hbs +++ b/gui/app/templates/components/layout/master-sidebar.hbs @@ -33,7 +33,8 @@ {{#if session.authenticated}} {{#if hasPins}}
{{#if hasSpacePins}} @@ -66,7 +67,7 @@ {{#if session.isAdmin}} {{#link-to 'customize.general' class="dropdown-item"}}Settings{{/link-to}} {{#unless appMeta.valid}} - {{#link-to 'customize.billing' class="dropdown-item font-weight-bold color-red"}}Update Billing{{/link-to}} + {{#link-to 'customize.billing' class="dropdown-item font-weight-bold color-red-600"}}Update Billing{{/link-to}} {{/unless}}
{{/if}} @@ -74,10 +75,10 @@
{{#if session.isGlobalAdmin}} {{#if appMeta.updateAvailable}} - {{#link-to 'customize.product' class="dropdown-item font-weight-bold color-orange" }}Update available{{/link-to}} + {{#link-to 'customize.product' class="dropdown-item font-weight-bold color-yellow-600" }}Update available{{/link-to}} {{/if}} {{/if}} - What's New + What's New Help About {{#if enableLogout}} @@ -87,7 +88,6 @@
{{/if}} - What's New + What's New Help About {{#if enableLogout}} diff --git a/gui/app/templates/components/password-reset.hbs b/gui/app/templates/components/password-reset.hbs index 1a89db5c..1dcdc6f7 100644 --- a/gui/app/templates/components/password-reset.hbs +++ b/gui/app/templates/components/password-reset.hbs @@ -12,7 +12,7 @@
- Passwords must match + Passwords must match
diff --git a/gui/config/environment.js b/gui/config/environment.js index f4824e0d..78e3c74e 100644 --- a/gui/config/environment.js +++ b/gui/config/environment.js @@ -32,6 +32,13 @@ module.exports = function (environment) { EmberENV: { FEATURES: {} }, + + // Tooltips & Popover component defaults + emberAttacher: { + arrow: false, + // showDelay: 1000 + }, + "ember-cli-mirage": { enabled: false }, diff --git a/gui/package.json b/gui/package.json index 3cc2d0a2..0519a7ae 100644 --- a/gui/package.json +++ b/gui/package.json @@ -23,6 +23,7 @@ "@ember/optional-features": "^0.6.1", "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^3.0.0", + "ember-attacher": "^0.13.10", "ember-cli": "^3.1.4", "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.6.0", diff --git a/gui/yarn.lock b/gui/yarn.lock index def24967..d0907956 100644 --- a/gui/yarn.lock +++ b/gui/yarn.lock @@ -273,6 +273,14 @@ anymatch@^1.3.0: micromatch "^2.1.5" normalize-path "^2.0.0" +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + aot-test-generators@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0" @@ -808,6 +816,14 @@ babel-plugin-filter-imports@^0.3.1: resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.3.1.tgz#e7859b56886b175dd2616425d277b219e209ea8b" integrity sha1-54WbVohrF13SYWQl0neyGeIJ6os= +babel-plugin-filter-imports@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-1.1.2.tgz#c6e1f2685253bbda91b1dc5a6652ce825f771264" + integrity sha512-BpXJV3fndKEP1D9Yhwpz4NIjM/d1FYpdx4E4KmUPnTIFUxXNj0QEAY18MXVzEyYi2EWEVhoOG2CmclDfdMj5ew== + dependencies: + babel-types "^6.26.0" + lodash "^4.17.10" + babel-plugin-htmlbars-inline-precompile@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.2.3.tgz#cd365e278af409bfa6be7704c4354beee742446b" @@ -1493,7 +1509,7 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -braces@^2.3.1: +braces@^2.3.0, braces@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== @@ -1910,6 +1926,17 @@ broccoli-sass-source-maps@^2.1.0: object-assign "^2.0.0" rsvp "^3.0.6" +broccoli-sass-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.0.0.tgz#1ee4c10a810b10955b0502e28f85ab672f5961a2" + integrity sha512-Bjgg0Q626pPwiPU+Sk7jJNjblPEwhceuTzMPw2F5XY+FzdTBMYQKuJYlJ4x2DdsubE95e3rVQeSZ68jA13Nhzg== + dependencies: + broccoli-caching-writer "^3.0.3" + include-path-searcher "^0.1.0" + mkdirp "^0.3.5" + object-assign "^2.0.0" + rsvp "^3.0.6" + broccoli-slow-trees@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4" @@ -2262,11 +2289,36 @@ chokidar@1.6.1: optionalDependencies: fsevents "^1.0.0" +chokidar@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" + integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + lodash.debounce "^4.0.8" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.5" + optionalDependencies: + fsevents "^1.2.2" + chownr@^1.0.1, chownr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= +chownr@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" + integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== + ci-info@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2" @@ -2651,6 +2703,13 @@ convert-source-map@^1.5.0: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU= +convert-source-map@^1.5.1: + version "1.6.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" + integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== + dependencies: + safe-buffer "~5.1.1" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -2790,7 +2849,7 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@~2.6.7: +debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@~2.6.7: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2819,6 +2878,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -3060,6 +3124,21 @@ ember-ajax@^3.0.0: dependencies: ember-cli-babel "^6.0.0" +ember-attacher@^0.13.10: + version "0.13.10" + resolved "https://registry.yarnpkg.com/ember-attacher/-/ember-attacher-0.13.10.tgz#287efe71b4825a7f3a3898b3df6932537a1333bf" + integrity sha512-QNscBe1Lz9llBM9u5YrP0gD8B9NguUFiF3oy3vHzbhQNgGekOl6/9yGVpCGzCgEph17ryWJBdUzVc74PU4GAEQ== + dependencies: + babel-plugin-filter-imports "^1.1.1" + babel6-plugin-strip-class-callcheck "^6.0.0" + broccoli-funnel "^2.0.1" + ember-cli-babel "^6.16.0" + ember-cli-htmlbars "^3.0.0" + ember-cli-sass "^8.0.1" + ember-popper "^0.9.2" + ember-truth-helpers "^2.0.0" + sass "^1.13.2" + ember-cli-app-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.0.tgz#074b0330581a7b8ab094ff07fefb34e0d0254bfd" @@ -3154,7 +3233,7 @@ ember-cli-babel@^6.10.0, ember-cli-babel@^6.6.0: ember-cli-version-checker "^2.1.0" semver "^5.4.1" -ember-cli-babel@^6.11.0: +ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0: version "6.17.2" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz#f0d53d2fb95e70c15d8db84760d045f88f458f69" integrity sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g== @@ -3248,6 +3327,26 @@ ember-cli-htmlbars@^2.0.1: json-stable-stringify "^1.0.0" strip-bom "^3.0.0" +ember-cli-htmlbars@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.5.tgz#b5a105429a6bce4f7c9c97b667e3b8926e31397f" + integrity sha512-3f3PAxdnQ/fhQa8XP/3z4RLRgLHxV8j4Ln75aHbRdemOCjBa048KxL9l+acRLhCulbGQCMnLiIUIC89PAzLrcA== + dependencies: + broccoli-persistent-filter "^1.4.3" + hash-for-dep "^1.2.3" + json-stable-stringify "^1.0.0" + strip-bom "^3.0.0" + +ember-cli-htmlbars@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.0.1.tgz#01e21f0fd05e0a6489154f26614b1041769e3e58" + integrity sha512-pyyB2s52vKTXDC5svU3IjU7GRLg2+5O81o9Ui0ZSiBS14US/bZl46H2dwcdSJAK+T+Za36ZkQM9eh1rNwOxfoA== + dependencies: + broccoli-persistent-filter "^1.4.3" + hash-for-dep "^1.2.3" + json-stable-stringify "^1.0.0" + strip-bom "^3.0.0" + ember-cli-ifa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/ember-cli-ifa/-/ember-cli-ifa-0.7.0.tgz#dbcfef17744d9ee10648dca5025ac55383d528f8" @@ -3307,6 +3406,18 @@ ember-cli-node-assets@^0.1.4: lodash "^4.5.1" resolve "^1.1.7" +ember-cli-node-assets@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708" + integrity sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg= + dependencies: + broccoli-funnel "^1.0.1" + broccoli-merge-trees "^1.1.1" + broccoli-source "^1.1.0" + debug "^2.2.0" + lodash "^4.5.1" + resolve "^1.1.7" + ember-cli-normalize-entity-name@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7" @@ -3351,6 +3462,16 @@ ember-cli-sass@7.1.4: broccoli-sass-source-maps "^2.1.0" ember-cli-version-checker "^2.1.0" +ember-cli-sass@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-8.0.1.tgz#22730bb8eee1eedc6ddd0cf2e51f5405a09b9139" + integrity sha512-sJQiBJo51tReuJmDLHkJ/zIbqSslEjJB2zRPH+6bbhzfznzUfhCLXHthpHCS3SqnVq2rnzZQ8ifdmAX7mRWJ7w== + dependencies: + broccoli-funnel "^1.0.0" + broccoli-merge-trees "^1.1.0" + broccoli-sass-source-maps "^4.0.0" + ember-cli-version-checker "^2.1.0" + ember-cli-shims@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f" @@ -3673,6 +3794,16 @@ ember-hammertime@^1.4.1: ember-get-config "^0.2.4" hammer-timejs "^1.1.0" +ember-in-element-polyfill@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-0.1.3.tgz#cacba70c3244a9148c278bce4704c3feb60c6778" + integrity sha512-zZfjJC0wE1s0yH/UPPPvy64PuEInQ+GdO5v7tqTm/TfR8BiKGvHayxLZ0Kc3C06RGcfiFPU50HvWzLglTpeR+Q== + dependencies: + debug "^3.1.0" + ember-cli-babel "^6.6.0" + ember-cli-version-checker "^2.1.0" + ember-wormhole "^0.5.4" + ember-inflector@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.1.tgz#e9ac469ffa17992a43276bb1c9b8d87992b10d37" @@ -3709,6 +3840,28 @@ ember-maybe-import-regenerator@^0.1.5: ember-cli-babel "^6.0.0-beta.4" regenerator-runtime "^0.9.5" +ember-maybe-in-element@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-0.1.3.tgz#1c89be49246e580c1090336ad8be31e373f71b60" + integrity sha512-cAiG6N9HwvoPsMIePgwECilPrKRrIdfKqx9g8qWHKPS4vwrgS2PTeLmOcJvVYbBTXkHaFZmecDRpf6xAj6zk7A== + dependencies: + ember-cli-babel "^6.11.0" + +ember-popper@^0.9.2: + version "0.9.2" + resolved "https://registry.yarnpkg.com/ember-popper/-/ember-popper-0.9.2.tgz#a09298c2c2dcb66e3299b38e3729d8d2a1d08ad5" + integrity sha512-Umm3NCOAnDqaBUcjlfA8alaDqcZIiNaLzpisFPQ/DMrc8lVUGBhmB6HTmshfAoU22ljZ8FSLk6aUUW10VL/3pg== + dependencies: + babel6-plugin-strip-class-callcheck "^6.0.0" + ember-cli-babel "^6.10.0" + ember-cli-htmlbars "^2.0.3" + ember-cli-node-assets "^0.2.2" + ember-in-element-polyfill "^0.1.2" + ember-maybe-in-element "^0.1.3" + ember-raf-scheduler "^0.1.0" + fastboot-transform "^0.1.0" + popper.js "^1.14.1" + ember-qunit@^3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.2.1.tgz#01fd4d56089e9dcf31514273fca7e5c795469e1a" @@ -3722,6 +3875,13 @@ ember-qunit@^3.2.0: ember-cli-test-loader "^2.2.0" qunit "^2.4.1" +ember-raf-scheduler@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ember-raf-scheduler/-/ember-raf-scheduler-0.1.0.tgz#a22a02d238c374499231c03ab9c5b9887c72a853" + integrity sha1-oioC0jjDdEmSMcA6ucW5iHxyqFM= + dependencies: + ember-cli-babel "^6.6.0" + ember-resolver@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.0.tgz#9248bf534dfc197fafe3118fff538d436078bf99" @@ -3818,6 +3978,14 @@ ember-truth-helpers@^2.0.0: dependencies: ember-cli-babel "^6.8.2" +ember-wormhole@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.5.5.tgz#db417ff748cb21e574cd5f233889897bc27096cb" + integrity sha512-z8l3gpoKmRA2BnTwvnYRk4jKVcETKHpddsD6kpS+EJ4EfyugadFS3zUqBmRDuJhFbNP8BVBLXlbbATj+Rk1Kgg== + dependencies: + ember-cli-babel "^6.10.0" + ember-cli-htmlbars "^2.0.1" + encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" @@ -4468,6 +4636,14 @@ fast-sourcemap-concat@^1.0.1: source-map-url "^0.3.0" sourcemap-validator "^1.0.5" +fastboot-transform@^0.1.0: + version "0.1.3" + resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd" + integrity sha512-6otygPIJw1ARp1jJb+6KVO56iKBjhO+5x59RSC9qiZTbZRrv+HZAuP00KD3s+nWMvcFDemtdkugki9DNFTTwCQ== + dependencies: + broccoli-stew "^1.5.0" + convert-source-map "^1.5.1" + faye-websocket@~0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" @@ -4814,6 +4990,14 @@ fsevents@^1.1.1: nan "^2.3.0" node-pre-gyp "^0.6.39" +fsevents@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" + integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg== + dependencies: + nan "^2.9.2" + node-pre-gyp "^0.10.0" + fstream-ignore@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" @@ -4954,6 +5138,14 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + glob@^5.0.10, glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -5412,6 +5604,13 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.5: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" integrity sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA== +iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" @@ -5719,6 +5918,11 @@ is-extglob@^1.0.0: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -5750,6 +5954,20 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A= + dependencies: + is-extglob "^2.1.1" + is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" @@ -6536,6 +6754,11 @@ lodash.debounce@^3.1.1: dependencies: lodash._getnative "^3.0.0" +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + lodash.defaults@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.3.0.tgz#a832b001f138f3bb9721c2819a2a7cc5ae21ed25" @@ -6778,6 +7001,11 @@ lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= +lodash@^4.17.10: + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" + integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== + log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" @@ -7137,6 +7365,14 @@ minipass@^2.2.4: safe-buffer "^5.1.2" yallist "^3.0.0" +minipass@^2.3.4: + version "2.3.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" + integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minizlib@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" @@ -7144,6 +7380,13 @@ minizlib@^1.1.0: dependencies: minipass "^2.2.1" +minizlib@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42" + integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg== + dependencies: + minipass "^2.2.1" + mississippi@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e" @@ -7279,6 +7522,11 @@ nan@^2.3.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" integrity sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY= +nan@^2.9.2: + version "2.11.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" + integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA== + nanomatch@^1.2.9: version "1.2.9" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" @@ -7302,6 +7550,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" + integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA== + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -7372,6 +7629,22 @@ node-notifier@^5.0.1: shellwords "^0.1.0" which "^1.2.12" +node-pre-gyp@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + node-pre-gyp@^0.6.36: version "0.6.36" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786" @@ -7454,7 +7727,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: +normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= @@ -7562,6 +7835,14 @@ npm-packlist@^1.1.10, npm-packlist@~1.1.10: ignore-walk "^3.0.1" npm-bundled "^1.0.1" +npm-packlist@^1.1.6: + version "1.1.12" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" + integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-pick-manifest@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5" @@ -8056,6 +8337,11 @@ passwd-user@^1.2.1: dependencies: exec-file-sync "^2.0.0" +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + path-exists@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081" @@ -8154,6 +8440,11 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== +popper.js@^1.14.1: + version "1.14.6" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.6.tgz#ab20dd4edf9288b8b3b6531c47c361107b60b4b0" + integrity sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA== + popper.js@^1.14.4: version "1.14.4" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6" @@ -8439,6 +8730,16 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b" @@ -9129,6 +9430,11 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + sane@^1.1.1: version "1.7.0" resolved "https://registry.yarnpkg.com/sane/-/sane-1.7.0.tgz#b3579bccb45c94cf20355cc81124990dfd346e30" @@ -9167,6 +9473,18 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" +sass@^1.13.2: + version "1.15.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.15.1.tgz#25a03f6813413540210580b670628360c36267d3" + integrity sha512-WiDa5BsePB/rQEbh/Fv2pVDUCasxuRYjW7GsWx8Ld23LY61vx1VV5Mzf/7mu5kLWKMryMqo65fzYL34HgaM47w== + dependencies: + chokidar "^2.0.0" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -9909,6 +10227,19 @@ tar@^2.0.0, tar@^2.2.1: fstream "^1.0.2" inherits "2" +tar@^4: + version "4.4.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" + integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.4" + minizlib "^1.1.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + tar@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.0.tgz#3aaf8c29b6b800a8215f33efb4df1c95ce2ac2f5" @@ -10292,6 +10623,11 @@ unzip-response@^2.0.1: resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= +upath@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" + integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== + update-notifier@^2.3.0, update-notifier@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"