From 429a40e65cfd0048b3cf728f6edf41784b5fa2db Mon Sep 17 00:00:00 2001 From: Solodyagin Date: Tue, 24 May 2022 09:13:18 +0300 Subject: [PATCH] chore(deps-dev): bump sass from 1.51.0 to 1.52.1 --- .browserslistrc | 6 +- .editorconfig | 18 +- .eslintignore | 4 +- .eslintrc.js | 34 +- .gitignore | 54 +- .prettierrc.js | 22 +- babel.config.js | 10 +- lib/components/GGanttBar.vue | 1340 ++++++++--------- lib/components/GGanttChart.vue | 962 ++++++------ lib/components/GGanttGrid.vue | 156 +- lib/components/GGanttRow.vue | 406 ++--- lib/components/GGanttTimeaxis.vue | 448 +++--- lib/index.js | 38 +- lib/scss/_ganttastic.scss | 546 +++---- lib/scss/_variables.scss | 26 +- lib/scss/index.scss | 72 +- lib/scss/themes/creamy/_variables.scss | 14 +- lib/scss/themes/creamy/index.scss | 6 +- lib/scss/themes/crimson/_variables.scss | 14 +- lib/scss/themes/crimson/index.scss | 6 +- lib/scss/themes/dark/_variables.scss | 20 +- lib/scss/themes/dark/index.scss | 6 +- lib/scss/themes/flare/_variables.scss | 14 +- lib/scss/themes/flare/index.scss | 6 +- lib/scss/themes/fuchsia/_variables.scss | 18 +- lib/scss/themes/fuchsia/index.scss | 6 +- lib/scss/themes/grove/_variables.scss | 14 +- lib/scss/themes/grove/index.scss | 6 +- lib/scss/themes/material-blue/_variables.scss | 14 +- lib/scss/themes/material-blue/index.scss | 6 +- lib/scss/themes/sky/_variables.scss | 14 +- lib/scss/themes/sky/index.scss | 6 +- lib/scss/themes/slumber/_variables.scss | 20 +- lib/scss/themes/slumber/index.scss | 6 +- lib/scss/themes/vue/_variables.scss | 14 +- lib/scss/themes/vue/index.scss | 6 +- package-lock.json | 14 +- package.json | 2 +- public/index.html | 34 +- src/App.vue | 764 +++++----- src/main.js | 24 +- vetur.config.js | 16 +- vue.config.js | 48 +- 43 files changed, 2630 insertions(+), 2630 deletions(-) diff --git a/.browserslistrc b/.browserslistrc index 214388f..256c3b8 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1,3 +1,3 @@ -> 1% -last 2 versions -not dead +> 1% +last 2 versions +not dead diff --git a/.editorconfig b/.editorconfig index 9d08a1a..9f73416 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.eslintignore b/.eslintignore index 5df41e2..3f2da39 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,2 @@ -demo -dist +demo +dist diff --git a/.eslintrc.js b/.eslintrc.js index 8ad90db..44b5ddd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,17 +1,17 @@ -module.exports = { - root: true, - env: { - node: true - }, - 'extends': [ - 'plugin:vue/essential', - 'eslint:recommended' - ], - parserOptions: { - parser: 'babel-eslint' - }, - rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off' - } -} +module.exports = { + root: true, + env: { + node: true + }, + 'extends': [ + 'plugin:vue/essential', + 'eslint:recommended' + ], + parserOptions: { + parser: 'babel-eslint' + }, + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off' + } +} diff --git a/.gitignore b/.gitignore index ef726f3..aa5b09c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,27 @@ -.DS_Store - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? - -# npm -node_modules - -# output directories -/demo -/dist +.DS_Store + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +# npm +node_modules + +# output directories +/demo +/dist diff --git a/.prettierrc.js b/.prettierrc.js index f1080ec..027b445 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,11 +1,11 @@ -module.exports = { - arrowParens: 'avoid', - bracketSpacing: true, - printWidth: 80, - semi: false, - singleQuote: true, - tabWidth: 2, - trailingComma: 'none', - useTabs: false, - vueIndentScriptAndStyle: true -} +module.exports = { + arrowParens: 'avoid', + bracketSpacing: true, + printWidth: 80, + semi: false, + singleQuote: true, + tabWidth: 2, + trailingComma: 'none', + useTabs: false, + vueIndentScriptAndStyle: true +} diff --git a/babel.config.js b/babel.config.js index e955840..a673655 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,5 @@ -module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} +module.exports = { + presets: [ + '@vue/cli-plugin-babel/preset' + ] +} diff --git a/lib/components/GGanttBar.vue b/lib/components/GGanttBar.vue index 183ef42..8527736 100644 --- a/lib/components/GGanttBar.vue +++ b/lib/components/GGanttBar.vue @@ -1,670 +1,670 @@ - - - + + + diff --git a/lib/components/GGanttChart.vue b/lib/components/GGanttChart.vue index df2c1f0..57b0288 100644 --- a/lib/components/GGanttChart.vue +++ b/lib/components/GGanttChart.vue @@ -1,481 +1,481 @@ - - - + + + diff --git a/lib/components/GGanttGrid.vue b/lib/components/GGanttGrid.vue index e03c7a8..ec86e20 100644 --- a/lib/components/GGanttGrid.vue +++ b/lib/components/GGanttGrid.vue @@ -1,78 +1,78 @@ - - - + + + diff --git a/lib/components/GGanttRow.vue b/lib/components/GGanttRow.vue index f9b72ec..12ddfd7 100644 --- a/lib/components/GGanttRow.vue +++ b/lib/components/GGanttRow.vue @@ -1,203 +1,203 @@ - - - + + + diff --git a/lib/components/GGanttTimeaxis.vue b/lib/components/GGanttTimeaxis.vue index 7a6cd70..de1cb60 100644 --- a/lib/components/GGanttTimeaxis.vue +++ b/lib/components/GGanttTimeaxis.vue @@ -1,224 +1,224 @@ - - - + + + diff --git a/lib/index.js b/lib/index.js index 84b9bb9..8be9d89 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,19 +1,19 @@ -import GGanttChart from './components/GGanttChart.vue' -import GGanttRow from './components/GGanttRow.vue' -import './scss/index.scss' - -const VueGanttastic = { GGanttChart, GGanttRow } - -const install = Vue => { - Object.keys(VueGanttastic).forEach(name => { - Vue.component(name, VueGanttastic[name]) - }) -} - -if (typeof window !== 'undefined' && window.Vue) { - install(window.Vue) -} - -export default VueGanttastic - -export { GGanttChart, GGanttRow } +import GGanttChart from './components/GGanttChart.vue' +import GGanttRow from './components/GGanttRow.vue' +import './scss/index.scss' + +const VueGanttastic = { GGanttChart, GGanttRow } + +const install = Vue => { + Object.keys(VueGanttastic).forEach(name => { + Vue.component(name, VueGanttastic[name]) + }) +} + +if (typeof window !== 'undefined' && window.Vue) { + install(window.Vue) +} + +export default VueGanttastic + +export { GGanttChart, GGanttRow } diff --git a/lib/scss/_ganttastic.scss b/lib/scss/_ganttastic.scss index 9485d97..b7a6c49 100644 --- a/lib/scss/_ganttastic.scss +++ b/lib/scss/_ganttastic.scss @@ -1,273 +1,273 @@ -.g-gantt-chart { - position: relative; - overflow: auto; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - padding-bottom: 34px; - border: 1px solid $border-color; - box-sizing: border-box; - background: $background; - flex: 1; - - & >>> * { - font-family: Roboto, Verdana; - } -} - -.g-gantt-timeaxis, -.g-gantt-timeaxis__days, -.g-gantt-timeaxis__day, -.g-gantt-timeaxis__day > div { - display: flex; -} - -.g-gantt-timeaxis { - position: sticky; - top: 0; - background: $timeaxis-background; - z-index: 4; - box-shadow: 0px 1px 3px 2px rgba(50, 50, 50, 0.5); -} - -.g-gantt-timeaxis__empty-space { - min-height: 100%; - background: $secondary; - z-index: 5; - left: 0; - position: sticky; -} - -.g-gantt-timeaxis__days { - position: relative; - height: 100%; -} - -.g-gantt-timeaxis__day { - height: 100%; - flex-direction: column; - color: $text; - - &:nth-child(even) { - background: $secondary; - } - - &:nth-child(odd) { - background: $primary; - } - - & > div:nth-child(1) { - /* day text */ - justify-content: space-around; - font-weight: bold; - align-items: center; - } -} - -.g-gantt-timeaxis__days { - align-items: flex-end; - justify-content: space-between; - background: $ternary; - color: $text; -} - -.g-gantt-timeaxis__hour { - display: flex; - justify-content: space-between; - align-items: flex-start; - flex-direction: column; - opacity: 0.5; - color: $text; - - &:nth-child(even) { - background: $secondary; - } - - &:nth-child(odd) { - background: $primary; - } -} - -.g-gantt-timeaxis__hour-pin { - width: 1px; - height: 5px; - background: $text; -} - -.g-gantt-timeaxis__marker { - position: absolute; - left: 0; - bottom: 0; - height: 5px; - width: 3px; - background: $marker-background; -} - -.g-gantt-rows-container { - position: relative; -} - -.g-gantt-grid { - position: absolute; - top: 0; - bottom: 0; - overflow: hidden; -} - -.g-gantt-grid__line { - height: 100%; - border: 1px solid transparent; - border-left: 1px solid $border-color; - box-sizing: border-box; - display: inline-block; -} - -.g-gantt-grid-line-last { - border-right: 1px solid $border-color; -} - -.g-gantt-grid-line-highlighted { - background: $highlighted; -} - -.g-gantt-row { - display: flex; - width: 100%; - height: 40px; - transition: background-color 0.2s; - position: relative; -} - -.g-gantt-row-highlighted { - background-color: $hover-highlight; -} - -.g-gantt-row__label { - display: flex; - align-items: center; - background: $ternary; - color: $text; - font-size: 0.9em; - z-index: 3; - font-weight: bold; - left: 0; - position: sticky; - padding: 0 10px; - box-sizing: border-box; - border-top: 1px solid $row-label-border-color; - border-bottom: 1px solid $row-label-border-color; - - & > * { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } -} - -.g-gantt-row__bars-container { - position: relative; - border-top: 1px solid $border-color; - border-bottom: 1px solid $border-color; - flex: 1; -} - -.g-gantt-bar { - position: absolute; - top: 2px; - left: 30px; - display: flex; - justify-content: space-between; - align-items: center; - color: white; - width: 300px; - height: 34px; - border-radius: 15px; - background: #79869c; - overflow: hidden; - cursor: move; -} - -.g-gantt-bar-immobile { - cursor: unset; -} - -.g-gantt-bar__label { - width: 100%; - height: 100%; - box-sizing: border-box; - padding: 0 4px 0 4px; - display: flex; - justify-content: center; - align-items: center; - - img { - pointer-events: none; - } - - & > * { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} - -.g-gantt-bar-resizable .g-gantt-bar__label { - padding: 0 14px 0 14px; /* 14px is the width of the handle */ -} - -.g-gantt-bar__handle-left, -.g-gantt-bar__handle-right { - position: absolute; - width: 10px; - height: 100%; - background: white; - opacity: 0.7; - border-radius: 40px; -} - -.g-gantt-bar__handle-left { - left: 0; - cursor: w-resize; -} - -.g-gantt-bar__handle-right { - right: 0; - cursor: e-resize; -} - -.g-gantt-bar__tooltip { - position: absolute; - background: $tooltip-background; - color: $tooltip-color; - z-index: 3; - font-size: 0.7em; - padding: 3px; - border-radius: 3px; - transition: opacity 0.2s; - display: flex; - align-items: center; - - &:before { - content: ''; - position: absolute; - top: 0; - left: 10%; - width: 0; - height: 0; - border: 10px solid transparent; - border-bottom-color: $tooltip-background; - border-top: 0; - margin-left: -5px; - margin-top: -5px; - } - - & > .color-indicator { - width: 8px; - height: 8px; - border-radius: 100%; - margin-right: 4px; - } -} +.g-gantt-chart { + position: relative; + overflow: auto; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + padding-bottom: 34px; + border: 1px solid $border-color; + box-sizing: border-box; + background: $background; + flex: 1; + + & >>> * { + font-family: Roboto, Verdana; + } +} + +.g-gantt-timeaxis, +.g-gantt-timeaxis__days, +.g-gantt-timeaxis__day, +.g-gantt-timeaxis__day > div { + display: flex; +} + +.g-gantt-timeaxis { + position: sticky; + top: 0; + background: $timeaxis-background; + z-index: 4; + box-shadow: 0px 1px 3px 2px rgba(50, 50, 50, 0.5); +} + +.g-gantt-timeaxis__empty-space { + min-height: 100%; + background: $secondary; + z-index: 5; + left: 0; + position: sticky; +} + +.g-gantt-timeaxis__days { + position: relative; + height: 100%; +} + +.g-gantt-timeaxis__day { + height: 100%; + flex-direction: column; + color: $text; + + &:nth-child(even) { + background: $secondary; + } + + &:nth-child(odd) { + background: $primary; + } + + & > div:nth-child(1) { + /* day text */ + justify-content: space-around; + font-weight: bold; + align-items: center; + } +} + +.g-gantt-timeaxis__days { + align-items: flex-end; + justify-content: space-between; + background: $ternary; + color: $text; +} + +.g-gantt-timeaxis__hour { + display: flex; + justify-content: space-between; + align-items: flex-start; + flex-direction: column; + opacity: 0.5; + color: $text; + + &:nth-child(even) { + background: $secondary; + } + + &:nth-child(odd) { + background: $primary; + } +} + +.g-gantt-timeaxis__hour-pin { + width: 1px; + height: 5px; + background: $text; +} + +.g-gantt-timeaxis__marker { + position: absolute; + left: 0; + bottom: 0; + height: 5px; + width: 3px; + background: $marker-background; +} + +.g-gantt-rows-container { + position: relative; +} + +.g-gantt-grid { + position: absolute; + top: 0; + bottom: 0; + overflow: hidden; +} + +.g-gantt-grid__line { + height: 100%; + border: 1px solid transparent; + border-left: 1px solid $border-color; + box-sizing: border-box; + display: inline-block; +} + +.g-gantt-grid-line-last { + border-right: 1px solid $border-color; +} + +.g-gantt-grid-line-highlighted { + background: $highlighted; +} + +.g-gantt-row { + display: flex; + width: 100%; + height: 40px; + transition: background-color 0.2s; + position: relative; +} + +.g-gantt-row-highlighted { + background-color: $hover-highlight; +} + +.g-gantt-row__label { + display: flex; + align-items: center; + background: $ternary; + color: $text; + font-size: 0.9em; + z-index: 3; + font-weight: bold; + left: 0; + position: sticky; + padding: 0 10px; + box-sizing: border-box; + border-top: 1px solid $row-label-border-color; + border-bottom: 1px solid $row-label-border-color; + + & > * { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } +} + +.g-gantt-row__bars-container { + position: relative; + border-top: 1px solid $border-color; + border-bottom: 1px solid $border-color; + flex: 1; +} + +.g-gantt-bar { + position: absolute; + top: 2px; + left: 30px; + display: flex; + justify-content: space-between; + align-items: center; + color: white; + width: 300px; + height: 34px; + border-radius: 15px; + background: #79869c; + overflow: hidden; + cursor: move; +} + +.g-gantt-bar-immobile { + cursor: unset; +} + +.g-gantt-bar__label { + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 0 4px 0 4px; + display: flex; + justify-content: center; + align-items: center; + + img { + pointer-events: none; + } + + & > * { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } +} + +.g-gantt-bar-resizable .g-gantt-bar__label { + padding: 0 14px 0 14px; /* 14px is the width of the handle */ +} + +.g-gantt-bar__handle-left, +.g-gantt-bar__handle-right { + position: absolute; + width: 10px; + height: 100%; + background: white; + opacity: 0.7; + border-radius: 40px; +} + +.g-gantt-bar__handle-left { + left: 0; + cursor: w-resize; +} + +.g-gantt-bar__handle-right { + right: 0; + cursor: e-resize; +} + +.g-gantt-bar__tooltip { + position: absolute; + background: $tooltip-background; + color: $tooltip-color; + z-index: 3; + font-size: 0.7em; + padding: 3px; + border-radius: 3px; + transition: opacity 0.2s; + display: flex; + align-items: center; + + &:before { + content: ''; + position: absolute; + top: 0; + left: 10%; + width: 0; + height: 0; + border: 10px solid transparent; + border-bottom-color: $tooltip-background; + border-top: 0; + margin-left: -5px; + margin-top: -5px; + } + + & > .color-indicator { + width: 8px; + height: 8px; + border-radius: 100%; + margin-right: 4px; + } +} diff --git a/lib/scss/_variables.scss b/lib/scss/_variables.scss index e9bd4f4..a9d97e5 100644 --- a/lib/scss/_variables.scss +++ b/lib/scss/_variables.scss @@ -1,13 +1,13 @@ -$primary: #eee !default; -$secondary: #e0e0e0 !default; -$ternary: #f5f5f5 !default; -$hover-highlight: rgba(204, 216, 219, 0.5) !default; -$text: #404040 !default; -$background: #fff !default; -$highlighted: #dcefff !default; -$border-color: #eaeaea !default; -$timeaxis-background: #fff !default; -$marker-background: #000 !default; -$row-label-border-color: $border-color !default; -$tooltip-background: #000; -$tooltip-color: #fff; +$primary: #eee !default; +$secondary: #e0e0e0 !default; +$ternary: #f5f5f5 !default; +$hover-highlight: rgba(204, 216, 219, 0.5) !default; +$text: #404040 !default; +$background: #fff !default; +$highlighted: #dcefff !default; +$border-color: #eaeaea !default; +$timeaxis-background: #fff !default; +$marker-background: #000 !default; +$row-label-border-color: $border-color !default; +$tooltip-background: #000; +$tooltip-color: #fff; diff --git a/lib/scss/index.scss b/lib/scss/index.scss index 38bbcbd..65684e9 100644 --- a/lib/scss/index.scss +++ b/lib/scss/index.scss @@ -1,36 +1,36 @@ -@use "sass:meta"; - -// default -@import './variables'; -@import './ganttastic'; - -[data-theme] { - display: flex; - flex-direction: column; -} - -$themes: 'creamy', 'crimson', 'dark', 'flare', 'fuchsia', 'grove', - 'material-blue', 'sky', 'slumber', 'vue'; - -@each $theme in $themes { - [data-theme='#{$theme}'] { - @include meta.load-css('./themes/#{$theme}'); - } -} - -.fade-enter-active { - animation: fade-in 0.3s; -} - -.fade-leave-active { - animation: fade-in 0.3s reverse; -} - -@keyframes fade-in { - from { - opacity: 0; - } - to { - opacity: 1; - } -} +@use "sass:meta"; + +// default +@import './variables'; +@import './ganttastic'; + +[data-theme] { + display: flex; + flex-direction: column; +} + +$themes: 'creamy', 'crimson', 'dark', 'flare', 'fuchsia', 'grove', + 'material-blue', 'sky', 'slumber', 'vue'; + +@each $theme in $themes { + [data-theme='#{$theme}'] { + @include meta.load-css('./themes/#{$theme}'); + } +} + +.fade-enter-active { + animation: fade-in 0.3s; +} + +.fade-leave-active { + animation: fade-in 0.3s reverse; +} + +@keyframes fade-in { + from { + opacity: 0; + } + to { + opacity: 1; + } +} diff --git a/lib/scss/themes/creamy/_variables.scss b/lib/scss/themes/creamy/_variables.scss index 39c3e6a..1df9966 100644 --- a/lib/scss/themes/creamy/_variables.scss +++ b/lib/scss/themes/creamy/_variables.scss @@ -1,7 +1,7 @@ -$primary: #ffe8d9; -$secondary: #fcdcc5; -$ternary: #fff6f0; -$hover-highlight: rgba(230, 221, 202, 0.5); -$text: #542d05; -$background: #fff; -$row-label-border-color: #f7efe9; +$primary: #ffe8d9; +$secondary: #fcdcc5; +$ternary: #fff6f0; +$hover-highlight: rgba(230, 221, 202, 0.5); +$text: #542d05; +$background: #fff; +$row-label-border-color: #f7efe9; diff --git a/lib/scss/themes/creamy/index.scss b/lib/scss/themes/creamy/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/creamy/index.scss +++ b/lib/scss/themes/creamy/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/crimson/_variables.scss b/lib/scss/themes/crimson/_variables.scss index ef3ce30..26a9fd8 100644 --- a/lib/scss/themes/crimson/_variables.scss +++ b/lib/scss/themes/crimson/_variables.scss @@ -1,7 +1,7 @@ -$primary: #a82039; -$secondary: #c41238; -$ternary: #db4f56; -$hover-highlight: rgba(196, 141, 141, 0.5); -$text: white; -$background: white; -$row-label-border-color: #e6535a; +$primary: #a82039; +$secondary: #c41238; +$ternary: #db4f56; +$hover-highlight: rgba(196, 141, 141, 0.5); +$text: white; +$background: white; +$row-label-border-color: #e6535a; diff --git a/lib/scss/themes/crimson/index.scss b/lib/scss/themes/crimson/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/crimson/index.scss +++ b/lib/scss/themes/crimson/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/dark/_variables.scss b/lib/scss/themes/dark/_variables.scss index f2561dc..185fb51 100644 --- a/lib/scss/themes/dark/_variables.scss +++ b/lib/scss/themes/dark/_variables.scss @@ -1,10 +1,10 @@ -$primary: #404040; -$secondary: #303030; -$ternary: #353535; -$hover-highlight: rgba(159, 160, 161, 0.5); -$text: #adb5bd; -$background: #525252; -$highlighted: #7e7e7e; -$border-color: #444444; -$marker-background: #666666; -$row-label-border-color: $border-color; +$primary: #404040; +$secondary: #303030; +$ternary: #353535; +$hover-highlight: rgba(159, 160, 161, 0.5); +$text: #adb5bd; +$background: #525252; +$highlighted: #7e7e7e; +$border-color: #444444; +$marker-background: #666666; +$row-label-border-color: $border-color; diff --git a/lib/scss/themes/dark/index.scss b/lib/scss/themes/dark/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/dark/index.scss +++ b/lib/scss/themes/dark/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/flare/_variables.scss b/lib/scss/themes/flare/_variables.scss index 3cf8b96..73e0822 100644 --- a/lib/scss/themes/flare/_variables.scss +++ b/lib/scss/themes/flare/_variables.scss @@ -1,7 +1,7 @@ -$primary: #e08a38; -$secondary: #e67912; -$ternary: #5e5145; -$hover-highlight: rgba(196, 141, 141, 0.5); -$text: #fff; -$background: #fff; -$row-label-border-color: #6b5c4e; +$primary: #e08a38; +$secondary: #e67912; +$ternary: #5e5145; +$hover-highlight: rgba(196, 141, 141, 0.5); +$text: #fff; +$background: #fff; +$row-label-border-color: #6b5c4e; diff --git a/lib/scss/themes/flare/index.scss b/lib/scss/themes/flare/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/flare/index.scss +++ b/lib/scss/themes/flare/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/fuchsia/_variables.scss b/lib/scss/themes/fuchsia/_variables.scss index 0ee466f..cb98648 100644 --- a/lib/scss/themes/fuchsia/_variables.scss +++ b/lib/scss/themes/fuchsia/_variables.scss @@ -1,9 +1,9 @@ -$primary: #de1d5a; -$secondary: #b50b41; -$ternary: #ff7da6; -$hover-highlight: rgba(196, 141, 141, 0.5); -$text: #fff; -$background: #fff; -$row-label-border-color: #f2779e; -$tooltip-background: $primary; -$tooltip-color: #fff; +$primary: #de1d5a; +$secondary: #b50b41; +$ternary: #ff7da6; +$hover-highlight: rgba(196, 141, 141, 0.5); +$text: #fff; +$background: #fff; +$row-label-border-color: #f2779e; +$tooltip-background: $primary; +$tooltip-color: #fff; diff --git a/lib/scss/themes/fuchsia/index.scss b/lib/scss/themes/fuchsia/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/fuchsia/index.scss +++ b/lib/scss/themes/fuchsia/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/grove/_variables.scss b/lib/scss/themes/grove/_variables.scss index dba3b89..2f6dd5f 100644 --- a/lib/scss/themes/grove/_variables.scss +++ b/lib/scss/themes/grove/_variables.scss @@ -1,7 +1,7 @@ -$primary: #3d9960; -$secondary: #288542; -$ternary: #72b585; -$hover-highlight: rgba(160, 219, 171, 0.5); -$text: white; -$background: white; -$row-label-border-color: #73bd88; +$primary: #3d9960; +$secondary: #288542; +$ternary: #72b585; +$hover-highlight: rgba(160, 219, 171, 0.5); +$text: white; +$background: white; +$row-label-border-color: #73bd88; diff --git a/lib/scss/themes/grove/index.scss b/lib/scss/themes/grove/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/grove/index.scss +++ b/lib/scss/themes/grove/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/material-blue/_variables.scss b/lib/scss/themes/material-blue/_variables.scss index 6164eb6..21036b2 100644 --- a/lib/scss/themes/material-blue/_variables.scss +++ b/lib/scss/themes/material-blue/_variables.scss @@ -1,7 +1,7 @@ -$primary: #0d47a1; -$secondary: #1565c0; -$ternary: #42a5f5; -$hover-highlight: rgba(110, 165, 196, 0.5); -$text: white; -$background: white; -$row-label-border-color: #45abff; +$primary: #0d47a1; +$secondary: #1565c0; +$ternary: #42a5f5; +$hover-highlight: rgba(110, 165, 196, 0.5); +$text: white; +$background: white; +$row-label-border-color: #45abff; diff --git a/lib/scss/themes/material-blue/index.scss b/lib/scss/themes/material-blue/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/material-blue/index.scss +++ b/lib/scss/themes/material-blue/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/sky/_variables.scss b/lib/scss/themes/sky/_variables.scss index 425c2f7..a22e3c5 100644 --- a/lib/scss/themes/sky/_variables.scss +++ b/lib/scss/themes/sky/_variables.scss @@ -1,7 +1,7 @@ -$primary: #b5e3ff; -$secondary: #a1d6f7; -$ternary: #d6f7ff; -$hover-highlight: rgba(193, 202, 214, 0.5); -$text: #022c47; -$background: white; -$row-label-border-color: #cbf4fe; +$primary: #b5e3ff; +$secondary: #a1d6f7; +$ternary: #d6f7ff; +$hover-highlight: rgba(193, 202, 214, 0.5); +$text: #022c47; +$background: white; +$row-label-border-color: #cbf4fe; diff --git a/lib/scss/themes/sky/index.scss b/lib/scss/themes/sky/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/sky/index.scss +++ b/lib/scss/themes/sky/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/slumber/_variables.scss b/lib/scss/themes/slumber/_variables.scss index dac0ee0..c020e4e 100644 --- a/lib/scss/themes/slumber/_variables.scss +++ b/lib/scss/themes/slumber/_variables.scss @@ -1,10 +1,10 @@ -$primary: #2c2e36; -$secondary: #2f3447; -$ternary: #35394d; -$hover-highlight: rgba(179, 162, 127, 0.5); -$text: #ffe0b3; -$background: #38383b; -$highlighted: #7e7e7e; -$border-color: #444; -$marker-background: #666; -$row-label-border-color: $border-color; +$primary: #2c2e36; +$secondary: #2f3447; +$ternary: #35394d; +$hover-highlight: rgba(179, 162, 127, 0.5); +$text: #ffe0b3; +$background: #38383b; +$highlighted: #7e7e7e; +$border-color: #444; +$marker-background: #666; +$row-label-border-color: $border-color; diff --git a/lib/scss/themes/slumber/index.scss b/lib/scss/themes/slumber/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/slumber/index.scss +++ b/lib/scss/themes/slumber/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/lib/scss/themes/vue/_variables.scss b/lib/scss/themes/vue/_variables.scss index d83e418..7074dff 100644 --- a/lib/scss/themes/vue/_variables.scss +++ b/lib/scss/themes/vue/_variables.scss @@ -1,7 +1,7 @@ -$primary: #258a5d; -$secondary: #41b883; -$ternary: #35495e; -$hover-highlight: rgba(160, 219, 171, 0.5); -$text: #fff; -$background: #fff; -$row-label-border-color: #384d63; +$primary: #258a5d; +$secondary: #41b883; +$ternary: #35495e; +$hover-highlight: rgba(160, 219, 171, 0.5); +$text: #fff; +$background: #fff; +$row-label-border-color: #384d63; diff --git a/lib/scss/themes/vue/index.scss b/lib/scss/themes/vue/index.scss index 19e702b..2841d3e 100644 --- a/lib/scss/themes/vue/index.scss +++ b/lib/scss/themes/vue/index.scss @@ -1,3 +1,3 @@ -@import '../../variables'; -@import './variables'; -@import '../../ganttastic'; +@import '../../variables'; +@import './variables'; +@import '../../ganttastic'; diff --git a/package-lock.json b/package-lock.json index 503f2f8..fc3d3cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "babel-eslint": "^10.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^8.7.1", - "sass": "^1.51.0", + "sass": "^1.52.1", "sass-loader": "^10.2.1", "vue-template-compiler": "^2.6.11" }, @@ -12809,9 +12809,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz", - "integrity": "sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==", + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -26849,9 +26849,9 @@ "dev": true }, "sass": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz", - "integrity": "sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==", + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index 15fb5e2..634cd12 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "babel-eslint": "^10.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^8.7.1", - "sass": "^1.51.0", + "sass": "^1.52.1", "sass-loader": "^10.2.1", "vue-template-compiler": "^2.6.11" }, diff --git a/public/index.html b/public/index.html index 4123528..eecdaa0 100644 --- a/public/index.html +++ b/public/index.html @@ -1,17 +1,17 @@ - - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
- - - + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + +
+ + + diff --git a/src/App.vue b/src/App.vue index 024558e..54cae80 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,382 +1,382 @@ - - - - - + + + + + diff --git a/src/main.js b/src/main.js index 7e9a906..4287ba8 100644 --- a/src/main.js +++ b/src/main.js @@ -1,12 +1,12 @@ -import Vue from 'vue' -import App from './App.vue' -import { GGanttChart, GGanttRow } from '../lib' - -Vue.component('GGanttChart', GGanttChart) -Vue.component('GGanttRow', GGanttRow) - -Vue.config.productionTip = false - -new Vue({ - render: h => h(App) -}).$mount('#app') +import Vue from 'vue' +import App from './App.vue' +import { GGanttChart, GGanttRow } from '../lib' + +Vue.component('GGanttChart', GGanttChart) +Vue.component('GGanttRow', GGanttRow) + +Vue.config.productionTip = false + +new Vue({ + render: h => h(App) +}).$mount('#app') diff --git a/vetur.config.js b/vetur.config.js index 20c36f5..2bd857d 100644 --- a/vetur.config.js +++ b/vetur.config.js @@ -1,8 +1,8 @@ -// vetur.config.js -/** @type {import('vls').VeturConfig} */ -module.exports = { - settings: { - 'vetur.ignoreProjectWarning': true, - }, - projects: ['./'], -} +// vetur.config.js +/** @type {import('vls').VeturConfig} */ +module.exports = { + settings: { + 'vetur.ignoreProjectWarning': true, + }, + projects: ['./'], +} diff --git a/vue.config.js b/vue.config.js index 20778fd..c151d0a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,24 +1,24 @@ -const isBuildLib = - (process.env.npm_lifecycle_script || '').indexOf('--target lib') > 0 - -module.exports = { - publicPath: '', - outputDir: isBuildLib ? 'dist' : 'demo', - css: { - loaderOptions: { - sass: { - implementation: require('sass') - } - }, - extract: true - }, - productionSourceMap: false, - chainWebpack: config => { - if (process.env.VUE_CLI_BUILD_TARGET === 'lib') { - config.externals({ - ...config.get('externals'), - moment: 'moment' - }) - } - } -} +const isBuildLib = + (process.env.npm_lifecycle_script || '').indexOf('--target lib') > 0 + +module.exports = { + publicPath: '', + outputDir: isBuildLib ? 'dist' : 'demo', + css: { + loaderOptions: { + sass: { + implementation: require('sass') + } + }, + extract: true + }, + productionSourceMap: false, + chainWebpack: config => { + if (process.env.VUE_CLI_BUILD_TARGET === 'lib') { + config.externals({ + ...config.get('externals'), + moment: 'moment' + }) + } + } +}