From 6052512a02721885027625a9e6f03c6ed01f6bc9 Mon Sep 17 00:00:00 2001 From: "Luchiya.Raycheva" Date: Mon, 2 Mar 2020 11:15:13 +0200 Subject: [PATCH 1/5] Add "prettier" package for SCSS formatting. To run prettier use npm run format:check or npm run format:fix --- .prettierignore | 9 +++++++++ package-lock.json | 5 +++++ package.json | 3 +++ prettier.config.js | 15 +++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 .prettierignore create mode 100644 prettier.config.js diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..90741e495 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +*.json +e2e +node_modules +misc +docs +test +.github +src/docs +src/js \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ff93e5e69..c71fedeb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7601,6 +7601,11 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, + "prettier": { + "version": "1.19.1", + "resolved": "https://repo.tick42.com:443/api/npm/tick42-npm/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=" + }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", diff --git a/package.json b/package.json index d13ac4f8c..7a0bb9d1d 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,8 @@ "bugs": "https://github.com/josdejong/jsoneditor/issues", "scripts": { "build": "gulp", + "format:check": "prettier --check ./{.,src/**,src/{.,scss/**}}/*.{css,scss}", + "format:fix": "npm run format:check -- --write", "minify": "gulp minify", "start": "gulp watch", "test": "mocha test --require @babel/register", @@ -33,6 +35,7 @@ "json-source-map": "^0.6.1", "mobius1-selectr": "^2.4.13", "picomodal": "^3.0.0", + "prettier": "^1.19.1", "vanilla-picker": "^2.10.1" }, "devDependencies": { diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 000000000..c2bae40eb --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,15 @@ +module.exports = { + printWidth: 120, + semi: false, + singleQuote: true, + tabWidth: 4, + trailingComma: "es5", + overrides: [ + { + files: "*.scss", + options: { + singleQuote: false + } + } + ] +}; From 1fc916dd01ba117d1400f4cccf0dd1ab957fe763 Mon Sep 17 00:00:00 2001 From: "Luchiya.Raycheva" Date: Mon, 2 Mar 2020 12:07:23 +0200 Subject: [PATCH 2/5] variables update --- HISTORY.md | 5 + src/js/assets/selectr/selectr.scss | 24 +- src/scss/jsoneditor/_autocomplete.scss | 52 +- src/scss/jsoneditor/_contextmenu.scss | 762 ++++++++++---------- src/scss/jsoneditor/_editor.scss | 892 ++++++++++++------------ src/scss/jsoneditor/_menu.scss | 116 +-- src/scss/jsoneditor/_navigationbar.scss | 28 +- src/scss/jsoneditor/_reset.scss | 82 +-- src/scss/jsoneditor/_searchbox.scss | 118 ++-- src/scss/jsoneditor/_statusbar.scss | 84 +-- src/scss/jsoneditor/_treepath.scss | 82 +-- src/scss/jsoneditor/_variables.scss | 27 +- 12 files changed, 1148 insertions(+), 1124 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3bf142d6b..bba4d3e19 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,11 @@ https://github.com/josdejong/jsoneditor +## 2020-03-02 +Update variables. +Add prettier for formating. +- To run a format check: $npm run format:check +- To run a format fix: $npm run format:fix ## 2020-02-17, version 8.6.1 diff --git a/src/js/assets/selectr/selectr.scss b/src/js/assets/selectr/selectr.scss index 8615a288f..8f311bf71 100644 --- a/src/js/assets/selectr/selectr.scss +++ b/src/js/assets/selectr/selectr.scss @@ -75,14 +75,14 @@ transform: rotate(0deg) translate3d(0px, -50%, 0px); border-width: 4px 4px 0 4px; border-style: solid; - border-color: #6c7a86 transparent transparent; + border-color: $jse-selectr-border-color transparent transparent; } .selectr-container.open .selectr-selected::before, .selectr-container.native-open .selectr-selected::before { border-width: 0 4px 4px 4px; border-style: solid; - border-color: transparent transparent #6c7a86; + border-color: transparent transparent $jse-selectr-border-color; } .selectr-label { @@ -94,7 +94,7 @@ } .selectr-placeholder { - color: #6c7a86; + color: $jse-selectr-placeholder-color; } .selectr-tags { @@ -117,7 +117,7 @@ color: $jse-white; border: medium none; border-radius: 10px; - background: #acb7bf none repeat scroll 0 0; + background: $jse-selectr-tag-bg none repeat scroll 0 0; } .selectr-container.multiple.has-selected .selectr-selected { @@ -194,7 +194,7 @@ width: 2px; height: 10px; content: ' '; - background-color: #6c7a86; + background-color: $jse-selectr-border-color; } .selectr-tag-remove::before, @@ -305,12 +305,12 @@ } .selectr-option.selected { - background-color: #ddd; + background-color: $jse-light-bg; } .selectr-option.active { color: $jse-white; - background-color: #5897fb; + background-color: $jse-selectr-option-bg; } .selectr-option.disabled { @@ -410,7 +410,7 @@ animation: 500ms linear 0s normal forwards infinite running spin; border-width: 3px; border-style: solid; - border-color: #aaa #ddd #ddd; + border-color: $jse-light-grey $jse-light-bg $jse-light-bg; border-radius: 50%; } @@ -452,21 +452,21 @@ } .selectr-container ::-webkit-input-placeholder { - color: #6c7a86; + color: $jse-selectr-color; opacity: 1; } .selectr-container ::-moz-placeholder { - color: #6c7a86; + color: $jse-selectr-color; opacity: 1; } .selectr-container :-ms-input-placeholder { - color: #6c7a86; + color: $jse-selectr-color; opacity: 1; } .selectr-container ::placeholder { - color: #6c7a86; + color: $jse-selectr-color; opacity: 1; } diff --git a/src/scss/jsoneditor/_autocomplete.scss b/src/scss/jsoneditor/_autocomplete.scss index 765e38b03..affabd6d5 100644 --- a/src/scss/jsoneditor/_autocomplete.scss +++ b/src/scss/jsoneditor/_autocomplete.scss @@ -1,30 +1,30 @@ .jsoneditor { - .autocomplete { - &.dropdown { - position: absolute; - background: $jse-white; - box-shadow: $jse-box-shadow; - border: 1px solid $jse-bar-border; - overflow-x: hidden; - overflow-y: auto; - cursor: default; - margin: 0; - padding: 5px; - text-align: left; - outline: 0; - font-family: $jse-font-mono; - font-size: $jse-font-size; - .item { - color: #333; - &.hover { - background-color: #ddd; + .autocomplete { + &.dropdown { + position: absolute; + background: $jse-white; + box-shadow: $jse-box-shadow; + border: 1px solid $jse-bar-border; + overflow-x: hidden; + overflow-y: auto; + cursor: default; + margin: 0; + padding: 5px; + text-align: left; + outline: 0; + font-family: $jse-font-mono; + font-size: $jse-font-size; + .item { + color: $jse-dropdown-color; + &.hover { + background-color: $jse-light-bg; + } + } + } + &.hint { + color: $jse-dropdown-hint-color; + top: 4px; + left: 4px; } - } - } - &.hint { - color: #aaa; - top: 4px; - left: 4px; } - } } diff --git a/src/scss/jsoneditor/_contextmenu.scss b/src/scss/jsoneditor/_contextmenu.scss index 9bfbf8f2b..e5f33ddaf 100644 --- a/src/scss/jsoneditor/_contextmenu.scss +++ b/src/scss/jsoneditor/_contextmenu.scss @@ -1,399 +1,399 @@ .jsoneditor-contextmenu-root { - position: relative; - width: 0; - height: 0; + position: relative; + width: 0; + height: 0; } .jsoneditor-contextmenu { - position: absolute; - box-sizing: content-box; - z-index: 1; - .jsoneditor-menu { - position: relative; - left: 0; - top: 0; - width: 128px; - height: auto; - background: $jse-white; - border: 1px solid $jse-bar-border; - box-shadow: $jse-box-shadow; - list-style: none; - margin: 0; - padding: 0; - button { - position: relative; - padding: 0 4px 0 0; - margin: 0; - width: 128px; - height: auto; - border: none; - cursor: pointer; - color: $jse-contextmenu-color; - background: transparent; - font-size: $jse-font-size; - font-family: $jse-font; - box-sizing: border-box; - text-align: left; - &::-moz-focus-inner { + position: absolute; + box-sizing: content-box; + z-index: 1; + .jsoneditor-menu { + position: relative; + left: 0; + top: 0; + width: 128px; + height: auto; + background: $jse-white; + border: 1px solid $jse-bar-border; + box-shadow: $jse-box-shadow; + list-style: none; + margin: 0; padding: 0; - border: 0; - } - &.jsoneditor-default { - width: 96px; - } - &.jsoneditor-expand { - float: right; - width: 32px; - height: 24px; - border-left: 1px solid $jse-separator; - } + button { + position: relative; + padding: 0 4px 0 0; + margin: 0; + width: 128px; + height: auto; + border: none; + cursor: pointer; + color: $jse-contextmenu-color; + background: transparent; + font-size: $jse-font-size; + font-family: $jse-font; + box-sizing: border-box; + text-align: left; + &::-moz-focus-inner { + padding: 0; + border: 0; + } + &.jsoneditor-default { + width: 96px; + } + &.jsoneditor-expand { + float: right; + width: 32px; + height: 24px; + border-left: 1px solid $jse-separator; + } + } + li { + overflow: hidden; + ul { + display: none; + position: relative; + left: -10px; + top: 0; + border: none; + box-shadow: $jse-box-shadow-inner; + padding: 0 10px; + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + -o-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + .jsoneditor-icon { + margin-left: 24px; + } + li { + button { + padding-left: 24px; + animation: all ease-in-out 1s; + } + } + } + button { + .jsoneditor-expand { + position: absolute; + top: 0; + right: 0; + width: 24px; + height: 24px; + padding: 0; + margin: 0 4px 0 0; + background: url($jse-icons) 0 -72px; + } + } + } } - li { - overflow: hidden; - ul { - display: none; - position: relative; - left: -10px; + .jsoneditor-icon { + position: absolute; top: 0; + left: 0; + width: 24px; + height: 24px; border: none; - box-shadow: $jse-box-shadow-inner; - padding: 0 10px; - -webkit-transition: all 0.3s ease-out; - -moz-transition: all 0.3s ease-out; - -o-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - .jsoneditor-icon { - margin-left: 24px; + padding: 0; + margin: 0; + background-image: url($jse-icons); + } + .jsoneditor-text { + padding: 4px 0 4px 24px; + word-wrap: break-word; + &.jsoneditor-right-margin { + padding-right: 24px; } - li { - button { - padding-left: 24px; - animation: all ease-in-out 1s; - } + } + .jsoneditor-separator { + height: 0; + border-top: 1px solid $jse-separator; + padding-top: 5px; + margin-top: 5px; + } + button { + &.jsoneditor-remove { + .jsoneditor-icon { + background-position: -24px 0; + } + } + &.jsoneditor-append { + .jsoneditor-icon { + background-position: 0 0; + } + } + &.jsoneditor-insert { + .jsoneditor-icon { + background-position: 0 0; + } + } + &.jsoneditor-duplicate { + .jsoneditor-icon { + background-position: -48px 0; + } + } + &.jsoneditor-sort-asc { + .jsoneditor-icon { + background-position: -168px 0; + } } - } - button { - .jsoneditor-expand { - position: absolute; - top: 0; - right: 0; - width: 24px; - height: 24px; - padding: 0; - margin: 0 4px 0 0; - background: url($jse-icons) 0 -72px; + &.jsoneditor-sort-desc { + .jsoneditor-icon { + background-position: -192px 0; + } + } + &.jsoneditor-transform { + .jsoneditor-icon { + background-position: -216px 0; + } + } + &.jsoneditor-extract { + .jsoneditor-icon { + background-position: 0 -24px; + } + } + &.jsoneditor-type-string { + .jsoneditor-icon { + background-position: -144px 0; + } + } + &.jsoneditor-type-auto { + .jsoneditor-icon { + background-position: -120px 0; + } + } + &.jsoneditor-type-object { + .jsoneditor-icon { + background-position: -72px 0; + } + } + &.jsoneditor-type-array { + .jsoneditor-icon { + background-position: -96px 0; + } + } + &.jsoneditor-type-modes { + .jsoneditor-icon { + background-image: none; + width: 6px; + } } - } } - } - .jsoneditor-icon { - position: absolute; - top: 0; - left: 0; - width: 24px; - height: 24px; - border: none; - padding: 0; - margin: 0; - background-image: url($jse-icons); - } - .jsoneditor-text { - padding: 4px 0 4px 24px; - word-wrap: break-word; - &.jsoneditor-right-margin { - padding-right: 24px; - } - } - .jsoneditor-separator { - height: 0; - border-top: 1px solid $jse-separator; - padding-top: 5px; - margin-top: 5px; - } - button { - &.jsoneditor-remove { - .jsoneditor-icon { - background-position: -24px 0; - } - } - &.jsoneditor-append { - .jsoneditor-icon { - background-position: 0 0; - } - } - &.jsoneditor-insert { - .jsoneditor-icon { - background-position: 0 0; - } - } - &.jsoneditor-duplicate { - .jsoneditor-icon { - background-position: -48px 0; - } - } - &.jsoneditor-sort-asc { - .jsoneditor-icon { - background-position: -168px 0; - } - } - &.jsoneditor-sort-desc { - .jsoneditor-icon { - background-position: -192px 0; - } - } - &.jsoneditor-transform { - .jsoneditor-icon { - background-position: -216px 0; - } - } - &.jsoneditor-extract { - .jsoneditor-icon { - background-position: 0 -24px; - } - } - &.jsoneditor-type-string { - .jsoneditor-icon { - background-position: -144px 0; - } - } - &.jsoneditor-type-auto { - .jsoneditor-icon { - background-position: -120px 0; - } - } - &.jsoneditor-type-object { - .jsoneditor-icon { - background-position: -72px 0; - } - } - &.jsoneditor-type-array { - .jsoneditor-icon { - background-position: -96px 0; - } - } - &.jsoneditor-type-modes { - .jsoneditor-icon { - background-image: none; - width: 6px; - } - } - } } .jsoneditor-contextmenu ul, .jsoneditor-contextmenu li { - box-sizing: content-box; - position: relative; + box-sizing: content-box; + position: relative; } .jsoneditor-contextmenu .jsoneditor-menu button:hover, .jsoneditor-contextmenu .jsoneditor-menu button:focus { - color: $jse-content-color; - background-color: $jse-preview; - outline: none; + color: $jse-content-color; + background-color: $jse-preview; + outline: none; } .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected, .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:hover, .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:focus { - color: $jse-white; - background-color: $jse-number; + color: $jse-white; + background-color: $jse-number; } .jsoneditor-contextmenu .jsoneditor-menu li ul li button:hover, .jsoneditor-contextmenu .jsoneditor-menu li ul li button:focus { - background-color: $jse-preview; + background-color: $jse-preview; } .jsoneditor-modal { - max-width: 95%; - border-radius: 2px !important; - padding: 45px 15px 15px 15px !important; - box-shadow: $jse-box-shadow; - color: $jse-contextmenu-color; - line-height: 1.3em; - &.jsoneditor-modal-transform { - width: 600px !important; - } - .pico-modal-header { - position: absolute; - box-sizing: border-box; - top: 0; - left: 0; - width: 100%; - padding: 0 10px; - height: 30px; - line-height: 30px; - font-family: $jse-font; - font-size: 11pt; - background: $jse-blue; - color: $jse-white; - } - table { - width: 100%; - td { - padding: 3px 0; - &.jsoneditor-modal-input { - text-align: right; - padding-right: 0; - white-space: nowrap; - } - &.jsoneditor-modal-actions { - padding-top: 15px; - } - } - th { - vertical-align: middle; - } - } - p { - &:first-child { - margin-top: 0; - } - } - a { - color: $jse-blue; - } - .jsoneditor-jmespath-block { - margin-bottom: 10px; - } - .pico-close { - background: none !important; - font-size: 24px !important; - top: 7px !important; - right: 7px !important; - color: $jse-white; - } - input { - padding: 4px; - } - input[type="text"] { - cursor: inherit; - } - input[disabled] { - background: $jse-empty; - color: $jse-readonly; - } - .jsoneditor-select-wrapper { - position: relative; - display: inline-block; - &:after { - content: ""; - width: 0; - height: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 6px solid #666; - position: absolute; - right: 8px; - top: 14px; - pointer-events: none; - } - } - select { - padding: 3px 24px 3px 10px; - min-width: 180px; - max-width: 350px; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - text-indent: 0; - text-overflow: ""; - font-size: $jse-font-size; - line-height: 1.5em; - &::-ms-expand { - display: none; - } - } - .jsoneditor-button-group { + max-width: 95%; + border-radius: 2px !important; + padding: 45px 15px 15px 15px !important; + box-shadow: $jse-box-shadow; + color: $jse-contextmenu-color; + line-height: 1.3em; + &.jsoneditor-modal-transform { + width: 600px !important; + } + .pico-modal-header { + position: absolute; + box-sizing: border-box; + top: 0; + left: 0; + width: 100%; + padding: 0 10px; + height: 30px; + line-height: 30px; + font-family: $jse-font; + font-size: 11pt; + background: $jse-blue; + color: $jse-white; + } + table { + width: 100%; + td { + padding: 3px 0; + &.jsoneditor-modal-input { + text-align: right; + padding-right: 0; + white-space: nowrap; + } + &.jsoneditor-modal-actions { + padding-top: 15px; + } + } + th { + vertical-align: middle; + } + } + p { + &:first-child { + margin-top: 0; + } + } + a { + color: $jse-blue; + } + .jsoneditor-jmespath-block { + margin-bottom: 10px; + } + .pico-close { + background: none !important; + font-size: 24px !important; + top: 7px !important; + right: 7px !important; + color: $jse-white; + } input { - padding: 4px 10px; - margin: 0; - border-radius: 0; - border-left-style: none; - &.jsoneditor-button-first { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - border-left-style: solid; - } - &.jsoneditor-button-last { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } - } - } - .jsoneditor-transform-preview { - background: $jse-preview; - height: 200px; - &.jsoneditor-error { - color: $jse-number; + padding: 4px; + } + input[type="text"] { + cursor: inherit; + } + input[disabled] { + background: $jse-empty; + color: $jse-readonly; + } + .jsoneditor-select-wrapper { + position: relative; + display: inline-block; + &:after { + content: ""; + width: 0; + height: 0; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 6px solid $jse-select-border-color; + position: absolute; + right: 8px; + top: 14px; + pointer-events: none; + } + } + select { + padding: 3px 24px 3px 10px; + min-width: 180px; + max-width: 350px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + text-indent: 0; + text-overflow: ""; + font-size: $jse-font-size; + line-height: 1.5em; + &::-ms-expand { + display: none; + } + } + .jsoneditor-button-group { + input { + padding: 4px 10px; + margin: 0; + border-radius: 0; + border-left-style: none; + &.jsoneditor-button-first { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + border-left-style: solid; + } + &.jsoneditor-button-last { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + } + } + } + .jsoneditor-transform-preview { + background: $jse-preview; + height: 200px; + &.jsoneditor-error { + color: $jse-number; + } + } + .jsoneditor-jmespath-wizard { + line-height: 1.2em; + width: 100%; + padding: 0; + border-radius: 3px; + } + .jsoneditor-jmespath-label { + font-weight: bold; + color: $jse-jmespath-label-color; + margin-top: 20px; + margin-bottom: 5px; + } + .jsoneditor-jmespath-wizard-table { + width: 100%; + border-collapse: collapse; + } + .jsoneditor-jmespath-wizard-label { + font-style: italic; + margin: 4px 0 2px 0; + } + .jsoneditor-inline { + position: relative; + display: inline-block; + width: 100%; + padding-top: 2px; + padding-bottom: 2px; + &:not(:last-child) { + padding-right: 2px; + } + } + .jsoneditor-jmespath-filter { + display: flex; + flex-wrap: wrap; + } + .jsoneditor-jmespath-filter-field { + width: 180px; + } + .jsoneditor-jmespath-filter-relation { + width: 100px; + } + .jsoneditor-jmespath-filter-value { + min-width: 180px; + flex: 1; + } + .jsoneditor-jmespath-sort-field { + width: 170px; + } + .jsoneditor-jmespath-sort-order { + width: 150px; + } + .jsoneditor-jmespath-select-fields { + width: 100%; + } + .selectr-selected { + border-color: $jse-bar-border; + padding: 4px 28px 4px 8px; + .selectr-tag { + background-color: $jse-blue; + border-radius: 5px; + } } - } - .jsoneditor-jmespath-wizard { - line-height: 1.2em; - width: 100%; - padding: 0; - border-radius: 3px; - } - .jsoneditor-jmespath-label { - font-weight: bold; - color: dodgerblue; - margin-top: 20px; - margin-bottom: 5px; - } - .jsoneditor-jmespath-wizard-table { - width: 100%; - border-collapse: collapse; - } - .jsoneditor-jmespath-wizard-label { - font-style: italic; - margin: 4px 0 2px 0; - } - .jsoneditor-inline { - position: relative; - display: inline-block; - width: 100%; - padding-top: 2px; - padding-bottom: 2px; - &:not(:last-child) { - padding-right: 2px; - } - } - .jsoneditor-jmespath-filter { - display: flex; - flex-wrap: wrap; - } - .jsoneditor-jmespath-filter-field { - width: 180px; - } - .jsoneditor-jmespath-filter-relation { - width: 100px; - } - .jsoneditor-jmespath-filter-value { - min-width: 180px; - flex: 1; - } - .jsoneditor-jmespath-sort-field { - width: 170px; - } - .jsoneditor-jmespath-sort-order { - width: 150px; - } - .jsoneditor-jmespath-select-fields { - width: 100%; - } - .selectr-selected { - border-color: $jse-bar-border; - padding: 4px 28px 4px 8px; - .selectr-tag { - background-color: $jse-blue; - border-radius: 5px; - } - } } .jsoneditor-modal table th, .jsoneditor-modal table td { - text-align: left; - vertical-align: middle; - font-weight: normal; - color: $jse-contextmenu-color; - border-spacing: 0; - border-collapse: collapse; + text-align: left; + vertical-align: middle; + font-weight: normal; + color: $jse-contextmenu-color; + border-spacing: 0; + border-collapse: collapse; } .jsoneditor-modal select, .jsoneditor-modal textarea, @@ -401,11 +401,11 @@ .jsoneditor-modal input[type="text"], .jsoneditor-modal input[type="text"]:focus, .jsoneditor-modal #query { - background: #ffffff; - border: 1px solid $jse-bar-border; - color: $jse-contextmenu-color; - border-radius: 3px; - padding: 4px; + background: $jse-white; + border: 1px solid $jse-bar-border; + color: $jse-contextmenu-color; + border-radius: 3px; + padding: 4px; } .jsoneditor-modal, .jsoneditor-modal table td, @@ -416,28 +416,28 @@ .jsoneditor-modal input, .jsoneditor-modal input[type="text"], .jsoneditor-modal #query { - font-size: 10.5pt; - font-family: $jse-font; + font-size: 10.5pt; + font-family: $jse-font; } .jsoneditor-modal #query, .jsoneditor-modal .jsoneditor-transform-preview { - font-family: $jse-font-mono; - font-size: $jse-font-size; - width: 100%; - box-sizing: border-box; + font-family: $jse-font-mono; + font-size: $jse-font-size; + width: 100%; + box-sizing: border-box; } .jsoneditor-modal input[type="button"], .jsoneditor-modal input[type="submit"] { - background: $jse-preview; - padding: 4px 20px; + background: $jse-preview; + padding: 4px 20px; } .jsoneditor-modal select, .jsoneditor-modal input { - cursor: pointer; + cursor: pointer; } .jsoneditor-modal .jsoneditor-button-group.jsoneditor-button-group-value-asc input.jsoneditor-button-asc, .jsoneditor-modal .jsoneditor-button-group.jsoneditor-button-group-value-desc input.jsoneditor-button-desc { - background: $jse-blue; - border-color: $jse-blue; - color: $jse-white; + background: $jse-blue; + border-color: $jse-blue; + color: $jse-white; } diff --git a/src/scss/jsoneditor/_editor.scss b/src/scss/jsoneditor/_editor.scss index c3199d277..b00bd383b 100644 --- a/src/scss/jsoneditor/_editor.scss +++ b/src/scss/jsoneditor/_editor.scss @@ -1,276 +1,276 @@ .jsoneditor { - color: $jse-content-color; - border: thin solid $jse-blue; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - width: 100%; - height: 100%; - position: relative; - padding: 0; - line-height: 100%; + color: $jse-content-color; + border: thin solid $jse-blue; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; + height: 100%; + position: relative; + padding: 0; + line-height: 100%; } div.jsoneditor-field, div.jsoneditor-value, div.jsoneditor-readonly, div.jsoneditor-default { - border: 1px solid transparent; - min-height: 16px; - min-width: 32px; - padding: 2px; - margin: 1px; - word-wrap: break-word; - float: left; + border: 1px solid transparent; + min-height: 16px; + min-width: 32px; + padding: 2px; + margin: 1px; + word-wrap: break-word; + float: left; } div.jsoneditor-field p, div.jsoneditor-value p { - margin: 0; + margin: 0; } div { - &.jsoneditor-value { - word-break: break-word; - &.jsoneditor-empty { - &::after { - content: "value"; - } - } - &.jsoneditor-string { - color: $jse-string; - } - &.jsoneditor-number { - color: $jse-number; - } - &.jsoneditor-boolean { - color: $jse-boolean; - } - &.jsoneditor-null { - color: $jse-null; - } - &.jsoneditor-invalid { - color: $jse-invalid; - } - } - &.jsoneditor-readonly { - min-width: 16px; - color: $jse-readonly; - } - &.jsoneditor-empty { - border-color: $jse-bar-border; - border-style: dashed; - border-radius: 2px; - } - &.jsoneditor-field { - &.jsoneditor-empty { - &::after { - content: "field"; - } + &.jsoneditor-value { + word-break: break-word; + &.jsoneditor-empty { + &::after { + content: "value"; + } + } + &.jsoneditor-string { + color: $jse-string; + } + &.jsoneditor-number { + color: $jse-number; + } + &.jsoneditor-boolean { + color: $jse-boolean; + } + &.jsoneditor-null { + color: $jse-null; + } + &.jsoneditor-invalid { + color: $jse-invalid; + } } - } - &.jsoneditor { - td { - vertical-align: top; - &.jsoneditor-separator { - padding: 3px 0; - vertical-align: top; + &.jsoneditor-readonly { + min-width: 16px; color: $jse-readonly; - } - &.jsoneditor-tree { - vertical-align: top; - } - } - &.busy { - pre { - &.jsoneditor-preview { - background: $jse-preview; - color: $jse-readonly; - } - } - div { - &.jsoneditor-busy { - display: inherit; - } - } } - code { - &.jsoneditor-preview { - background: none; - } - } - &.jsoneditor-mode-preview { - pre { - &.jsoneditor-preview { - width: 100%; - height: 100%; - box-sizing: border-box; - overflow: auto; - padding: 2px; - margin: 0; - white-space: pre-wrap; - word-break: break-all; - } - } + &.jsoneditor-empty { + border-color: $jse-bar-border; + border-style: dashed; + border-radius: 2px; } - } - &.jsoneditor-default { - color: $jse-readonly; - padding-left: 10px; - } - &.jsoneditor-tree { - width: 100%; - height: 100%; - position: relative; - overflow: auto; - button { - &.jsoneditor-button { - width: 24px; - height: 24px; - padding: 0; - margin: 0; - border: none; - cursor: pointer; - background: transparent url($jse-icons); - &:focus { - background-color: $jse-preview; - outline: #e5e5e5 solid 1px; - } - } - &.jsoneditor-collapsed { - background-position: 0 -48px; - } - &.jsoneditor-expanded { - background-position: 0 -72px; - } - &.jsoneditor-contextmenu-button { - background-position: -48px -72px; - } - &.jsoneditor-invisible { - visibility: hidden; - background: none; - } - &.jsoneditor-dragarea { - background: url($jse-icons) -72px -72px; - cursor: move; - } + &.jsoneditor-field { + &.jsoneditor-empty { + &::after { + content: "field"; + } + } } - *:focus { - outline: none; + &.jsoneditor { + td { + vertical-align: top; + &.jsoneditor-separator { + padding: 3px 0; + vertical-align: top; + color: $jse-readonly; + } + &.jsoneditor-tree { + vertical-align: top; + } + } + &.busy { + pre { + &.jsoneditor-preview { + background: $jse-preview; + color: $jse-readonly; + } + } + div { + &.jsoneditor-busy { + display: inherit; + } + } + } + code { + &.jsoneditor-preview { + background: none; + } + } + &.jsoneditor-mode-preview { + pre { + &.jsoneditor-preview { + width: 100%; + height: 100%; + box-sizing: border-box; + overflow: auto; + padding: 2px; + margin: 0; + white-space: pre-wrap; + word-break: break-all; + } + } + } } - div { - &.jsoneditor-show-more { - display: inline-block; - padding: 3px 4px; - margin: 2px 0; - background-color: $jse-separator; - border-radius: 3px; + &.jsoneditor-default { color: $jse-readonly; - font-family: $jse-font; - font-size: $jse-font-size; - a { - display: inline-block; - color: $jse-readonly; - } - } - &.jsoneditor-color { - display: inline-block; - width: 12px; - height: 12px; - margin: 4px; - border: 1px solid $jse-readonly; - cursor: pointer; - } - &.jsoneditor-date { - background: $jse-date; - color: $jse-white; - font-family: $jse-font; - border-radius: 3px; - display: inline-block; - padding: 3px; - margin: 0 3px; - } + padding-left: 10px; } - table { - &.jsoneditor-tree { - border-collapse: collapse; - border-spacing: 0; + &.jsoneditor-tree { width: 100%; - } + height: 100%; + position: relative; + overflow: auto; + button { + &.jsoneditor-button { + width: 24px; + height: 24px; + padding: 0; + margin: 0; + border: none; + cursor: pointer; + background: transparent url($jse-icons); + &:focus { + background-color: $jse-preview; + outline: $jse-button-outline solid 1px; + } + } + &.jsoneditor-collapsed { + background-position: 0 -48px; + } + &.jsoneditor-expanded { + background-position: 0 -72px; + } + &.jsoneditor-contextmenu-button { + background-position: -48px -72px; + } + &.jsoneditor-invisible { + visibility: hidden; + background: none; + } + &.jsoneditor-dragarea { + background: url($jse-icons) -72px -72px; + cursor: move; + } + } + *:focus { + outline: none; + } + div { + &.jsoneditor-show-more { + display: inline-block; + padding: 3px 4px; + margin: 2px 0; + background-color: $jse-separator; + border-radius: 3px; + color: $jse-readonly; + font-family: $jse-font; + font-size: $jse-font-size; + a { + display: inline-block; + color: $jse-readonly; + } + } + &.jsoneditor-color { + display: inline-block; + width: 12px; + height: 12px; + margin: 4px; + border: 1px solid $jse-readonly; + cursor: pointer; + } + &.jsoneditor-date { + background: $jse-date; + color: $jse-white; + font-family: $jse-font; + border-radius: 3px; + display: inline-block; + padding: 3px; + margin: 0 3px; + } + } + table { + &.jsoneditor-tree { + border-collapse: collapse; + border-spacing: 0; + width: 100%; + } + } + .jsoneditor-button { + &.jsoneditor-schema-error { + width: 24px; + height: 24px; + padding: 0; + margin: 0 4px 0 0; + background: url($jse-icons) -168px -48px; + } + } } - .jsoneditor-button { - &.jsoneditor-schema-error { - width: 24px; - height: 24px; + &.jsoneditor-outer { + position: static; + width: 100%; + height: 100%; + margin: 0; padding: 0; - margin: 0 4px 0 0; - background: url($jse-icons) -168px -48px; - } - } - } - &.jsoneditor-outer { - position: static; - width: 100%; - height: 100%; - margin: 0; - padding: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - &.has-nav-bar { - margin-top: -26px; - padding-top: 26px; - &.has-main-menu-bar { - margin-top: -61px; - padding-top: 61px; - } - } - &.has-status-bar { - margin-bottom: -26px; - padding-bottom: 26px; - } - &.has-main-menu-bar { - margin-top: -35px; - padding-top: 35px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + &.has-nav-bar { + margin-top: -26px; + padding-top: 26px; + &.has-main-menu-bar { + margin-top: -61px; + padding-top: 61px; + } + } + &.has-status-bar { + margin-bottom: -26px; + padding-bottom: 26px; + } + &.has-main-menu-bar { + margin-top: -35px; + padding-top: 35px; + } } - } - &.jsoneditor-busy { - position: absolute; - top: 15%; - left: 0; - box-sizing: border-box; - width: 100%; - text-align: center; - display: none; - span { - background-color: $jse-busy; - border: 1px solid $jse-busy-border-color; - border-radius: 3px; - padding: 5px 15px; - box-shadow: $jse-box-shadow-sm; + &.jsoneditor-busy { + position: absolute; + top: 15%; + left: 0; + box-sizing: border-box; + width: 100%; + text-align: center; + display: none; + span { + background-color: $jse-busy; + border: 1px solid $jse-busy-border-color; + border-radius: 3px; + padding: 5px 15px; + box-shadow: $jse-box-shadow-sm; + } } - } } div.jsoneditor-field.jsoneditor-empty::after, div.jsoneditor-value.jsoneditor-empty::after { - pointer-events: none; - color: $jse-empty; - font-size: 8pt; + pointer-events: none; + color: $jse-empty; + font-size: 8pt; } div.jsoneditor-value.jsoneditor-url, a.jsoneditor-value.jsoneditor-url { - color: $jse-string; - text-decoration: underline; + color: $jse-string; + text-decoration: underline; } a { - &.jsoneditor-value { - &.jsoneditor-url { - display: inline-block; - padding: 2px; - margin: 2px; + &.jsoneditor-value { + &.jsoneditor-url { + display: inline-block; + padding: 2px; + margin: 2px; + } } - } } a.jsoneditor-value.jsoneditor-url:hover, a.jsoneditor-value.jsoneditor-url:focus { - color: $jse-number; + color: $jse-number; } div.jsoneditor-field[contenteditable="true"]:focus, div.jsoneditor-field[contenteditable="true"]:hover, @@ -278,9 +278,9 @@ div.jsoneditor-value[contenteditable="true"]:focus, div.jsoneditor-value[contenteditable="true"]:hover, div.jsoneditor-field.jsoneditor-highlight, div.jsoneditor-value.jsoneditor-highlight { - background-color: $jse-busy; - border: 1px solid $jse-busy-border-color; - border-radius: 2px; + background-color: $jse-busy; + border: 1px solid $jse-busy-border-color; + border-radius: 2px; } div.jsoneditor-field.jsoneditor-highlight-active, div.jsoneditor-field.jsoneditor-highlight-active:focus, @@ -288,68 +288,68 @@ div.jsoneditor-field.jsoneditor-highlight-active:hover, div.jsoneditor-value.jsoneditor-highlight-active, div.jsoneditor-value.jsoneditor-highlight-active:focus, div.jsoneditor-value.jsoneditor-highlight-active:hover { - background-color: $jse-highlight-bg; - border: 1px solid $jse-highlight-border-color; - border-radius: 2px; + background-color: $jse-highlight-bg; + border: 1px solid $jse-highlight-border-color; + border-radius: 2px; } div.jsoneditor-value.jsoneditor-object, div.jsoneditor-value.jsoneditor-array { - min-width: 16px; + min-width: 16px; } div.jsoneditor-tree button.jsoneditor-contextmenu-button:hover, div.jsoneditor-tree button.jsoneditor-contextmenu-button:focus, div.jsoneditor-tree button.jsoneditor-contextmenu-button.jsoneditor-selected, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button { - background-position: -48px -48px; + background-position: -48px -48px; } div.jsoneditor-tree div.jsoneditor-show-more a:hover, div.jsoneditor-tree div.jsoneditor-show-more a:focus { - color: $jse-number; + color: $jse-number; } textarea.jsoneditor-text, .ace-jsoneditor { - min-height: 150px; + min-height: 150px; - * { - font-family: $jse-font-mono; - } + * { + font-family: $jse-font-mono; + } } textarea { - &.jsoneditor-text { - width: 100%; - height: 100%; - margin: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - outline-width: 0; - border: none; - background-color: $jse-white; - resize: none; - } + &.jsoneditor-text { + width: 100%; + height: 100%; + margin: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline-width: 0; + border: none; + background-color: $jse-white; + resize: none; + } } tr.jsoneditor-highlight, tr.jsoneditor-selected { - background-color: $jse-empty; + background-color: $jse-empty; } tr.jsoneditor-selected button.jsoneditor-dragarea, tr.jsoneditor-selected button.jsoneditor-contextmenu-button { - visibility: hidden; + visibility: hidden; } tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button { - visibility: visible; + visibility: visible; } div.jsoneditor-tree button.jsoneditor-dragarea:hover, div.jsoneditor-tree button.jsoneditor-dragarea:focus, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea { - background-position: -72px -48px; + background-position: -72px -48px; } div.jsoneditor tr, div.jsoneditor th, div.jsoneditor td { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } div.jsoneditor-field, div.jsoneditor-value, @@ -358,226 +358,226 @@ div.jsoneditor th, div.jsoneditor textarea, pre.jsoneditor-preview, .jsoneditor-schema-error, -.jsoneditor-popover{ - font-family: $jse-font-mono; - font-size: $jse-font-size; - color: $jse-content-color; +.jsoneditor-popover { + font-family: $jse-font-mono; + font-size: $jse-font-size; + color: $jse-content-color; } .jsoneditor-schema-error { - cursor: default; - display: inline-block; - height: 24px; - line-height: 24px; - position: relative; - text-align: center; - width: 24px; + cursor: default; + display: inline-block; + height: 24px; + line-height: 24px; + position: relative; + text-align: center; + width: 24px; } .jsoneditor-popover { - background-color: $jse-popover-bg; - border-radius: 3px; - box-shadow: $jse-box-shadow-sm; - color: $jse-white; - padding: 7px 10px; - position: absolute; - cursor: auto; - width: 200px; - &.jsoneditor-above { - bottom: 32px; - left: -98px; - &:before { - border-top: 7px solid $jse-popover-bg; - bottom: -7px; + background-color: $jse-popover-bg; + border-radius: 3px; + box-shadow: $jse-box-shadow-sm; + color: $jse-white; + padding: 7px 10px; + position: absolute; + cursor: auto; + width: 200px; + &.jsoneditor-above { + bottom: 32px; + left: -98px; + &:before { + border-top: 7px solid $jse-popover-bg; + bottom: -7px; + } } - } - &.jsoneditor-below { - top: 32px; - left: -98px; - &:before { - border-bottom: 7px solid $jse-popover-bg; - top: -7px; + &.jsoneditor-below { + top: 32px; + left: -98px; + &:before { + border-bottom: 7px solid $jse-popover-bg; + top: -7px; + } } - } - &.jsoneditor-left { - top: -7px; - right: 32px; - &:before { - border-left: 7px solid $jse-popover-bg; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - content: ""; - top: 19px; - right: -14px; - left: inherit; - margin-left: inherit; - margin-top: -7px; - position: absolute; + &.jsoneditor-left { + top: -7px; + right: 32px; + &:before { + border-left: 7px solid $jse-popover-bg; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + content: ""; + top: 19px; + right: -14px; + left: inherit; + margin-left: inherit; + margin-top: -7px; + position: absolute; + } + } + &.jsoneditor-right { + top: -7px; + left: 32px; + &:before { + border-right: 7px solid $jse-popover-bg; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + content: ""; + top: 19px; + left: -14px; + margin-left: inherit; + margin-top: -7px; + position: absolute; + } } - } - &.jsoneditor-right { - top: -7px; - left: 32px; &:before { - border-right: 7px solid $jse-popover-bg; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - content: ""; - top: 19px; - left: -14px; - margin-left: inherit; - margin-top: -7px; - position: absolute; + border-right: 7px solid transparent; + border-left: 7px solid transparent; + content: ""; + display: block; + left: 50%; + margin-left: -7px; + position: absolute; } - } - &:before { - border-right: 7px solid transparent; - border-left: 7px solid transparent; - content: ""; - display: block; - left: 50%; - margin-left: -7px; - position: absolute; - } } .jsoneditor-text-errors { - tr { - &.jump-to-line { - &:hover { - text-decoration: underline; - cursor: pointer; - } + tr { + &.jump-to-line { + &:hover { + text-decoration: underline; + cursor: pointer; + } + } } - } } .jsoneditor-schema-error:hover .jsoneditor-popover, .jsoneditor-schema-error:focus .jsoneditor-popover { - display: block; - animation: fade-in 0.3s linear 1, move-up 0.3s linear 1; + display: block; + animation: fade-in 0.3s linear 1, move-up 0.3s linear 1; } @keyframes fade-in { - from { - opacity: 0; - } - to { - opacity: 1; - } + from { + opacity: 0; + } + to { + opacity: 1; + } } /* JSON schema errors displayed at the bottom of the editor in mode text and code */ .jsoneditor { - .jsoneditor-validation-errors-container { - max-height: 130px; - overflow-y: auto; - } - .jsoneditor-validation-errors { - width: 100%; - overflow: hidden; - } - .jsoneditor-additional-errors { - position: absolute; - margin: auto; - bottom: 31px; - left: calc(50% - 92px); - color: $jse-readonly; - background-color: $jse-light-bg; - padding: 7px 15px; - border-radius: 8px; - &.visible { - visibility: visible; - opacity: 1; - transition: opacity 2s linear; - } - &.hidden { - visibility: hidden; - opacity: 0; - transition: visibility 0s 2s, opacity 2s linear; - } - } - .jsoneditor-text-errors { - width: 100%; - border-collapse: collapse; - border-top: 1px solid $jse-highlight-border-color; - td { - padding: 3px 6px; - vertical-align: middle; - pre { - margin: 0; - white-space: normal; - } - } - tr { - background-color: $jse-busy; - &.parse-error { - background-color: $jse-error; - } - } - } + .jsoneditor-validation-errors-container { + max-height: 130px; + overflow-y: auto; + } + .jsoneditor-validation-errors { + width: 100%; + overflow: hidden; + } + .jsoneditor-additional-errors { + position: absolute; + margin: auto; + bottom: 31px; + left: calc(50% - 92px); + color: $jse-readonly; + background-color: $jse-light-bg; + padding: 7px 15px; + border-radius: 8px; + &.visible { + visibility: visible; + opacity: 1; + transition: opacity 2s linear; + } + &.hidden { + visibility: hidden; + opacity: 0; + transition: visibility 0s 2s, opacity 2s linear; + } + } + .jsoneditor-text-errors { + width: 100%; + border-collapse: collapse; + border-top: 1px solid $jse-highlight-border-color; + td { + padding: 3px 6px; + vertical-align: middle; + pre { + margin: 0; + white-space: normal; + } + } + tr { + background-color: $jse-busy; + &.parse-error { + background-color: $jse-error; + } + } + } } .jsoneditor-text-errors { - .jsoneditor-schema-error { - border: none; - width: 24px; - height: 24px; - padding: 0; - margin: 0 4px 0 0; - cursor: pointer; - } - tr { - .jsoneditor-schema-error { - background: url($jse-icons) -168px -48px; - } - &.parse-error { - .jsoneditor-schema-error { - background: url($jse-icons) -25px 0px; - } - } - } + .jsoneditor-schema-error { + border: none; + width: 24px; + height: 24px; + padding: 0; + margin: 0 4px 0 0; + cursor: pointer; + } + tr { + .jsoneditor-schema-error { + background: url($jse-icons) -168px -48px; + } + &.parse-error { + .jsoneditor-schema-error { + background: url($jse-icons) -25px 0px; + } + } + } } .jsoneditor-anchor { - cursor: pointer; + cursor: pointer; - .picker_wrapper { - &.popup { - &.popup_bottom { - top: 28px; - left: -10px; - } + .picker_wrapper { + &.popup { + &.popup_bottom { + top: 28px; + left: -10px; + } + } } - } } .fadein { - -webkit-animation: fadein 0.3s; - animation: fadein 0.3s; - -moz-animation: fadein 0.3s; - -o-animation: fadein 0.3s; + -webkit-animation: fadein 0.3s; + animation: fadein 0.3s; + -moz-animation: fadein 0.3s; + -o-animation: fadein 0.3s; } @keyframes fadein { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } } // override some styles which where cleared in reset.scss .jsoneditor-modal { - input[type="search"].selectr-input { - border: 1px solid #d3d3d3; - width: calc(100% - 4px); - margin: 2px; - padding: 4px; - box-sizing: border-box; - } + input[type="search"].selectr-input { + border: 1px solid $jse-input-border; + width: calc(100% - 4px); + margin: 2px; + padding: 4px; + box-sizing: border-box; + } - button.selectr-input-clear { - right: 8px; - } + button.selectr-input-clear { + right: 8px; + } } diff --git a/src/scss/jsoneditor/_menu.scss b/src/scss/jsoneditor/_menu.scss index 56f01667c..d14a6e099 100644 --- a/src/scss/jsoneditor/_menu.scss +++ b/src/scss/jsoneditor/_menu.scss @@ -1,126 +1,126 @@ .jsoneditor-menu { - width: 100%; - height: 35px; - padding: 2px; - margin: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; + width: 100%; + height: 35px; + padding: 2px; + margin: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; - color: $jse-white; - background-color: $jse-blue; - border-bottom: 1px solid $jse-blue; + color: $jse-white; + background-color: $jse-blue; + border-bottom: 1px solid $jse-blue; } .jsoneditor-menu > button, .jsoneditor-menu > .jsoneditor-modes > button { - width: 26px; - height: 26px; - margin: 2px; - padding: 0; - border-radius: 2px; - border: 1px solid transparent; - background: transparent url($jse-icons); - color: $jse-white; - opacity: 0.8; + width: 26px; + height: 26px; + margin: 2px; + padding: 0; + border-radius: 2px; + border: 1px solid transparent; + background: transparent url($jse-icons); + color: $jse-white; + opacity: 0.8; - font-family: $jse-font; - font-size: $jse-font-size; + font-family: $jse-font; + font-size: $jse-font-size; - float: left; + float: left; } .jsoneditor-menu > button:hover, .jsoneditor-menu > .jsoneditor-modes > button:hover { - background-color: rgba(255,255,255,0.2); - border: 1px solid rgba(255,255,255,0.4); + background-color: rgba($jse-white, 0.2); + border: 1px solid rgba($jse-white, 0.4); } .jsoneditor-menu > button:focus, .jsoneditor-menu > button:active, .jsoneditor-menu > .jsoneditor-modes > button:focus, .jsoneditor-menu > .jsoneditor-modes > button:active { - background-color: rgba(255,255,255,0.3); + background-color: rgba($jse-white, 0.3); } .jsoneditor-menu > button:disabled, .jsoneditor-menu > .jsoneditor-modes > button:disabled { - opacity: 0.5; - background-color: transparent; - border: none; + opacity: 0.5; + background-color: transparent; + border: none; } .jsoneditor-menu > button.jsoneditor-collapse-all { - background-position: 0 -96px; + background-position: 0 -96px; } .jsoneditor-menu > button.jsoneditor-expand-all { - background-position: 0 -120px; + background-position: 0 -120px; } .jsoneditor-menu > button.jsoneditor-sort { - background-position: -120px -96px; + background-position: -120px -96px; } .jsoneditor-menu > button.jsoneditor-transform { - background-position: -144px -96px; + background-position: -144px -96px; } .jsoneditor.jsoneditor-mode-view > .jsoneditor-menu > button.jsoneditor-sort, .jsoneditor.jsoneditor-mode-form > .jsoneditor-menu > button.jsoneditor-sort, .jsoneditor.jsoneditor-mode-view > .jsoneditor-menu > button.jsoneditor-transform, .jsoneditor.jsoneditor-mode-form > .jsoneditor-menu > button.jsoneditor-transform { - display: none; + display: none; } .jsoneditor-menu > button.jsoneditor-undo { - background-position: -24px -96px; + background-position: -24px -96px; } .jsoneditor-menu > button.jsoneditor-undo:disabled { - background-position: -24px -120px; + background-position: -24px -120px; } .jsoneditor-menu > button.jsoneditor-redo { - background-position: -48px -96px; + background-position: -48px -96px; } .jsoneditor-menu > button.jsoneditor-redo:disabled { - background-position: -48px -120px; + background-position: -48px -120px; } .jsoneditor-menu > button.jsoneditor-compact { - background-position: -72px -96px; + background-position: -72px -96px; } .jsoneditor-menu > button.jsoneditor-format { - background-position: -72px -120px; + background-position: -72px -120px; } .jsoneditor-menu > button.jsoneditor-repair { - background-position: -96px -96px; + background-position: -96px -96px; } .jsoneditor-menu > .jsoneditor-modes { - display: inline-block; - float: left; + display: inline-block; + float: left; } .jsoneditor-menu > .jsoneditor-modes > button { - background-image: none; - width: auto; - padding-left: 6px; - padding-right: 6px; + background-image: none; + width: auto; + padding-left: 6px; + padding-right: 6px; } .jsoneditor-menu > button.jsoneditor-separator, .jsoneditor-menu > .jsoneditor-modes > button.jsoneditor-separator { - margin-left: 10px; + margin-left: 10px; } .jsoneditor-menu a { - font-family: $jse-font; - font-size: $jse-font-size; - color: $jse-white; - opacity: 0.8; - vertical-align: middle; + font-family: $jse-font; + font-size: $jse-font-size; + color: $jse-white; + opacity: 0.8; + vertical-align: middle; } .jsoneditor-menu a:hover { - opacity: 1; + opacity: 1; } .jsoneditor-menu a.jsoneditor-poweredBy { - font-size: 8pt; - position: absolute; - right: 0; - top: 0; - padding: 10px; + font-size: 8pt; + position: absolute; + right: 0; + top: 0; + padding: 10px; } diff --git a/src/scss/jsoneditor/_navigationbar.scss b/src/scss/jsoneditor/_navigationbar.scss index 2a7848990..a2d9ff0d2 100644 --- a/src/scss/jsoneditor/_navigationbar.scss +++ b/src/scss/jsoneditor/_navigationbar.scss @@ -1,17 +1,17 @@ .jsoneditor-navigation-bar { - width: 100%; - height: 26px; - line-height: 26px; - padding: 0; - margin: 0; - border-bottom: 1px solid $jse-bar-border; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: $jse-readonly; - background-color: $jse-light-bg; - overflow: hidden; + width: 100%; + height: 26px; + line-height: 26px; + padding: 0; + margin: 0; + border-bottom: 1px solid $jse-bar-border; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: $jse-readonly; + background-color: $jse-light-bg; + overflow: hidden; - font-family: $jse-font; - font-size: $jse-font-size; + font-family: $jse-font; + font-size: $jse-font-size; } diff --git a/src/scss/jsoneditor/_reset.scss b/src/scss/jsoneditor/_reset.scss index d13586d58..9b2e808c1 100644 --- a/src/scss/jsoneditor/_reset.scss +++ b/src/scss/jsoneditor/_reset.scss @@ -1,51 +1,51 @@ .jsoneditor, .jsoneditor-modal { - input, - input:not([type]), - input[type="text"], - input[type="search"], { - height: auto; - border: inherit; - box-shadow: none; - font-size: inherit; - box-sizing: inherit; - padding: inherit; - font-family: inherit; - transition: none; - line-height: inherit; + input, + input:not([type]), + input[type="text"], + input[type="search"] { + height: auto; + border: inherit; + box-shadow: none; + font-size: inherit; + box-sizing: inherit; + padding: inherit; + font-family: inherit; + transition: none; + line-height: inherit; - &:focus { - border: inherit; - box-shadow: inherit; + &:focus { + border: inherit; + box-shadow: inherit; + } } - } - textarea { - height: inherit; - } + textarea { + height: inherit; + } - select { - display: inherit; - height: inherit; - } + select { + display: inherit; + height: inherit; + } - label { - font-size: inherit; - font-weight: inherit; - color: inherit; - } + label { + font-size: inherit; + font-weight: inherit; + color: inherit; + } - table { - border-collapse: collapse; - width: auto; - } + table { + border-collapse: collapse; + width: auto; + } - td, - th { - padding: 0; - display: table-cell; - text-align: left; - vertical-align: inherit; - border-radius: inherit; - } + td, + th { + padding: 0; + display: table-cell; + text-align: left; + vertical-align: inherit; + border-radius: inherit; + } } diff --git a/src/scss/jsoneditor/_searchbox.scss b/src/scss/jsoneditor/_searchbox.scss index dbfffa45c..933475695 100644 --- a/src/scss/jsoneditor/_searchbox.scss +++ b/src/scss/jsoneditor/_searchbox.scss @@ -1,72 +1,72 @@ .jsoneditor { - &-search { - font-family: $jse-font; - position: absolute; - right: 4px; - top: 4px; - border-collapse: collapse; - border-spacing: 0; - display: flex; + &-search { + font-family: $jse-font; + position: absolute; + right: 4px; + top: 4px; + border-collapse: collapse; + border-spacing: 0; + display: flex; - input { - color: $jse-content-color; - width: 120px; - border: none; - outline: none; - margin: 1px; - line-height: 20px; - font-family: $jse-font; - } + input { + color: $jse-content-color; + width: 120px; + border: none; + outline: none; + margin: 1px; + line-height: 20px; + font-family: $jse-font; + } - button { - width: 16px; - height: 24px; - padding: 0; - margin: 0; - border: none; - background: url($jse-icons); - vertical-align: top; + button { + width: 16px; + height: 24px; + padding: 0; + margin: 0; + border: none; + background: url($jse-icons); + vertical-align: top; - &:hover { - background-color: transparent; - } + &:hover { + background-color: transparent; + } - &.jsoneditor-refresh { - width: 18px; - background-position: -99px -73px; - } + &.jsoneditor-refresh { + width: 18px; + background-position: -99px -73px; + } - &.jsoneditor-next { - cursor: pointer; - background-position: -124px -73px; + &.jsoneditor-next { + cursor: pointer; + background-position: -124px -73px; - &:hover { - background-position: -124px -49px; - } - } - &.jsoneditor-previous { - cursor: pointer; - background-position: -148px -73px; - margin-right: 2px; + &:hover { + background-position: -124px -49px; + } + } + &.jsoneditor-previous { + cursor: pointer; + background-position: -148px -73px; + margin-right: 2px; - &:hover { - background-position: -148px -49px; + &:hover { + background-position: -148px -49px; + } + } } - } } - } - &-results { - font-family: $jse-font; - color: $jse-white; - padding-right: 5px; - line-height: 26px; - } + &-results { + font-family: $jse-font; + color: $jse-white; + padding-right: 5px; + line-height: 26px; + } - &-frame { - border: 1px solid transparent; - background-color: $jse-white; - padding: 0 2px; - margin: 0; - } + &-frame { + border: 1px solid transparent; + background-color: $jse-white; + padding: 0 2px; + margin: 0; + } } diff --git a/src/scss/jsoneditor/_statusbar.scss b/src/scss/jsoneditor/_statusbar.scss index 6cbcb1b2c..1bf8f9af2 100644 --- a/src/scss/jsoneditor/_statusbar.scss +++ b/src/scss/jsoneditor/_statusbar.scss @@ -1,48 +1,48 @@ .jsoneditor-statusbar { - line-height: 26px; - height: 26px; - color: $jse-readonly; - background-color: $jse-bar-bg; - border-top: 1px solid $jse-bar-border; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - font-size: $jse-font-size; - & > .jsoneditor-curserinfo-val { - margin-right: 12px; - } - & > .jsoneditor-curserinfo-count { - margin-left: 4px; - } - & > .jsoneditor-validation-error-icon { - float: right; - width: 24px; - height: 24px; - padding: 0; - margin-top: 1px; - background: url($jse-icons) -168px -48px; - cursor: pointer; - } - & > .jsoneditor-validation-error-count { - float: right; - margin: 0 4px 0 0; - cursor: pointer; - } - & > .jsoneditor-parse-error-icon { - float: right; - width: 24px; - height: 24px; - padding: 0; - margin: 1px; - background: url($jse-icons) -25px 0px; - } - .jsoneditor-array-info { - a { - color: inherit; + line-height: 26px; + height: 26px; + color: $jse-readonly; + background-color: $jse-bar-bg; + border-top: 1px solid $jse-bar-border; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-size: $jse-font-size; + & > .jsoneditor-curserinfo-val { + margin-right: 12px; + } + & > .jsoneditor-curserinfo-count { + margin-left: 4px; + } + & > .jsoneditor-validation-error-icon { + float: right; + width: 24px; + height: 24px; + padding: 0; + margin-top: 1px; + background: url($jse-icons) -168px -48px; + cursor: pointer; + } + & > .jsoneditor-validation-error-count { + float: right; + margin: 0 4px 0 0; + cursor: pointer; + } + & > .jsoneditor-parse-error-icon { + float: right; + width: 24px; + height: 24px; + padding: 0; + margin: 1px; + background: url($jse-icons) -25px 0px; + } + .jsoneditor-array-info { + a { + color: inherit; + } } - } } div.jsoneditor-statusbar > .jsoneditor-curserinfo-label, div.jsoneditor-statusbar > .jsoneditor-size-info { - margin: 0 4px; + margin: 0 4px; } diff --git a/src/scss/jsoneditor/_treepath.scss b/src/scss/jsoneditor/_treepath.scss index 3954219bc..e0ca1f68a 100644 --- a/src/scss/jsoneditor/_treepath.scss +++ b/src/scss/jsoneditor/_treepath.scss @@ -1,48 +1,48 @@ .jsoneditor-treepath { - padding: 0 5px; - overflow: hidden; - white-space: nowrap; - outline: none; - &.show-all { - word-wrap: break-word; - white-space: normal; - position: absolute; - background-color: $jse-light-bg; - z-index: 1; - box-shadow: $jse-box-shadow; - span { - &.jsoneditor-treepath-show-all-btn { - display: none; - } + padding: 0 5px; + overflow: hidden; + white-space: nowrap; + outline: none; + &.show-all { + word-wrap: break-word; + white-space: normal; + position: absolute; + background-color: $jse-light-bg; + z-index: 1; + box-shadow: $jse-box-shadow; + span { + &.jsoneditor-treepath-show-all-btn { + display: none; + } + } } - } - div { - &.jsoneditor-contextmenu-root { - position: absolute; - left: 0; + div { + &.jsoneditor-contextmenu-root { + position: absolute; + left: 0; + } + } + .jsoneditor-treepath-show-all-btn { + position: absolute; + background-color: $jse-light-bg; + left: 0; + height: 20px; + padding: 0 3px; + cursor: pointer; + } + .jsoneditor-treepath-element { + margin: 1px; + font-family: $jse-font; + font-size: $jse-font-size; + } + .jsoneditor-treepath-seperator { + margin: 2px; + font-size: 9pt; + font-family: $jse-font; } - } - .jsoneditor-treepath-show-all-btn { - position: absolute; - background-color: $jse-light-bg; - left: 0; - height: 20px; - padding: 0 3px; - cursor: pointer; - } - .jsoneditor-treepath-element { - margin: 1px; - font-family: $jse-font; - font-size: $jse-font-size; - } - .jsoneditor-treepath-seperator { - margin: 2px; - font-size: 9pt; - font-family: $jse-font; - } } .jsoneditor-treepath span.jsoneditor-treepath-element:hover, .jsoneditor-treepath span.jsoneditor-treepath-seperator:hover { - cursor: pointer; - text-decoration: underline; + cursor: pointer; + text-decoration: underline; } diff --git a/src/scss/jsoneditor/_variables.scss b/src/scss/jsoneditor/_variables.scss index 357ea9a6f..9abdafdcd 100644 --- a/src/scss/jsoneditor/_variables.scss +++ b/src/scss/jsoneditor/_variables.scss @@ -1,5 +1,7 @@ $jse-white: #ffffff !default; -$jse-grey:#999999 !default; +$jse-light-bg: #ddd !default; +$jse-light-grey: #aaa !default; +$jse-grey: #999999 !default; $jse-light-bg: #ebebeb !default; $jse-blue: #3883fa !default; $jse-content-color: #1a1a1a !default; @@ -14,6 +16,7 @@ $jse-empty: #d3d3d3 !default; $jse-preview: #f5f5f5 !default; $jse-busy: #ffffab !default; $jse-busy-border-color: #ffee00 !default; +$jse-jmespath-label-color: dodgerblue !default; $jse-error: #ee2e2e70 !default; $jse-separator: #e5e5e5 !default; @@ -28,6 +31,21 @@ $jse-menu-color: $jse-empty !default; $jse-contextmenu-color: #4d4d4d !default; +$jse-dropdown-color: #333 !default; +$jse-dropdown-hint-color: $jse-light-grey !default; + +$jse-button-outline: #e5e5e5 !default; + +$jse-input-border: #d3d3d3 !default; + +$jse-selectr-color: #6c7a86 !default; +$jse-selectr-border-color: $jse-selectr-color !default; +$jse-selectr-placeholder-color: $jse-selectr-color !default; +$jse-selectr-tag-bg: #acb7bf !default; +$jse-selectr-option-bg: #5897fb !default; + +$jse-select-border-color: #666 !default; + $jse-box-shadow: 2px 2px 12px rgba(128, 128, 128, 0.3) !default; $jse-box-shadow-sm: 0 0 5px rgba(0, 0, 0, 0.4) !default; $jse-box-shadow-inner: inset 0 0 10px rgba(128, 128, 128, 0.5) !default; @@ -35,7 +53,8 @@ $jse-box-shadow-inner: inset 0 0 10px rgba(128, 128, 128, 0.5) !default; $jse-date: #a1a1a1 !default; $jse-font: arial, sans-serif !default; -$jse-font-mono: "dejavu sans mono", "droid sans mono", consolas, monaco, "lucida console", "courier new", courier, monospace, sans-serif !default; -$jse-font-size: 10pt !default;; +$jse-font-mono: "dejavu sans mono", "droid sans mono", consolas, monaco, "lucida console", "courier new", courier, + monospace, sans-serif !default; +$jse-font-size: 10pt !default; -$jse-icons: "./img/jsoneditor-icons.svg" !default; \ No newline at end of file +$jse-icons: "./img/jsoneditor-icons.svg" !default; From f61d6665b818e495a693ed3b86bf8abfbbef57d4 Mon Sep 17 00:00:00 2001 From: "Luchiya.Raycheva" Date: Mon, 2 Mar 2020 12:24:39 +0200 Subject: [PATCH 3/5] update prettier config --- prettier.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prettier.config.js b/prettier.config.js index c2bae40eb..f883306c7 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -3,13 +3,13 @@ module.exports = { semi: false, singleQuote: true, tabWidth: 4, - trailingComma: "es5", + trailingComma: 'es5', overrides: [ { - files: "*.scss", + files: '*.scss', options: { singleQuote: false } } ] -}; +} From 888ecee2615aeea20904973949d0b99447681168 Mon Sep 17 00:00:00 2001 From: "Luchiya.Raycheva" Date: Tue, 10 Mar 2020 11:31:54 +0200 Subject: [PATCH 4/5] SM-351 update prettier --- HISTORY.md | 6 +- gulpfile.js | 303 +++++------ package-lock.json | 1223 +------------------------------------------- package.json | 15 +- prettier.config.js | 26 +- 5 files changed, 193 insertions(+), 1380 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index bba4d3e19..79dfb49b2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,11 +2,13 @@ https://github.com/josdejong/jsoneditor +## 2020-03-10 +Add prettier for formating js and scss +- to run ``` npm run lint ``` + ## 2020-03-02 Update variables. Add prettier for formating. -- To run a format check: $npm run format:check -- To run a format fix: $npm run format:fix ## 2020-02-17, version 8.6.1 diff --git a/gulpfile.js b/gulpfile.js index 7d640770a..474e827e9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -20,219 +20,224 @@ const DOCS = './src/docs/*' const DIST = path.join(__dirname, 'dist') // generate banner with today's date and correct version -function createBanner () { - const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd - const version = require('./package.json').version // math.js version +function createBanner() { + const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd + const version = require('./package.json').version // math.js version - return String(fs.readFileSync(HEADER)) - .replace('@@date', today) - .replace('@@version', version) + return String(fs.readFileSync(HEADER)) + .replace('@@date', today) + .replace('@@version', version) } const bannerPlugin = new webpack.BannerPlugin({ - banner: createBanner(), - entryOnly: true, - raw: true + banner: createBanner(), + entryOnly: true, + raw: true, }) const webpackConfigModule = { - rules: [ - { - test: /\.m?js$/, - exclude: /node_modules/, - use: { - loader: 'babel-loader' - } - } - ] + rules: [ + { + test: /\.m?js$/, + exclude: /node_modules/, + use: { + loader: 'babel-loader', + }, + }, + ], } // create a single instance of the compiler to allow caching const compiler = webpack({ - entry: ENTRY, - output: { - library: 'JSONEditor', - libraryTarget: 'umd', - path: DIST, - filename: NAME + '.js' - }, - plugins: [bannerPlugin], - optimization: { - // We no not want to minimize our code. - minimize: false - }, - module: webpackConfigModule, - resolve: { - extensions: ['.js'], - mainFields: ['main'] // pick ES5 version of vanilla-picker - }, - cache: true + entry: ENTRY, + output: { + library: 'JSONEditor', + libraryTarget: 'umd', + path: DIST, + filename: NAME + '.js', + }, + plugins: [bannerPlugin], + optimization: { + // We no not want to minimize our code. + minimize: false, + }, + module: webpackConfigModule, + resolve: { + extensions: ['.js'], + mainFields: ['main'], // pick ES5 version of vanilla-picker + }, + cache: true, }) // create a single instance of the compiler to allow caching const compilerMinimalist = webpack({ - entry: ENTRY, - output: { - library: 'JSONEditor', - libraryTarget: 'umd', - path: DIST, - filename: NAME_MINIMALIST + '.js' - }, - module: webpackConfigModule, - plugins: [ - bannerPlugin, - new webpack.IgnorePlugin(new RegExp('^ace-builds')), - new webpack.IgnorePlugin(new RegExp('worker-json-data-url')), - new webpack.IgnorePlugin(new RegExp('^ajv')), - new webpack.IgnorePlugin(new RegExp('^vanilla-picker')) - ], - optimization: { - // We no not want to minimize our code. - minimize: false - }, - cache: true + entry: ENTRY, + output: { + library: 'JSONEditor', + libraryTarget: 'umd', + path: DIST, + filename: NAME_MINIMALIST + '.js', + }, + module: webpackConfigModule, + plugins: [ + bannerPlugin, + new webpack.IgnorePlugin(new RegExp('^ace-builds')), + new webpack.IgnorePlugin(new RegExp('worker-json-data-url')), + new webpack.IgnorePlugin(new RegExp('^ajv')), + new webpack.IgnorePlugin(new RegExp('^vanilla-picker')), + ], + optimization: { + // We no not want to minimize our code. + minimize: false, + }, + cache: true, }) -function minify (name) { - const code = String(fs.readFileSync(DIST + '/' + name + '.js')) - const result = uglify.minify(code, { - sourceMap: { - url: name + '.map' - }, - output: { - comments: /@license/, - max_line_len: 64000 // extra large because we have embedded code for workers +function minify(name) { + const code = String(fs.readFileSync(DIST + '/' + name + '.js')) + const result = uglify.minify(code, { + sourceMap: { + url: name + '.map', + }, + output: { + comments: /@license/, + max_line_len: 64000, // extra large because we have embedded code for workers + }, + }) + + if (result.error) { + throw result.error } - }) - - if (result.error) { - throw result.error - } - const fileMin = DIST + '/' + name + '.min.js' - const fileMap = DIST + '/' + name + '.map' + const fileMin = DIST + '/' + name + '.min.js' + const fileMap = DIST + '/' + name + '.map' - fs.writeFileSync(fileMin, result.code) - fs.writeFileSync(fileMap, result.map) + fs.writeFileSync(fileMin, result.code) + fs.writeFileSync(fileMap, result.map) - log('Minified ' + fileMin) - log('Mapped ' + fileMap) + log('Minified ' + fileMin) + log('Mapped ' + fileMap) } // make dist folder structure -gulp.task('mkdir', function (done) { - mkdirp.sync(DIST) - mkdirp.sync(DIST + '/img') +gulp.task('mkdir', function(done) { + mkdirp.sync(DIST) + mkdirp.sync(DIST + '/img') - done() + done() }) // Create an embedded version of the json worker code: a data url -gulp.task('embed-json-worker', function (done) { - const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js' - const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js' - const workerScript = String(fs.readFileSync(workerBundleFile)) +gulp.task('embed-json-worker', function(done) { + const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js' + const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js' + const workerScript = String(fs.readFileSync(workerBundleFile)) - const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript) + const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript) - fs.writeFileSync(workerEmbeddedFile, 'module.exports = \'' + workerDataUrl + '\'\n') + fs.writeFileSync(workerEmbeddedFile, "module.exports = '" + workerDataUrl + "'\n") - done() + done() }) // bundle javascript -gulp.task('bundle', function (done) { - // update the banner contents (has a date in it which should stay up to date) - bannerPlugin.banner = createBanner() +gulp.task('bundle', function(done) { + // update the banner contents (has a date in it which should stay up to date) + bannerPlugin.banner = createBanner() - compiler.run(function (err, stats) { - if (err) { - log(err) - } + compiler.run(function(err, stats) { + if (err) { + log(err) + } - log('bundled ' + NAME + '.js') + log('bundled ' + NAME + '.js') - done() - }) + done() + }) }) // bundle minimalist version of javascript -gulp.task('bundle-minimalist', function (done) { - // update the banner contents (has a date in it which should stay up to date) - bannerPlugin.banner = createBanner() +gulp.task('bundle-minimalist', function(done) { + // update the banner contents (has a date in it which should stay up to date) + bannerPlugin.banner = createBanner() - compilerMinimalist.run(function (err, stats) { - if (err) { - log(err) - } + compilerMinimalist.run(function(err, stats) { + if (err) { + log(err) + } - log('bundled ' + NAME_MINIMALIST + '.js') + log('bundled ' + NAME_MINIMALIST + '.js') - done() - }) + done() + }) }) // bundle css -gulp.task('bundle-css', function (done) { - gulp - .src(['src/scss/jsoneditor.scss']) - .pipe( - sass({ - // importer: tildeImporter - }) - ) - .pipe(concatCss(NAME + '.css')) - .pipe(gulp.dest(DIST)) - .pipe(concatCss(NAME + '.min.css')) - .pipe(minifyCSS()) - .pipe(gulp.dest(DIST)) - done() +gulp.task('bundle-css', function(done) { + gulp.src(['src/scss/jsoneditor.scss']) + .pipe( + sass({ + // importer: tildeImporter + }) + ) + .pipe(concatCss(NAME + '.css')) + .pipe(gulp.dest(DIST)) + .pipe(concatCss(NAME + '.min.css')) + .pipe(minifyCSS()) + .pipe(gulp.dest(DIST)) + done() }) // create a folder img and copy the icons -gulp.task('copy-img', function (done) { - gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img')) - log('Copied images') +gulp.task('copy-img', function(done) { + gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img')) + log('Copied images') - done() + done() }) // create a folder img and copy the icons -gulp.task('copy-docs', function (done) { - gulp.src(DOCS).pipe(gulp.dest(DIST)) - log('Copied doc') +gulp.task('copy-docs', function(done) { + gulp.src(DOCS).pipe(gulp.dest(DIST)) + log('Copied doc') - done() + done() }) -gulp.task('minify', function (done) { - minify(NAME) +gulp.task('minify', function(done) { + minify(NAME) - done() + done() }) -gulp.task('minify-minimalist', function (done) { - minify(NAME_MINIMALIST) +gulp.task('minify-minimalist', function(done) { + minify(NAME_MINIMALIST) - done() + done() }) // The watch task (to automatically rebuild when the source code changes) // Does only generate jsoneditor.js and jsoneditor.css, and copy the image // Does NOT minify the code and does NOT generate the minimalist version -gulp.task('watch', gulp.series('bundle', 'bundle-css', 'copy-img', function () { - gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img')) -})) +gulp.task( + 'watch', + gulp.series('bundle', 'bundle-css', 'copy-img', function() { + gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img')) + }) +) // The default task (called when you run `gulp`) -gulp.task('default', gulp.series( - 'mkdir', - 'embed-json-worker', - gulp.parallel( - 'copy-img', - 'copy-docs', - 'bundle-css', - gulp.series('bundle', 'minify'), - gulp.series('bundle-minimalist', 'minify-minimalist') - ) -)) +gulp.task( + 'default', + gulp.series( + 'mkdir', + 'embed-json-worker', + gulp.parallel( + 'copy-img', + 'copy-docs', + 'bundle-css', + gulp.series('bundle', 'minify'), + gulp.series('bundle-minimalist', 'minify-minimalist') + ) + ) +) diff --git a/package-lock.json b/package-lock.json index c71fedeb1..8a0a4618d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1113,12 +1113,6 @@ } } }, - "acorn-jsx": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", - "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", - "dev": true - }, "acorn-walk": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", @@ -1172,12 +1166,6 @@ "ansi-wrap": "0.1.0" } }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, "ansi-gray": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", @@ -1315,17 +1303,6 @@ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, - "array-includes": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", - "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0", - "is-string": "^1.0.5" - } - }, "array-initial": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", @@ -1472,12 +1449,6 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", - "dev": true - }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -1973,12 +1944,6 @@ "unset-value": "^1.0.0" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", @@ -2026,12 +1991,6 @@ "supports-color": "^5.3.0" } }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -2125,21 +2084,6 @@ } } }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -2291,12 +2235,6 @@ "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", "dev": true }, - "contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true - }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -2546,12 +2484,6 @@ "ms": "^2.1.1" } }, - "debug-log": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", - "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", - "dev": true - }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -2649,28 +2581,6 @@ } } }, - "deglob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/deglob/-/deglob-4.0.1.tgz", - "integrity": "sha512-/g+RDZ7yf2HvoW+E5Cy+K94YhgcFgr6C8LuHZD1O5HoNPkf3KY6RfXJ0DBGlB/NkLi5gml+G9zqRzk9S0mHZCg==", - "dev": true, - "requires": { - "find-root": "^1.0.0", - "glob": "^7.0.5", - "ignore": "^5.0.0", - "pkg-config": "^1.1.0", - "run-parallel": "^1.1.2", - "uniq": "^1.0.1" - }, - "dependencies": { - "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", - "dev": true - } - } - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2716,15 +2626,6 @@ "randombytes": "^2.0.0" } }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -2957,523 +2858,12 @@ } } }, - "eslint": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz", - "integrity": "sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.10.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.2", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.4.1", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.14", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^6.1.2", - "strip-ansi": "^5.2.0", - "strip-json-comments": "^3.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", - "dev": true - } - } - }, - "eslint-config-standard": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz", - "integrity": "sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA==", - "dev": true - }, - "eslint-config-standard-jsx": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz", - "integrity": "sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw==", - "dev": true - }, - "eslint-import-resolver-node": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz", - "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==", - "dev": true, - "requires": { - "debug": "^2.6.9", - "resolve": "^1.13.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "eslint-module-utils": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz", - "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==", - "dev": true, - "requires": { - "debug": "^2.6.9", - "pkg-dir": "^2.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - } - } - }, - "eslint-plugin-es": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz", - "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==", - "dev": true, - "requires": { - "eslint-utils": "^1.4.2", - "regexpp": "^3.0.0" - }, - "dependencies": { - "regexpp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", - "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", - "dev": true - } - } - }, - "eslint-plugin-import": { - "version": "2.18.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", - "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", - "dev": true, - "requires": { - "array-includes": "^3.0.3", - "contains-path": "^0.1.0", - "debug": "^2.6.9", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.2", - "eslint-module-utils": "^2.4.0", - "has": "^1.0.3", - "minimatch": "^3.0.4", - "object.values": "^1.1.0", - "read-pkg-up": "^2.0.0", - "resolve": "^1.11.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, - "eslint-plugin-node": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz", - "integrity": "sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==", - "dev": true, - "requires": { - "eslint-plugin-es": "^2.0.0", - "eslint-utils": "^1.4.2", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "dependencies": { - "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "eslint-plugin-promise": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", - "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", - "dev": true - }, - "eslint-plugin-react": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz", - "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==", - "dev": true, - "requires": { - "array-includes": "^3.0.3", - "doctrine": "^2.1.0", - "has": "^1.0.3", - "jsx-ast-utils": "^2.1.0", - "object.entries": "^1.1.0", - "object.fromentries": "^2.0.0", - "object.values": "^1.1.0", - "prop-types": "^15.7.2", - "resolve": "^1.10.1" - }, - "dependencies": { - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - } - } - }, - "eslint-plugin-standard": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz", - "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==", - "dev": true - }, - "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", - "dev": true - }, - "espree": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", - "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", - "dev": true, - "requires": { - "acorn": "^7.1.0", - "acorn-jsx": "^5.1.0", - "eslint-visitor-keys": "^1.1.0" - } - }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, "esrecurse": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", @@ -3614,17 +3004,6 @@ } } }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -3730,24 +3109,6 @@ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", "dev": true }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } - }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -3789,12 +3150,6 @@ "pkg-dir": "^3.0.0" } }, - "find-root": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", - "dev": true - }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -3852,34 +3207,6 @@ } } }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "dev": true, - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", - "dev": true - }, "flush-write-stream": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", @@ -4562,12 +3889,6 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -5190,22 +4511,6 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", "dev": true }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, "import-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz", @@ -5240,100 +4545,27 @@ "dev": true }, "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - } - } - } + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" } }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, "interpret": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", @@ -5537,12 +4769,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, "is-regex": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", @@ -5561,12 +4787,6 @@ "is-unc-path": "^1.0.0" } }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", - "dev": true - }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -5796,16 +5016,6 @@ "verror": "1.10.0" } }, - "jsx-ast-utils": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz", - "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==", - "dev": true, - "requires": { - "array-includes": "^3.0.3", - "object.assign": "^4.1.0" - } - }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -6280,12 +5490,6 @@ "mime-db": "1.43.0" } }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -6728,12 +5932,6 @@ "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==", "dev": true }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, "nan": { "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", @@ -6759,12 +5957,6 @@ "to-regex": "^3.0.1" } }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", @@ -6777,12 +5969,6 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node-environment-flags": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", @@ -7116,30 +6302,6 @@ "isobject": "^3.0.0" } }, - "object.entries": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", - "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, - "object.fromentries": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz", - "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, "object.getownpropertydescriptors": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", @@ -7179,18 +6341,6 @@ "make-iterator": "^1.0.0" } }, - "object.values": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", - "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -7200,15 +6350,6 @@ "wrappy": "1" } }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -7310,15 +6451,6 @@ "readable-stream": "^2.1.5" } }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, "parse-asn1": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", @@ -7410,12 +6542,6 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", @@ -7516,58 +6642,6 @@ "node-modules-regexp": "^1.0.0" } }, - "pkg-conf": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", - "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", - "dev": true, - "requires": { - "find-up": "^3.0.0", - "load-json-file": "^5.2.0" - }, - "dependencies": { - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, - "pkg-config": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz", - "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=", - "dev": true, - "requires": { - "debug-log": "^1.0.0", - "find-root": "^1.0.0", - "xtend": "^4.0.1" - } - }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", @@ -7630,37 +6704,12 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "dev": true, - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } - } - }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -7756,12 +6805,6 @@ "safe-buffer": "^5.1.0" } }, - "react-is": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", - "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", - "dev": true - }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -7883,12 +6926,6 @@ "safe-regex": "^1.1.0" } }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", - "dev": true - }, "regexpu-core": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz", @@ -8070,12 +7107,6 @@ "global-modules": "^1.0.0" } }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, "resolve-options": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", @@ -8091,16 +7122,6 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -8180,21 +7201,6 @@ "inherits": "^2.0.1" } }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, - "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", - "dev": true - }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -8204,15 +7210,6 @@ "aproba": "^1.1.1" } }, - "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -8353,46 +7350,12 @@ "safe-buffer": "^5.0.1" } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - } - } - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -8649,43 +7612,6 @@ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", "dev": true }, - "standard": { - "version": "14.3.1", - "resolved": "https://registry.npmjs.org/standard/-/standard-14.3.1.tgz", - "integrity": "sha512-TUQwU7znlZLfgKH1Zwn/D84FitWZkUTfbxSiz/vFx+4c9GV+clSfG/qLiLZOlcdyzhw3oF5/pZydNjbNDfHPEw==", - "dev": true, - "requires": { - "eslint": "~6.4.0", - "eslint-config-standard": "14.1.0", - "eslint-config-standard-jsx": "8.1.0", - "eslint-plugin-import": "~2.18.0", - "eslint-plugin-node": "~10.0.0", - "eslint-plugin-promise": "~4.2.1", - "eslint-plugin-react": "~7.14.2", - "eslint-plugin-standard": "~4.0.0", - "standard-engine": "^12.0.0" - } - }, - "standard-engine": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-12.0.0.tgz", - "integrity": "sha512-gJIIRb0LpL7AHyGbN9+hJ4UJns37lxmNTnMGRLC8CFrzQ+oB/K60IQjKNgPBCB2VP60Ypm6f8DFXvhVWdBOO+g==", - "dev": true, - "requires": { - "deglob": "^4.0.0", - "get-stdin": "^7.0.0", - "minimist": "^1.1.0", - "pkg-conf": "^3.1.0" - }, - "dependencies": { - "get-stdin": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", - "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==", - "dev": true - } - } - }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -8865,52 +7791,6 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, - "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, "tapable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", @@ -8972,18 +7852,6 @@ } } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -9019,15 +7887,6 @@ "setimmediate": "^1.0.4" } }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, "to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", @@ -9185,12 +8044,6 @@ "prelude-ls": "~1.1.2" } }, - "type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", - "dev": true - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -9284,12 +8137,6 @@ "set-value": "^2.0.1" } }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, "unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", @@ -9440,12 +8287,6 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, - "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", - "dev": true - }, "v8flags": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", @@ -9757,32 +8598,6 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } - } - }, "ws": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", diff --git a/package.json b/package.json index 7a0bb9d1d..4b3299a8d 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,10 @@ "bugs": "https://github.com/josdejong/jsoneditor/issues", "scripts": { "build": "gulp", - "format:check": "prettier --check ./{.,src/**,src/{.,scss/**}}/*.{css,scss}", - "format:fix": "npm run format:check -- --write", "minify": "gulp minify", "start": "gulp watch", - "test": "mocha test --require @babel/register", - "lint": "standard --env=mocha", + "test": "mocha test --require @babel/register", + "lint": "prettier --check --write ./{.,src/**}/*.{css,scss,js}", "prepublishOnly": "npm test && npm run build" }, "dependencies": { @@ -54,7 +52,6 @@ "json-loader": "^0.5.7", "mkdirp": "^1.0.3", "mocha": "^7.0.1", - "standard": "^14.3.1", "uglify-js": "^3.7.6", "webpack": "^4.41.5" }, @@ -68,11 +65,5 @@ "LICENSE", "NOTICE", "README.md" - ], - "standard": { - "ignore": [ - "src/js/assets", - "examples/react*" - ] - } + ] } diff --git a/prettier.config.js b/prettier.config.js index f883306c7..1e1cdc3d0 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -1,15 +1,15 @@ module.exports = { - printWidth: 120, - semi: false, - singleQuote: true, - tabWidth: 4, - trailingComma: 'es5', - overrides: [ - { - files: '*.scss', - options: { - singleQuote: false - } - } - ] + printWidth: 120, + semi: false, + singleQuote: true, + tabWidth: 4, + trailingComma: 'es5', + overrides: [ + { + files: '*.scss', + options: { + singleQuote: false, + }, + }, + ], } From d6bd69c0cd9d3d335d30c8a40935de5f49775f85 Mon Sep 17 00:00:00 2001 From: lraycheva Date: Wed, 25 Mar 2020 14:09:15 +0200 Subject: [PATCH 5/5] update indentation --- gulpfile.js | 279 ++++---- package.json | 4 +- prettier.config.js | 26 +- src/scss/jsoneditor/_autocomplete.scss | 52 +- src/scss/jsoneditor/_contextmenu.scss | 760 ++++++++++---------- src/scss/jsoneditor/_editor.scss | 878 ++++++++++++------------ src/scss/jsoneditor/_menu.scss | 116 ++-- src/scss/jsoneditor/_navigationbar.scss | 28 +- src/scss/jsoneditor/_reset.scss | 82 +-- src/scss/jsoneditor/_searchbox.scss | 118 ++-- src/scss/jsoneditor/_statusbar.scss | 84 +-- src/scss/jsoneditor/_treepath.scss | 82 +-- src/scss/jsoneditor/_variables.scss | 2 +- 13 files changed, 1256 insertions(+), 1255 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 474e827e9..3a6638522 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,223 +21,224 @@ const DIST = path.join(__dirname, 'dist') // generate banner with today's date and correct version function createBanner() { - const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd - const version = require('./package.json').version // math.js version + const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd + const version = require('./package.json').version // math.js version - return String(fs.readFileSync(HEADER)) - .replace('@@date', today) - .replace('@@version', version) + return String(fs.readFileSync(HEADER)) + .replace('@@date', today) + .replace('@@version', version) } const bannerPlugin = new webpack.BannerPlugin({ - banner: createBanner(), - entryOnly: true, - raw: true, + banner: createBanner(), + entryOnly: true, + raw: true, }) const webpackConfigModule = { - rules: [ - { - test: /\.m?js$/, - exclude: /node_modules/, - use: { - loader: 'babel-loader', - }, - }, - ], + rules: [ + { + test: /\.m?js$/, + exclude: /node_modules/, + use: { + loader: 'babel-loader', + }, + }, + ], } // create a single instance of the compiler to allow caching const compiler = webpack({ - entry: ENTRY, - output: { - library: 'JSONEditor', - libraryTarget: 'umd', - path: DIST, - filename: NAME + '.js', - }, - plugins: [bannerPlugin], - optimization: { - // We no not want to minimize our code. - minimize: false, - }, - module: webpackConfigModule, - resolve: { - extensions: ['.js'], - mainFields: ['main'], // pick ES5 version of vanilla-picker - }, - cache: true, + entry: ENTRY, + output: { + library: 'JSONEditor', + libraryTarget: 'umd', + path: DIST, + filename: NAME + '.js', + }, + plugins: [bannerPlugin], + optimization: { + // We no not want to minimize our code. + minimize: false, + }, + module: webpackConfigModule, + resolve: { + extensions: ['.js'], + mainFields: ['main'], // pick ES5 version of vanilla-picker + }, + cache: true, }) // create a single instance of the compiler to allow caching const compilerMinimalist = webpack({ - entry: ENTRY, - output: { - library: 'JSONEditor', - libraryTarget: 'umd', - path: DIST, - filename: NAME_MINIMALIST + '.js', - }, - module: webpackConfigModule, - plugins: [ - bannerPlugin, - new webpack.IgnorePlugin(new RegExp('^ace-builds')), - new webpack.IgnorePlugin(new RegExp('worker-json-data-url')), - new webpack.IgnorePlugin(new RegExp('^ajv')), - new webpack.IgnorePlugin(new RegExp('^vanilla-picker')), - ], - optimization: { - // We no not want to minimize our code. - minimize: false, - }, - cache: true, + entry: ENTRY, + output: { + library: 'JSONEditor', + libraryTarget: 'umd', + path: DIST, + filename: NAME_MINIMALIST + '.js', + }, + module: webpackConfigModule, + plugins: [ + bannerPlugin, + new webpack.IgnorePlugin(new RegExp('^ace-builds')), + new webpack.IgnorePlugin(new RegExp('worker-json-data-url')), + new webpack.IgnorePlugin(new RegExp('^ajv')), + new webpack.IgnorePlugin(new RegExp('^vanilla-picker')), + ], + optimization: { + // We no not want to minimize our code. + minimize: false, + }, + cache: true, }) function minify(name) { - const code = String(fs.readFileSync(DIST + '/' + name + '.js')) - const result = uglify.minify(code, { - sourceMap: { - url: name + '.map', - }, - output: { - comments: /@license/, - max_line_len: 64000, // extra large because we have embedded code for workers - }, - }) - - if (result.error) { - throw result.error - } + const code = String(fs.readFileSync(DIST + '/' + name + '.js')) + const result = uglify.minify(code, { + sourceMap: { + url: name + '.map', + }, + output: { + comments: /@license/, + max_line_len: 64000, // extra large because we have embedded code for workers + }, + }) + + if (result.error) { + throw result.error + } - const fileMin = DIST + '/' + name + '.min.js' - const fileMap = DIST + '/' + name + '.map' + const fileMin = DIST + '/' + name + '.min.js' + const fileMap = DIST + '/' + name + '.map' - fs.writeFileSync(fileMin, result.code) - fs.writeFileSync(fileMap, result.map) + fs.writeFileSync(fileMin, result.code) + fs.writeFileSync(fileMap, result.map) - log('Minified ' + fileMin) - log('Mapped ' + fileMap) + log('Minified ' + fileMin) + log('Mapped ' + fileMap) } // make dist folder structure gulp.task('mkdir', function(done) { - mkdirp.sync(DIST) - mkdirp.sync(DIST + '/img') + mkdirp.sync(DIST) + mkdirp.sync(DIST + '/img') - done() + done() }) // Create an embedded version of the json worker code: a data url gulp.task('embed-json-worker', function(done) { - const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js' - const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js' - const workerScript = String(fs.readFileSync(workerBundleFile)) + const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js' + const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js' + const workerScript = String(fs.readFileSync(workerBundleFile)) - const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript) + const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript) - fs.writeFileSync(workerEmbeddedFile, "module.exports = '" + workerDataUrl + "'\n") + fs.writeFileSync(workerEmbeddedFile, "module.exports = '" + workerDataUrl + "'\n") - done() + done() }) // bundle javascript gulp.task('bundle', function(done) { - // update the banner contents (has a date in it which should stay up to date) - bannerPlugin.banner = createBanner() + // update the banner contents (has a date in it which should stay up to date) + bannerPlugin.banner = createBanner() - compiler.run(function(err, stats) { - if (err) { - log(err) - } + compiler.run(function(err, stats) { + if (err) { + log(err) + } - log('bundled ' + NAME + '.js') + log('bundled ' + NAME + '.js') - done() - }) + done() + }) }) // bundle minimalist version of javascript gulp.task('bundle-minimalist', function(done) { - // update the banner contents (has a date in it which should stay up to date) - bannerPlugin.banner = createBanner() + // update the banner contents (has a date in it which should stay up to date) + bannerPlugin.banner = createBanner() - compilerMinimalist.run(function(err, stats) { - if (err) { - log(err) - } + compilerMinimalist.run(function(err, stats) { + if (err) { + log(err) + } - log('bundled ' + NAME_MINIMALIST + '.js') + log('bundled ' + NAME_MINIMALIST + '.js') - done() - }) + done() + }) }) // bundle css gulp.task('bundle-css', function(done) { - gulp.src(['src/scss/jsoneditor.scss']) - .pipe( - sass({ - // importer: tildeImporter - }) - ) - .pipe(concatCss(NAME + '.css')) - .pipe(gulp.dest(DIST)) - .pipe(concatCss(NAME + '.min.css')) - .pipe(minifyCSS()) - .pipe(gulp.dest(DIST)) - done() + gulp + .src(['src/scss/jsoneditor.scss']) + .pipe( + sass({ + // importer: tildeImporter + }) + ) + .pipe(concatCss(NAME + '.css')) + .pipe(gulp.dest(DIST)) + .pipe(concatCss(NAME + '.min.css')) + .pipe(minifyCSS()) + .pipe(gulp.dest(DIST)) + done() }) // create a folder img and copy the icons gulp.task('copy-img', function(done) { - gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img')) - log('Copied images') + gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img')) + log('Copied images') - done() + done() }) // create a folder img and copy the icons gulp.task('copy-docs', function(done) { - gulp.src(DOCS).pipe(gulp.dest(DIST)) - log('Copied doc') + gulp.src(DOCS).pipe(gulp.dest(DIST)) + log('Copied doc') - done() + done() }) gulp.task('minify', function(done) { - minify(NAME) + minify(NAME) - done() + done() }) gulp.task('minify-minimalist', function(done) { - minify(NAME_MINIMALIST) + minify(NAME_MINIMALIST) - done() + done() }) // The watch task (to automatically rebuild when the source code changes) // Does only generate jsoneditor.js and jsoneditor.css, and copy the image // Does NOT minify the code and does NOT generate the minimalist version gulp.task( - 'watch', - gulp.series('bundle', 'bundle-css', 'copy-img', function() { - gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img')) - }) + 'watch', + gulp.series('bundle', 'bundle-css', 'copy-img', function() { + gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img')) + }) ) // The default task (called when you run `gulp`) gulp.task( - 'default', - gulp.series( - 'mkdir', - 'embed-json-worker', - gulp.parallel( - 'copy-img', - 'copy-docs', - 'bundle-css', - gulp.series('bundle', 'minify'), - gulp.series('bundle-minimalist', 'minify-minimalist') - ) + 'default', + gulp.series( + 'mkdir', + 'embed-json-worker', + gulp.parallel( + 'copy-img', + 'copy-docs', + 'bundle-css', + gulp.series('bundle', 'minify'), + gulp.series('bundle-minimalist', 'minify-minimalist') ) + ) ) diff --git a/package.json b/package.json index 4b3299a8d..007dbac18 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "build": "gulp", "minify": "gulp minify", "start": "gulp watch", - "test": "mocha test --require @babel/register", + "test": "mocha test --require @babel/register", "lint": "prettier --check --write ./{.,src/**}/*.{css,scss,js}", "prepublishOnly": "npm test && npm run build" }, @@ -65,5 +65,5 @@ "LICENSE", "NOTICE", "README.md" - ] + ] } diff --git a/prettier.config.js b/prettier.config.js index 1e1cdc3d0..f9be18d67 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -1,15 +1,15 @@ module.exports = { - printWidth: 120, - semi: false, - singleQuote: true, - tabWidth: 4, - trailingComma: 'es5', - overrides: [ - { - files: '*.scss', - options: { - singleQuote: false, - }, - }, - ], + printWidth: 120, + semi: false, + singleQuote: true, + tabWidth: 2, + trailingComma: 'es5', + overrides: [ + { + files: '*.scss', + options: { + singleQuote: false, + }, + }, + ], } diff --git a/src/scss/jsoneditor/_autocomplete.scss b/src/scss/jsoneditor/_autocomplete.scss index affabd6d5..847c53d26 100644 --- a/src/scss/jsoneditor/_autocomplete.scss +++ b/src/scss/jsoneditor/_autocomplete.scss @@ -1,30 +1,30 @@ .jsoneditor { - .autocomplete { - &.dropdown { - position: absolute; - background: $jse-white; - box-shadow: $jse-box-shadow; - border: 1px solid $jse-bar-border; - overflow-x: hidden; - overflow-y: auto; - cursor: default; - margin: 0; - padding: 5px; - text-align: left; - outline: 0; - font-family: $jse-font-mono; - font-size: $jse-font-size; - .item { - color: $jse-dropdown-color; - &.hover { - background-color: $jse-light-bg; - } - } - } - &.hint { - color: $jse-dropdown-hint-color; - top: 4px; - left: 4px; + .autocomplete { + &.dropdown { + position: absolute; + background: $jse-white; + box-shadow: $jse-box-shadow; + border: 1px solid $jse-bar-border; + overflow-x: hidden; + overflow-y: auto; + cursor: default; + margin: 0; + padding: 5px; + text-align: left; + outline: 0; + font-family: $jse-font-mono; + font-size: $jse-font-size; + .item { + color: $jse-dropdown-color; + &.hover { + background-color: $jse-light-bg; } + } + } + &.hint { + color: $jse-dropdown-hint-color; + top: 4px; + left: 4px; } + } } diff --git a/src/scss/jsoneditor/_contextmenu.scss b/src/scss/jsoneditor/_contextmenu.scss index e5f33ddaf..6a64f62b2 100644 --- a/src/scss/jsoneditor/_contextmenu.scss +++ b/src/scss/jsoneditor/_contextmenu.scss @@ -1,399 +1,399 @@ .jsoneditor-contextmenu-root { - position: relative; - width: 0; - height: 0; + position: relative; + width: 0; + height: 0; } .jsoneditor-contextmenu { - position: absolute; - box-sizing: content-box; - z-index: 1; - .jsoneditor-menu { - position: relative; - left: 0; - top: 0; - width: 128px; - height: auto; - background: $jse-white; - border: 1px solid $jse-bar-border; - box-shadow: $jse-box-shadow; - list-style: none; - margin: 0; + position: absolute; + box-sizing: content-box; + z-index: 1; + .jsoneditor-menu { + position: relative; + left: 0; + top: 0; + width: 128px; + height: auto; + background: $jse-white; + border: 1px solid $jse-bar-border; + box-shadow: $jse-box-shadow; + list-style: none; + margin: 0; + padding: 0; + button { + position: relative; + padding: 0 4px 0 0; + margin: 0; + width: 128px; + height: auto; + border: none; + cursor: pointer; + color: $jse-contextmenu-color; + background: transparent; + font-size: $jse-font-size; + font-family: $jse-font; + box-sizing: border-box; + text-align: left; + &::-moz-focus-inner { padding: 0; - button { - position: relative; - padding: 0 4px 0 0; - margin: 0; - width: 128px; - height: auto; - border: none; - cursor: pointer; - color: $jse-contextmenu-color; - background: transparent; - font-size: $jse-font-size; - font-family: $jse-font; - box-sizing: border-box; - text-align: left; - &::-moz-focus-inner { - padding: 0; - border: 0; - } - &.jsoneditor-default { - width: 96px; - } - &.jsoneditor-expand { - float: right; - width: 32px; - height: 24px; - border-left: 1px solid $jse-separator; - } - } - li { - overflow: hidden; - ul { - display: none; - position: relative; - left: -10px; - top: 0; - border: none; - box-shadow: $jse-box-shadow-inner; - padding: 0 10px; - -webkit-transition: all 0.3s ease-out; - -moz-transition: all 0.3s ease-out; - -o-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - .jsoneditor-icon { - margin-left: 24px; - } - li { - button { - padding-left: 24px; - animation: all ease-in-out 1s; - } - } - } - button { - .jsoneditor-expand { - position: absolute; - top: 0; - right: 0; - width: 24px; - height: 24px; - padding: 0; - margin: 0 4px 0 0; - background: url($jse-icons) 0 -72px; - } - } - } + border: 0; + } + &.jsoneditor-default { + width: 96px; + } + &.jsoneditor-expand { + float: right; + width: 32px; + height: 24px; + border-left: 1px solid $jse-separator; + } } - .jsoneditor-icon { - position: absolute; + li { + overflow: hidden; + ul { + display: none; + position: relative; + left: -10px; top: 0; - left: 0; - width: 24px; - height: 24px; border: none; - padding: 0; - margin: 0; - background-image: url($jse-icons); - } - .jsoneditor-text { - padding: 4px 0 4px 24px; - word-wrap: break-word; - &.jsoneditor-right-margin { - padding-right: 24px; - } - } - .jsoneditor-separator { - height: 0; - border-top: 1px solid $jse-separator; - padding-top: 5px; - margin-top: 5px; - } - button { - &.jsoneditor-remove { - .jsoneditor-icon { - background-position: -24px 0; - } - } - &.jsoneditor-append { - .jsoneditor-icon { - background-position: 0 0; - } - } - &.jsoneditor-insert { - .jsoneditor-icon { - background-position: 0 0; - } - } - &.jsoneditor-duplicate { - .jsoneditor-icon { - background-position: -48px 0; - } - } - &.jsoneditor-sort-asc { - .jsoneditor-icon { - background-position: -168px 0; - } - } - &.jsoneditor-sort-desc { - .jsoneditor-icon { - background-position: -192px 0; - } - } - &.jsoneditor-transform { - .jsoneditor-icon { - background-position: -216px 0; - } - } - &.jsoneditor-extract { - .jsoneditor-icon { - background-position: 0 -24px; - } - } - &.jsoneditor-type-string { - .jsoneditor-icon { - background-position: -144px 0; - } - } - &.jsoneditor-type-auto { - .jsoneditor-icon { - background-position: -120px 0; - } - } - &.jsoneditor-type-object { - .jsoneditor-icon { - background-position: -72px 0; - } + box-shadow: $jse-box-shadow-inner; + padding: 0 10px; + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + -o-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + .jsoneditor-icon { + margin-left: 24px; } - &.jsoneditor-type-array { - .jsoneditor-icon { - background-position: -96px 0; - } + li { + button { + padding-left: 24px; + animation: all ease-in-out 1s; + } } - &.jsoneditor-type-modes { - .jsoneditor-icon { - background-image: none; - width: 6px; - } + } + button { + .jsoneditor-expand { + position: absolute; + top: 0; + right: 0; + width: 24px; + height: 24px; + padding: 0; + margin: 0 4px 0 0; + background: url($jse-icons) 0 -72px; } + } } + } + .jsoneditor-icon { + position: absolute; + top: 0; + left: 0; + width: 24px; + height: 24px; + border: none; + padding: 0; + margin: 0; + background-image: url($jse-icons); + } + .jsoneditor-text { + padding: 4px 0 4px 24px; + word-wrap: break-word; + &.jsoneditor-right-margin { + padding-right: 24px; + } + } + .jsoneditor-separator { + height: 0; + border-top: 1px solid $jse-separator; + padding-top: 5px; + margin-top: 5px; + } + button { + &.jsoneditor-remove { + .jsoneditor-icon { + background-position: -24px 0; + } + } + &.jsoneditor-append { + .jsoneditor-icon { + background-position: 0 0; + } + } + &.jsoneditor-insert { + .jsoneditor-icon { + background-position: 0 0; + } + } + &.jsoneditor-duplicate { + .jsoneditor-icon { + background-position: -48px 0; + } + } + &.jsoneditor-sort-asc { + .jsoneditor-icon { + background-position: -168px 0; + } + } + &.jsoneditor-sort-desc { + .jsoneditor-icon { + background-position: -192px 0; + } + } + &.jsoneditor-transform { + .jsoneditor-icon { + background-position: -216px 0; + } + } + &.jsoneditor-extract { + .jsoneditor-icon { + background-position: 0 -24px; + } + } + &.jsoneditor-type-string { + .jsoneditor-icon { + background-position: -144px 0; + } + } + &.jsoneditor-type-auto { + .jsoneditor-icon { + background-position: -120px 0; + } + } + &.jsoneditor-type-object { + .jsoneditor-icon { + background-position: -72px 0; + } + } + &.jsoneditor-type-array { + .jsoneditor-icon { + background-position: -96px 0; + } + } + &.jsoneditor-type-modes { + .jsoneditor-icon { + background-image: none; + width: 6px; + } + } + } } .jsoneditor-contextmenu ul, .jsoneditor-contextmenu li { - box-sizing: content-box; - position: relative; + box-sizing: content-box; + position: relative; } .jsoneditor-contextmenu .jsoneditor-menu button:hover, .jsoneditor-contextmenu .jsoneditor-menu button:focus { - color: $jse-content-color; - background-color: $jse-preview; - outline: none; + color: $jse-content-color; + background-color: $jse-preview; + outline: none; } .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected, .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:hover, .jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:focus { - color: $jse-white; - background-color: $jse-number; + color: $jse-white; + background-color: $jse-number; } .jsoneditor-contextmenu .jsoneditor-menu li ul li button:hover, .jsoneditor-contextmenu .jsoneditor-menu li ul li button:focus { - background-color: $jse-preview; + background-color: $jse-preview; } .jsoneditor-modal { - max-width: 95%; - border-radius: 2px !important; - padding: 45px 15px 15px 15px !important; - box-shadow: $jse-box-shadow; - color: $jse-contextmenu-color; - line-height: 1.3em; - &.jsoneditor-modal-transform { - width: 600px !important; - } - .pico-modal-header { - position: absolute; - box-sizing: border-box; - top: 0; - left: 0; - width: 100%; - padding: 0 10px; - height: 30px; - line-height: 30px; - font-family: $jse-font; - font-size: 11pt; - background: $jse-blue; - color: $jse-white; - } - table { - width: 100%; - td { - padding: 3px 0; - &.jsoneditor-modal-input { - text-align: right; - padding-right: 0; - white-space: nowrap; - } - &.jsoneditor-modal-actions { - padding-top: 15px; - } - } - th { - vertical-align: middle; - } - } - p { - &:first-child { - margin-top: 0; - } - } - a { - color: $jse-blue; - } - .jsoneditor-jmespath-block { - margin-bottom: 10px; - } - .pico-close { - background: none !important; - font-size: 24px !important; - top: 7px !important; - right: 7px !important; - color: $jse-white; + max-width: 95%; + border-radius: 2px !important; + padding: 45px 15px 15px 15px !important; + box-shadow: $jse-box-shadow; + color: $jse-contextmenu-color; + line-height: 1.3em; + &.jsoneditor-modal-transform { + width: 600px !important; + } + .pico-modal-header { + position: absolute; + box-sizing: border-box; + top: 0; + left: 0; + width: 100%; + padding: 0 10px; + height: 30px; + line-height: 30px; + font-family: $jse-font; + font-size: 11pt; + background: $jse-blue; + color: $jse-white; + } + table { + width: 100%; + td { + padding: 3px 0; + &.jsoneditor-modal-input { + text-align: right; + padding-right: 0; + white-space: nowrap; + } + &.jsoneditor-modal-actions { + padding-top: 15px; + } + } + th { + vertical-align: middle; + } + } + p { + &:first-child { + margin-top: 0; + } + } + a { + color: $jse-blue; + } + .jsoneditor-jmespath-block { + margin-bottom: 10px; + } + .pico-close { + background: none !important; + font-size: 24px !important; + top: 7px !important; + right: 7px !important; + color: $jse-white; + } + input { + padding: 4px; + } + input[type="text"] { + cursor: inherit; + } + input[disabled] { + background: $jse-empty; + color: $jse-readonly; + } + .jsoneditor-select-wrapper { + position: relative; + display: inline-block; + &:after { + content: ""; + width: 0; + height: 0; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 6px solid $jse-select-border-color; + position: absolute; + right: 8px; + top: 14px; + pointer-events: none; + } + } + select { + padding: 3px 24px 3px 10px; + min-width: 180px; + max-width: 350px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + text-indent: 0; + text-overflow: ""; + font-size: $jse-font-size; + line-height: 1.5em; + &::-ms-expand { + display: none; } + } + .jsoneditor-button-group { input { - padding: 4px; - } - input[type="text"] { - cursor: inherit; - } - input[disabled] { - background: $jse-empty; - color: $jse-readonly; - } - .jsoneditor-select-wrapper { - position: relative; - display: inline-block; - &:after { - content: ""; - width: 0; - height: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 6px solid $jse-select-border-color; - position: absolute; - right: 8px; - top: 14px; - pointer-events: none; - } - } - select { - padding: 3px 24px 3px 10px; - min-width: 180px; - max-width: 350px; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - text-indent: 0; - text-overflow: ""; - font-size: $jse-font-size; - line-height: 1.5em; - &::-ms-expand { - display: none; - } - } - .jsoneditor-button-group { - input { - padding: 4px 10px; - margin: 0; - border-radius: 0; - border-left-style: none; - &.jsoneditor-button-first { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - border-left-style: solid; - } - &.jsoneditor-button-last { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } - } - } - .jsoneditor-transform-preview { - background: $jse-preview; - height: 200px; - &.jsoneditor-error { - color: $jse-number; - } - } - .jsoneditor-jmespath-wizard { - line-height: 1.2em; - width: 100%; - padding: 0; - border-radius: 3px; - } - .jsoneditor-jmespath-label { - font-weight: bold; - color: $jse-jmespath-label-color; - margin-top: 20px; - margin-bottom: 5px; - } - .jsoneditor-jmespath-wizard-table { - width: 100%; - border-collapse: collapse; - } - .jsoneditor-jmespath-wizard-label { - font-style: italic; - margin: 4px 0 2px 0; - } - .jsoneditor-inline { - position: relative; - display: inline-block; - width: 100%; - padding-top: 2px; - padding-bottom: 2px; - &:not(:last-child) { - padding-right: 2px; - } - } - .jsoneditor-jmespath-filter { - display: flex; - flex-wrap: wrap; - } - .jsoneditor-jmespath-filter-field { - width: 180px; - } - .jsoneditor-jmespath-filter-relation { - width: 100px; - } - .jsoneditor-jmespath-filter-value { - min-width: 180px; - flex: 1; - } - .jsoneditor-jmespath-sort-field { - width: 170px; - } - .jsoneditor-jmespath-sort-order { - width: 150px; - } - .jsoneditor-jmespath-select-fields { - width: 100%; - } - .selectr-selected { - border-color: $jse-bar-border; - padding: 4px 28px 4px 8px; - .selectr-tag { - background-color: $jse-blue; - border-radius: 5px; - } + padding: 4px 10px; + margin: 0; + border-radius: 0; + border-left-style: none; + &.jsoneditor-button-first { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + border-left-style: solid; + } + &.jsoneditor-button-last { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + } + } + } + .jsoneditor-transform-preview { + background: $jse-preview; + height: 200px; + &.jsoneditor-error { + color: $jse-number; } + } + .jsoneditor-jmespath-wizard { + line-height: 1.2em; + width: 100%; + padding: 0; + border-radius: 3px; + } + .jsoneditor-jmespath-label { + font-weight: bold; + color: $jse-jmespath-label-color; + margin-top: 20px; + margin-bottom: 5px; + } + .jsoneditor-jmespath-wizard-table { + width: 100%; + border-collapse: collapse; + } + .jsoneditor-jmespath-wizard-label { + font-style: italic; + margin: 4px 0 2px 0; + } + .jsoneditor-inline { + position: relative; + display: inline-block; + width: 100%; + padding-top: 2px; + padding-bottom: 2px; + &:not(:last-child) { + padding-right: 2px; + } + } + .jsoneditor-jmespath-filter { + display: flex; + flex-wrap: wrap; + } + .jsoneditor-jmespath-filter-field { + width: 180px; + } + .jsoneditor-jmespath-filter-relation { + width: 100px; + } + .jsoneditor-jmespath-filter-value { + min-width: 180px; + flex: 1; + } + .jsoneditor-jmespath-sort-field { + width: 170px; + } + .jsoneditor-jmespath-sort-order { + width: 150px; + } + .jsoneditor-jmespath-select-fields { + width: 100%; + } + .selectr-selected { + border-color: $jse-bar-border; + padding: 4px 28px 4px 8px; + .selectr-tag { + background-color: $jse-blue; + border-radius: 5px; + } + } } .jsoneditor-modal table th, .jsoneditor-modal table td { - text-align: left; - vertical-align: middle; - font-weight: normal; - color: $jse-contextmenu-color; - border-spacing: 0; - border-collapse: collapse; + text-align: left; + vertical-align: middle; + font-weight: normal; + color: $jse-contextmenu-color; + border-spacing: 0; + border-collapse: collapse; } .jsoneditor-modal select, .jsoneditor-modal textarea, @@ -401,11 +401,11 @@ .jsoneditor-modal input[type="text"], .jsoneditor-modal input[type="text"]:focus, .jsoneditor-modal #query { - background: $jse-white; - border: 1px solid $jse-bar-border; - color: $jse-contextmenu-color; - border-radius: 3px; - padding: 4px; + background: $jse-white; + border: 1px solid $jse-bar-border; + color: $jse-contextmenu-color; + border-radius: 3px; + padding: 4px; } .jsoneditor-modal, .jsoneditor-modal table td, @@ -416,28 +416,28 @@ .jsoneditor-modal input, .jsoneditor-modal input[type="text"], .jsoneditor-modal #query { - font-size: 10.5pt; - font-family: $jse-font; + font-size: 10.5pt; + font-family: $jse-font; } .jsoneditor-modal #query, .jsoneditor-modal .jsoneditor-transform-preview { - font-family: $jse-font-mono; - font-size: $jse-font-size; - width: 100%; - box-sizing: border-box; + font-family: $jse-font-mono; + font-size: $jse-font-size; + width: 100%; + box-sizing: border-box; } .jsoneditor-modal input[type="button"], .jsoneditor-modal input[type="submit"] { - background: $jse-preview; - padding: 4px 20px; + background: $jse-preview; + padding: 4px 20px; } .jsoneditor-modal select, .jsoneditor-modal input { - cursor: pointer; + cursor: pointer; } .jsoneditor-modal .jsoneditor-button-group.jsoneditor-button-group-value-asc input.jsoneditor-button-asc, .jsoneditor-modal .jsoneditor-button-group.jsoneditor-button-group-value-desc input.jsoneditor-button-desc { - background: $jse-blue; - border-color: $jse-blue; - color: $jse-white; + background: $jse-blue; + border-color: $jse-blue; + color: $jse-white; } diff --git a/src/scss/jsoneditor/_editor.scss b/src/scss/jsoneditor/_editor.scss index b00bd383b..23a3ffa10 100644 --- a/src/scss/jsoneditor/_editor.scss +++ b/src/scss/jsoneditor/_editor.scss @@ -1,276 +1,276 @@ .jsoneditor { - color: $jse-content-color; - border: thin solid $jse-blue; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - width: 100%; - height: 100%; - position: relative; - padding: 0; - line-height: 100%; + color: $jse-content-color; + border: thin solid $jse-blue; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 100%; + height: 100%; + position: relative; + padding: 0; + line-height: 100%; } div.jsoneditor-field, div.jsoneditor-value, div.jsoneditor-readonly, div.jsoneditor-default { - border: 1px solid transparent; - min-height: 16px; - min-width: 32px; - padding: 2px; - margin: 1px; - word-wrap: break-word; - float: left; + border: 1px solid transparent; + min-height: 16px; + min-width: 32px; + padding: 2px; + margin: 1px; + word-wrap: break-word; + float: left; } div.jsoneditor-field p, div.jsoneditor-value p { - margin: 0; + margin: 0; } div { - &.jsoneditor-value { - word-break: break-word; - &.jsoneditor-empty { - &::after { - content: "value"; - } - } - &.jsoneditor-string { - color: $jse-string; - } - &.jsoneditor-number { - color: $jse-number; - } - &.jsoneditor-boolean { - color: $jse-boolean; - } - &.jsoneditor-null { - color: $jse-null; - } - &.jsoneditor-invalid { - color: $jse-invalid; - } + &.jsoneditor-value { + word-break: break-word; + &.jsoneditor-empty { + &::after { + content: "value"; + } } - &.jsoneditor-readonly { - min-width: 16px; - color: $jse-readonly; + &.jsoneditor-string { + color: $jse-string; + } + &.jsoneditor-number { + color: $jse-number; + } + &.jsoneditor-boolean { + color: $jse-boolean; + } + &.jsoneditor-null { + color: $jse-null; } + &.jsoneditor-invalid { + color: $jse-invalid; + } + } + &.jsoneditor-readonly { + min-width: 16px; + color: $jse-readonly; + } + &.jsoneditor-empty { + border-color: $jse-bar-border; + border-style: dashed; + border-radius: 2px; + } + &.jsoneditor-field { &.jsoneditor-empty { - border-color: $jse-bar-border; - border-style: dashed; - border-radius: 2px; - } - &.jsoneditor-field { - &.jsoneditor-empty { - &::after { - content: "field"; - } - } + &::after { + content: "field"; + } } - &.jsoneditor { - td { - vertical-align: top; - &.jsoneditor-separator { - padding: 3px 0; - vertical-align: top; - color: $jse-readonly; - } - &.jsoneditor-tree { - vertical-align: top; - } - } - &.busy { - pre { - &.jsoneditor-preview { - background: $jse-preview; - color: $jse-readonly; - } - } - div { - &.jsoneditor-busy { - display: inherit; - } - } - } - code { - &.jsoneditor-preview { - background: none; - } - } - &.jsoneditor-mode-preview { - pre { - &.jsoneditor-preview { - width: 100%; - height: 100%; - box-sizing: border-box; - overflow: auto; - padding: 2px; - margin: 0; - white-space: pre-wrap; - word-break: break-all; - } - } - } + } + &.jsoneditor { + td { + vertical-align: top; + &.jsoneditor-separator { + padding: 3px 0; + vertical-align: top; + color: $jse-readonly; + } + &.jsoneditor-tree { + vertical-align: top; + } } - &.jsoneditor-default { + &.busy { + pre { + &.jsoneditor-preview { + background: $jse-preview; + color: $jse-readonly; + } + } + div { + &.jsoneditor-busy { + display: inherit; + } + } + } + code { + &.jsoneditor-preview { + background: none; + } + } + &.jsoneditor-mode-preview { + pre { + &.jsoneditor-preview { + width: 100%; + height: 100%; + box-sizing: border-box; + overflow: auto; + padding: 2px; + margin: 0; + white-space: pre-wrap; + word-break: break-all; + } + } + } + } + &.jsoneditor-default { + color: $jse-readonly; + padding-left: 10px; + } + &.jsoneditor-tree { + width: 100%; + height: 100%; + position: relative; + overflow: auto; + button { + &.jsoneditor-button { + width: 24px; + height: 24px; + padding: 0; + margin: 0; + border: none; + cursor: pointer; + background: transparent url($jse-icons); + &:focus { + background-color: $jse-preview; + outline: $jse-button-outline solid 1px; + } + } + &.jsoneditor-collapsed { + background-position: 0 -48px; + } + &.jsoneditor-expanded { + background-position: 0 -72px; + } + &.jsoneditor-contextmenu-button { + background-position: -48px -72px; + } + &.jsoneditor-invisible { + visibility: hidden; + background: none; + } + &.jsoneditor-dragarea { + background: url($jse-icons) -72px -72px; + cursor: move; + } + } + *:focus { + outline: none; + } + div { + &.jsoneditor-show-more { + display: inline-block; + padding: 3px 4px; + margin: 2px 0; + background-color: $jse-separator; + border-radius: 3px; color: $jse-readonly; - padding-left: 10px; + font-family: $jse-font; + font-size: $jse-font-size; + a { + display: inline-block; + color: $jse-readonly; + } + } + &.jsoneditor-color { + display: inline-block; + width: 12px; + height: 12px; + margin: 4px; + border: 1px solid $jse-readonly; + cursor: pointer; + } + &.jsoneditor-date { + background: $jse-date; + color: $jse-white; + font-family: $jse-font; + border-radius: 3px; + display: inline-block; + padding: 3px; + margin: 0 3px; + } } - &.jsoneditor-tree { + table { + &.jsoneditor-tree { + border-collapse: collapse; + border-spacing: 0; width: 100%; - height: 100%; - position: relative; - overflow: auto; - button { - &.jsoneditor-button { - width: 24px; - height: 24px; - padding: 0; - margin: 0; - border: none; - cursor: pointer; - background: transparent url($jse-icons); - &:focus { - background-color: $jse-preview; - outline: $jse-button-outline solid 1px; - } - } - &.jsoneditor-collapsed { - background-position: 0 -48px; - } - &.jsoneditor-expanded { - background-position: 0 -72px; - } - &.jsoneditor-contextmenu-button { - background-position: -48px -72px; - } - &.jsoneditor-invisible { - visibility: hidden; - background: none; - } - &.jsoneditor-dragarea { - background: url($jse-icons) -72px -72px; - cursor: move; - } - } - *:focus { - outline: none; - } - div { - &.jsoneditor-show-more { - display: inline-block; - padding: 3px 4px; - margin: 2px 0; - background-color: $jse-separator; - border-radius: 3px; - color: $jse-readonly; - font-family: $jse-font; - font-size: $jse-font-size; - a { - display: inline-block; - color: $jse-readonly; - } - } - &.jsoneditor-color { - display: inline-block; - width: 12px; - height: 12px; - margin: 4px; - border: 1px solid $jse-readonly; - cursor: pointer; - } - &.jsoneditor-date { - background: $jse-date; - color: $jse-white; - font-family: $jse-font; - border-radius: 3px; - display: inline-block; - padding: 3px; - margin: 0 3px; - } - } - table { - &.jsoneditor-tree { - border-collapse: collapse; - border-spacing: 0; - width: 100%; - } - } - .jsoneditor-button { - &.jsoneditor-schema-error { - width: 24px; - height: 24px; - padding: 0; - margin: 0 4px 0 0; - background: url($jse-icons) -168px -48px; - } - } + } } - &.jsoneditor-outer { - position: static; - width: 100%; - height: 100%; - margin: 0; + .jsoneditor-button { + &.jsoneditor-schema-error { + width: 24px; + height: 24px; padding: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - &.has-nav-bar { - margin-top: -26px; - padding-top: 26px; - &.has-main-menu-bar { - margin-top: -61px; - padding-top: 61px; - } - } - &.has-status-bar { - margin-bottom: -26px; - padding-bottom: 26px; - } - &.has-main-menu-bar { - margin-top: -35px; - padding-top: 35px; - } + margin: 0 4px 0 0; + background: url($jse-icons) -168px -48px; + } } - &.jsoneditor-busy { - position: absolute; - top: 15%; - left: 0; - box-sizing: border-box; - width: 100%; - text-align: center; - display: none; - span { - background-color: $jse-busy; - border: 1px solid $jse-busy-border-color; - border-radius: 3px; - padding: 5px 15px; - box-shadow: $jse-box-shadow-sm; - } + } + &.jsoneditor-outer { + position: static; + width: 100%; + height: 100%; + margin: 0; + padding: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + &.has-nav-bar { + margin-top: -26px; + padding-top: 26px; + &.has-main-menu-bar { + margin-top: -61px; + padding-top: 61px; + } + } + &.has-status-bar { + margin-bottom: -26px; + padding-bottom: 26px; + } + &.has-main-menu-bar { + margin-top: -35px; + padding-top: 35px; + } + } + &.jsoneditor-busy { + position: absolute; + top: 15%; + left: 0; + box-sizing: border-box; + width: 100%; + text-align: center; + display: none; + span { + background-color: $jse-busy; + border: 1px solid $jse-busy-border-color; + border-radius: 3px; + padding: 5px 15px; + box-shadow: $jse-box-shadow-sm; } + } } div.jsoneditor-field.jsoneditor-empty::after, div.jsoneditor-value.jsoneditor-empty::after { - pointer-events: none; - color: $jse-empty; - font-size: 8pt; + pointer-events: none; + color: $jse-empty; + font-size: 8pt; } div.jsoneditor-value.jsoneditor-url, a.jsoneditor-value.jsoneditor-url { - color: $jse-string; - text-decoration: underline; + color: $jse-string; + text-decoration: underline; } a { - &.jsoneditor-value { - &.jsoneditor-url { - display: inline-block; - padding: 2px; - margin: 2px; - } + &.jsoneditor-value { + &.jsoneditor-url { + display: inline-block; + padding: 2px; + margin: 2px; } + } } a.jsoneditor-value.jsoneditor-url:hover, a.jsoneditor-value.jsoneditor-url:focus { - color: $jse-number; + color: $jse-number; } div.jsoneditor-field[contenteditable="true"]:focus, div.jsoneditor-field[contenteditable="true"]:hover, @@ -278,9 +278,9 @@ div.jsoneditor-value[contenteditable="true"]:focus, div.jsoneditor-value[contenteditable="true"]:hover, div.jsoneditor-field.jsoneditor-highlight, div.jsoneditor-value.jsoneditor-highlight { - background-color: $jse-busy; - border: 1px solid $jse-busy-border-color; - border-radius: 2px; + background-color: $jse-busy; + border: 1px solid $jse-busy-border-color; + border-radius: 2px; } div.jsoneditor-field.jsoneditor-highlight-active, div.jsoneditor-field.jsoneditor-highlight-active:focus, @@ -288,68 +288,68 @@ div.jsoneditor-field.jsoneditor-highlight-active:hover, div.jsoneditor-value.jsoneditor-highlight-active, div.jsoneditor-value.jsoneditor-highlight-active:focus, div.jsoneditor-value.jsoneditor-highlight-active:hover { - background-color: $jse-highlight-bg; - border: 1px solid $jse-highlight-border-color; - border-radius: 2px; + background-color: $jse-highlight-bg; + border: 1px solid $jse-highlight-border-color; + border-radius: 2px; } div.jsoneditor-value.jsoneditor-object, div.jsoneditor-value.jsoneditor-array { - min-width: 16px; + min-width: 16px; } div.jsoneditor-tree button.jsoneditor-contextmenu-button:hover, div.jsoneditor-tree button.jsoneditor-contextmenu-button:focus, div.jsoneditor-tree button.jsoneditor-contextmenu-button.jsoneditor-selected, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button { - background-position: -48px -48px; + background-position: -48px -48px; } div.jsoneditor-tree div.jsoneditor-show-more a:hover, div.jsoneditor-tree div.jsoneditor-show-more a:focus { - color: $jse-number; + color: $jse-number; } textarea.jsoneditor-text, .ace-jsoneditor { - min-height: 150px; + min-height: 150px; - * { - font-family: $jse-font-mono; - } + * { + font-family: $jse-font-mono; + } } textarea { - &.jsoneditor-text { - width: 100%; - height: 100%; - margin: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - outline-width: 0; - border: none; - background-color: $jse-white; - resize: none; - } + &.jsoneditor-text { + width: 100%; + height: 100%; + margin: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline-width: 0; + border: none; + background-color: $jse-white; + resize: none; + } } tr.jsoneditor-highlight, tr.jsoneditor-selected { - background-color: $jse-empty; + background-color: $jse-empty; } tr.jsoneditor-selected button.jsoneditor-dragarea, tr.jsoneditor-selected button.jsoneditor-contextmenu-button { - visibility: hidden; + visibility: hidden; } tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button { - visibility: visible; + visibility: visible; } div.jsoneditor-tree button.jsoneditor-dragarea:hover, div.jsoneditor-tree button.jsoneditor-dragarea:focus, tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea { - background-position: -72px -48px; + background-position: -72px -48px; } div.jsoneditor tr, div.jsoneditor th, div.jsoneditor td { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } div.jsoneditor-field, div.jsoneditor-value, @@ -359,225 +359,225 @@ div.jsoneditor textarea, pre.jsoneditor-preview, .jsoneditor-schema-error, .jsoneditor-popover { - font-family: $jse-font-mono; - font-size: $jse-font-size; - color: $jse-content-color; + font-family: $jse-font-mono; + font-size: $jse-font-size; + color: $jse-content-color; } .jsoneditor-schema-error { - cursor: default; - display: inline-block; - height: 24px; - line-height: 24px; - position: relative; - text-align: center; - width: 24px; + cursor: default; + display: inline-block; + height: 24px; + line-height: 24px; + position: relative; + text-align: center; + width: 24px; } .jsoneditor-popover { - background-color: $jse-popover-bg; - border-radius: 3px; - box-shadow: $jse-box-shadow-sm; - color: $jse-white; - padding: 7px 10px; - position: absolute; - cursor: auto; - width: 200px; - &.jsoneditor-above { - bottom: 32px; - left: -98px; - &:before { - border-top: 7px solid $jse-popover-bg; - bottom: -7px; - } - } - &.jsoneditor-below { - top: 32px; - left: -98px; - &:before { - border-bottom: 7px solid $jse-popover-bg; - top: -7px; - } + background-color: $jse-popover-bg; + border-radius: 3px; + box-shadow: $jse-box-shadow-sm; + color: $jse-white; + padding: 7px 10px; + position: absolute; + cursor: auto; + width: 200px; + &.jsoneditor-above { + bottom: 32px; + left: -98px; + &:before { + border-top: 7px solid $jse-popover-bg; + bottom: -7px; } - &.jsoneditor-left { - top: -7px; - right: 32px; - &:before { - border-left: 7px solid $jse-popover-bg; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - content: ""; - top: 19px; - right: -14px; - left: inherit; - margin-left: inherit; - margin-top: -7px; - position: absolute; - } + } + &.jsoneditor-below { + top: 32px; + left: -98px; + &:before { + border-bottom: 7px solid $jse-popover-bg; + top: -7px; } - &.jsoneditor-right { - top: -7px; - left: 32px; - &:before { - border-right: 7px solid $jse-popover-bg; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - content: ""; - top: 19px; - left: -14px; - margin-left: inherit; - margin-top: -7px; - position: absolute; - } + } + &.jsoneditor-left { + top: -7px; + right: 32px; + &:before { + border-left: 7px solid $jse-popover-bg; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + content: ""; + top: 19px; + right: -14px; + left: inherit; + margin-left: inherit; + margin-top: -7px; + position: absolute; } + } + &.jsoneditor-right { + top: -7px; + left: 32px; &:before { - border-right: 7px solid transparent; - border-left: 7px solid transparent; - content: ""; - display: block; - left: 50%; - margin-left: -7px; - position: absolute; + border-right: 7px solid $jse-popover-bg; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + content: ""; + top: 19px; + left: -14px; + margin-left: inherit; + margin-top: -7px; + position: absolute; } + } + &:before { + border-right: 7px solid transparent; + border-left: 7px solid transparent; + content: ""; + display: block; + left: 50%; + margin-left: -7px; + position: absolute; + } } .jsoneditor-text-errors { - tr { - &.jump-to-line { - &:hover { - text-decoration: underline; - cursor: pointer; - } - } + tr { + &.jump-to-line { + &:hover { + text-decoration: underline; + cursor: pointer; + } } + } } .jsoneditor-schema-error:hover .jsoneditor-popover, .jsoneditor-schema-error:focus .jsoneditor-popover { - display: block; - animation: fade-in 0.3s linear 1, move-up 0.3s linear 1; + display: block; + animation: fade-in 0.3s linear 1, move-up 0.3s linear 1; } @keyframes fade-in { - from { - opacity: 0; - } - to { - opacity: 1; - } + from { + opacity: 0; + } + to { + opacity: 1; + } } /* JSON schema errors displayed at the bottom of the editor in mode text and code */ .jsoneditor { - .jsoneditor-validation-errors-container { - max-height: 130px; - overflow-y: auto; + .jsoneditor-validation-errors-container { + max-height: 130px; + overflow-y: auto; + } + .jsoneditor-validation-errors { + width: 100%; + overflow: hidden; + } + .jsoneditor-additional-errors { + position: absolute; + margin: auto; + bottom: 31px; + left: calc(50% - 92px); + color: $jse-readonly; + background-color: $jse-light-bg; + padding: 7px 15px; + border-radius: 8px; + &.visible { + visibility: visible; + opacity: 1; + transition: opacity 2s linear; } - .jsoneditor-validation-errors { - width: 100%; - overflow: hidden; + &.hidden { + visibility: hidden; + opacity: 0; + transition: visibility 0s 2s, opacity 2s linear; } - .jsoneditor-additional-errors { - position: absolute; - margin: auto; - bottom: 31px; - left: calc(50% - 92px); - color: $jse-readonly; - background-color: $jse-light-bg; - padding: 7px 15px; - border-radius: 8px; - &.visible { - visibility: visible; - opacity: 1; - transition: opacity 2s linear; - } - &.hidden { - visibility: hidden; - opacity: 0; - transition: visibility 0s 2s, opacity 2s linear; - } + } + .jsoneditor-text-errors { + width: 100%; + border-collapse: collapse; + border-top: 1px solid $jse-highlight-border-color; + td { + padding: 3px 6px; + vertical-align: middle; + pre { + margin: 0; + white-space: normal; + } } - .jsoneditor-text-errors { - width: 100%; - border-collapse: collapse; - border-top: 1px solid $jse-highlight-border-color; - td { - padding: 3px 6px; - vertical-align: middle; - pre { - margin: 0; - white-space: normal; - } - } - tr { - background-color: $jse-busy; - &.parse-error { - background-color: $jse-error; - } - } + tr { + background-color: $jse-busy; + &.parse-error { + background-color: $jse-error; + } } + } } .jsoneditor-text-errors { + .jsoneditor-schema-error { + border: none; + width: 24px; + height: 24px; + padding: 0; + margin: 0 4px 0 0; + cursor: pointer; + } + tr { .jsoneditor-schema-error { - border: none; - width: 24px; - height: 24px; - padding: 0; - margin: 0 4px 0 0; - cursor: pointer; + background: url($jse-icons) -168px -48px; } - tr { - .jsoneditor-schema-error { - background: url($jse-icons) -168px -48px; - } - &.parse-error { - .jsoneditor-schema-error { - background: url($jse-icons) -25px 0px; - } - } + &.parse-error { + .jsoneditor-schema-error { + background: url($jse-icons) -25px 0px; + } } + } } .jsoneditor-anchor { - cursor: pointer; + cursor: pointer; - .picker_wrapper { - &.popup { - &.popup_bottom { - top: 28px; - left: -10px; - } - } + .picker_wrapper { + &.popup { + &.popup_bottom { + top: 28px; + left: -10px; + } } + } } .fadein { - -webkit-animation: fadein 0.3s; - animation: fadein 0.3s; - -moz-animation: fadein 0.3s; - -o-animation: fadein 0.3s; + -webkit-animation: fadein 0.3s; + animation: fadein 0.3s; + -moz-animation: fadein 0.3s; + -o-animation: fadein 0.3s; } @keyframes fadein { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } } // override some styles which where cleared in reset.scss .jsoneditor-modal { - input[type="search"].selectr-input { - border: 1px solid $jse-input-border; - width: calc(100% - 4px); - margin: 2px; - padding: 4px; - box-sizing: border-box; - } + input[type="search"].selectr-input { + border: 1px solid $jse-input-border; + width: calc(100% - 4px); + margin: 2px; + padding: 4px; + box-sizing: border-box; + } - button.selectr-input-clear { - right: 8px; - } + button.selectr-input-clear { + right: 8px; + } } diff --git a/src/scss/jsoneditor/_menu.scss b/src/scss/jsoneditor/_menu.scss index d14a6e099..99365f8b7 100644 --- a/src/scss/jsoneditor/_menu.scss +++ b/src/scss/jsoneditor/_menu.scss @@ -1,126 +1,126 @@ .jsoneditor-menu { - width: 100%; - height: 35px; - padding: 2px; - margin: 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; + width: 100%; + height: 35px; + padding: 2px; + margin: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; - color: $jse-white; - background-color: $jse-blue; - border-bottom: 1px solid $jse-blue; + color: $jse-white; + background-color: $jse-blue; + border-bottom: 1px solid $jse-blue; } .jsoneditor-menu > button, .jsoneditor-menu > .jsoneditor-modes > button { - width: 26px; - height: 26px; - margin: 2px; - padding: 0; - border-radius: 2px; - border: 1px solid transparent; - background: transparent url($jse-icons); - color: $jse-white; - opacity: 0.8; + width: 26px; + height: 26px; + margin: 2px; + padding: 0; + border-radius: 2px; + border: 1px solid transparent; + background: transparent url($jse-icons); + color: $jse-white; + opacity: 0.8; - font-family: $jse-font; - font-size: $jse-font-size; + font-family: $jse-font; + font-size: $jse-font-size; - float: left; + float: left; } .jsoneditor-menu > button:hover, .jsoneditor-menu > .jsoneditor-modes > button:hover { - background-color: rgba($jse-white, 0.2); - border: 1px solid rgba($jse-white, 0.4); + background-color: rgba($jse-white, 0.2); + border: 1px solid rgba($jse-white, 0.4); } .jsoneditor-menu > button:focus, .jsoneditor-menu > button:active, .jsoneditor-menu > .jsoneditor-modes > button:focus, .jsoneditor-menu > .jsoneditor-modes > button:active { - background-color: rgba($jse-white, 0.3); + background-color: rgba($jse-white, 0.3); } .jsoneditor-menu > button:disabled, .jsoneditor-menu > .jsoneditor-modes > button:disabled { - opacity: 0.5; - background-color: transparent; - border: none; + opacity: 0.5; + background-color: transparent; + border: none; } .jsoneditor-menu > button.jsoneditor-collapse-all { - background-position: 0 -96px; + background-position: 0 -96px; } .jsoneditor-menu > button.jsoneditor-expand-all { - background-position: 0 -120px; + background-position: 0 -120px; } .jsoneditor-menu > button.jsoneditor-sort { - background-position: -120px -96px; + background-position: -120px -96px; } .jsoneditor-menu > button.jsoneditor-transform { - background-position: -144px -96px; + background-position: -144px -96px; } .jsoneditor.jsoneditor-mode-view > .jsoneditor-menu > button.jsoneditor-sort, .jsoneditor.jsoneditor-mode-form > .jsoneditor-menu > button.jsoneditor-sort, .jsoneditor.jsoneditor-mode-view > .jsoneditor-menu > button.jsoneditor-transform, .jsoneditor.jsoneditor-mode-form > .jsoneditor-menu > button.jsoneditor-transform { - display: none; + display: none; } .jsoneditor-menu > button.jsoneditor-undo { - background-position: -24px -96px; + background-position: -24px -96px; } .jsoneditor-menu > button.jsoneditor-undo:disabled { - background-position: -24px -120px; + background-position: -24px -120px; } .jsoneditor-menu > button.jsoneditor-redo { - background-position: -48px -96px; + background-position: -48px -96px; } .jsoneditor-menu > button.jsoneditor-redo:disabled { - background-position: -48px -120px; + background-position: -48px -120px; } .jsoneditor-menu > button.jsoneditor-compact { - background-position: -72px -96px; + background-position: -72px -96px; } .jsoneditor-menu > button.jsoneditor-format { - background-position: -72px -120px; + background-position: -72px -120px; } .jsoneditor-menu > button.jsoneditor-repair { - background-position: -96px -96px; + background-position: -96px -96px; } .jsoneditor-menu > .jsoneditor-modes { - display: inline-block; - float: left; + display: inline-block; + float: left; } .jsoneditor-menu > .jsoneditor-modes > button { - background-image: none; - width: auto; - padding-left: 6px; - padding-right: 6px; + background-image: none; + width: auto; + padding-left: 6px; + padding-right: 6px; } .jsoneditor-menu > button.jsoneditor-separator, .jsoneditor-menu > .jsoneditor-modes > button.jsoneditor-separator { - margin-left: 10px; + margin-left: 10px; } .jsoneditor-menu a { - font-family: $jse-font; - font-size: $jse-font-size; - color: $jse-white; - opacity: 0.8; - vertical-align: middle; + font-family: $jse-font; + font-size: $jse-font-size; + color: $jse-white; + opacity: 0.8; + vertical-align: middle; } .jsoneditor-menu a:hover { - opacity: 1; + opacity: 1; } .jsoneditor-menu a.jsoneditor-poweredBy { - font-size: 8pt; - position: absolute; - right: 0; - top: 0; - padding: 10px; + font-size: 8pt; + position: absolute; + right: 0; + top: 0; + padding: 10px; } diff --git a/src/scss/jsoneditor/_navigationbar.scss b/src/scss/jsoneditor/_navigationbar.scss index a2d9ff0d2..208a57c3a 100644 --- a/src/scss/jsoneditor/_navigationbar.scss +++ b/src/scss/jsoneditor/_navigationbar.scss @@ -1,17 +1,17 @@ .jsoneditor-navigation-bar { - width: 100%; - height: 26px; - line-height: 26px; - padding: 0; - margin: 0; - border-bottom: 1px solid $jse-bar-border; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: $jse-readonly; - background-color: $jse-light-bg; - overflow: hidden; + width: 100%; + height: 26px; + line-height: 26px; + padding: 0; + margin: 0; + border-bottom: 1px solid $jse-bar-border; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: $jse-readonly; + background-color: $jse-light-bg; + overflow: hidden; - font-family: $jse-font; - font-size: $jse-font-size; + font-family: $jse-font; + font-size: $jse-font-size; } diff --git a/src/scss/jsoneditor/_reset.scss b/src/scss/jsoneditor/_reset.scss index 9b2e808c1..7bc8b5782 100644 --- a/src/scss/jsoneditor/_reset.scss +++ b/src/scss/jsoneditor/_reset.scss @@ -1,51 +1,51 @@ .jsoneditor, .jsoneditor-modal { - input, - input:not([type]), - input[type="text"], - input[type="search"] { - height: auto; - border: inherit; - box-shadow: none; - font-size: inherit; - box-sizing: inherit; - padding: inherit; - font-family: inherit; - transition: none; - line-height: inherit; + input, + input:not([type]), + input[type="text"], + input[type="search"] { + height: auto; + border: inherit; + box-shadow: none; + font-size: inherit; + box-sizing: inherit; + padding: inherit; + font-family: inherit; + transition: none; + line-height: inherit; - &:focus { - border: inherit; - box-shadow: inherit; - } + &:focus { + border: inherit; + box-shadow: inherit; } + } - textarea { - height: inherit; - } + textarea { + height: inherit; + } - select { - display: inherit; - height: inherit; - } + select { + display: inherit; + height: inherit; + } - label { - font-size: inherit; - font-weight: inherit; - color: inherit; - } + label { + font-size: inherit; + font-weight: inherit; + color: inherit; + } - table { - border-collapse: collapse; - width: auto; - } + table { + border-collapse: collapse; + width: auto; + } - td, - th { - padding: 0; - display: table-cell; - text-align: left; - vertical-align: inherit; - border-radius: inherit; - } + td, + th { + padding: 0; + display: table-cell; + text-align: left; + vertical-align: inherit; + border-radius: inherit; + } } diff --git a/src/scss/jsoneditor/_searchbox.scss b/src/scss/jsoneditor/_searchbox.scss index 933475695..dbfffa45c 100644 --- a/src/scss/jsoneditor/_searchbox.scss +++ b/src/scss/jsoneditor/_searchbox.scss @@ -1,72 +1,72 @@ .jsoneditor { - &-search { - font-family: $jse-font; - position: absolute; - right: 4px; - top: 4px; - border-collapse: collapse; - border-spacing: 0; - display: flex; + &-search { + font-family: $jse-font; + position: absolute; + right: 4px; + top: 4px; + border-collapse: collapse; + border-spacing: 0; + display: flex; - input { - color: $jse-content-color; - width: 120px; - border: none; - outline: none; - margin: 1px; - line-height: 20px; - font-family: $jse-font; - } + input { + color: $jse-content-color; + width: 120px; + border: none; + outline: none; + margin: 1px; + line-height: 20px; + font-family: $jse-font; + } - button { - width: 16px; - height: 24px; - padding: 0; - margin: 0; - border: none; - background: url($jse-icons); - vertical-align: top; + button { + width: 16px; + height: 24px; + padding: 0; + margin: 0; + border: none; + background: url($jse-icons); + vertical-align: top; - &:hover { - background-color: transparent; - } + &:hover { + background-color: transparent; + } - &.jsoneditor-refresh { - width: 18px; - background-position: -99px -73px; - } + &.jsoneditor-refresh { + width: 18px; + background-position: -99px -73px; + } - &.jsoneditor-next { - cursor: pointer; - background-position: -124px -73px; + &.jsoneditor-next { + cursor: pointer; + background-position: -124px -73px; - &:hover { - background-position: -124px -49px; - } - } - &.jsoneditor-previous { - cursor: pointer; - background-position: -148px -73px; - margin-right: 2px; + &:hover { + background-position: -124px -49px; + } + } + &.jsoneditor-previous { + cursor: pointer; + background-position: -148px -73px; + margin-right: 2px; - &:hover { - background-position: -148px -49px; - } - } + &:hover { + background-position: -148px -49px; } + } } + } - &-results { - font-family: $jse-font; - color: $jse-white; - padding-right: 5px; - line-height: 26px; - } + &-results { + font-family: $jse-font; + color: $jse-white; + padding-right: 5px; + line-height: 26px; + } - &-frame { - border: 1px solid transparent; - background-color: $jse-white; - padding: 0 2px; - margin: 0; - } + &-frame { + border: 1px solid transparent; + background-color: $jse-white; + padding: 0 2px; + margin: 0; + } } diff --git a/src/scss/jsoneditor/_statusbar.scss b/src/scss/jsoneditor/_statusbar.scss index 1bf8f9af2..302e9f04b 100644 --- a/src/scss/jsoneditor/_statusbar.scss +++ b/src/scss/jsoneditor/_statusbar.scss @@ -1,48 +1,48 @@ .jsoneditor-statusbar { - line-height: 26px; - height: 26px; - color: $jse-readonly; - background-color: $jse-bar-bg; - border-top: 1px solid $jse-bar-border; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - font-size: $jse-font-size; - & > .jsoneditor-curserinfo-val { - margin-right: 12px; - } - & > .jsoneditor-curserinfo-count { - margin-left: 4px; - } - & > .jsoneditor-validation-error-icon { - float: right; - width: 24px; - height: 24px; - padding: 0; - margin-top: 1px; - background: url($jse-icons) -168px -48px; - cursor: pointer; - } - & > .jsoneditor-validation-error-count { - float: right; - margin: 0 4px 0 0; - cursor: pointer; - } - & > .jsoneditor-parse-error-icon { - float: right; - width: 24px; - height: 24px; - padding: 0; - margin: 1px; - background: url($jse-icons) -25px 0px; - } - .jsoneditor-array-info { - a { - color: inherit; - } + line-height: 26px; + height: 26px; + color: $jse-readonly; + background-color: $jse-bar-bg; + border-top: 1px solid $jse-bar-border; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-size: $jse-font-size; + & > .jsoneditor-curserinfo-val { + margin-right: 12px; + } + & > .jsoneditor-curserinfo-count { + margin-left: 4px; + } + & > .jsoneditor-validation-error-icon { + float: right; + width: 24px; + height: 24px; + padding: 0; + margin-top: 1px; + background: url($jse-icons) -168px -48px; + cursor: pointer; + } + & > .jsoneditor-validation-error-count { + float: right; + margin: 0 4px 0 0; + cursor: pointer; + } + & > .jsoneditor-parse-error-icon { + float: right; + width: 24px; + height: 24px; + padding: 0; + margin: 1px; + background: url($jse-icons) -25px 0px; + } + .jsoneditor-array-info { + a { + color: inherit; } + } } div.jsoneditor-statusbar > .jsoneditor-curserinfo-label, div.jsoneditor-statusbar > .jsoneditor-size-info { - margin: 0 4px; + margin: 0 4px; } diff --git a/src/scss/jsoneditor/_treepath.scss b/src/scss/jsoneditor/_treepath.scss index e0ca1f68a..20e35fb27 100644 --- a/src/scss/jsoneditor/_treepath.scss +++ b/src/scss/jsoneditor/_treepath.scss @@ -1,48 +1,48 @@ .jsoneditor-treepath { - padding: 0 5px; - overflow: hidden; - white-space: nowrap; - outline: none; - &.show-all { - word-wrap: break-word; - white-space: normal; - position: absolute; - background-color: $jse-light-bg; - z-index: 1; - box-shadow: $jse-box-shadow; - span { - &.jsoneditor-treepath-show-all-btn { - display: none; - } - } + padding: 0 5px; + overflow: hidden; + white-space: nowrap; + outline: none; + &.show-all { + word-wrap: break-word; + white-space: normal; + position: absolute; + background-color: $jse-light-bg; + z-index: 1; + box-shadow: $jse-box-shadow; + span { + &.jsoneditor-treepath-show-all-btn { + display: none; + } } - div { - &.jsoneditor-contextmenu-root { - position: absolute; - left: 0; - } - } - .jsoneditor-treepath-show-all-btn { - position: absolute; - background-color: $jse-light-bg; - left: 0; - height: 20px; - padding: 0 3px; - cursor: pointer; - } - .jsoneditor-treepath-element { - margin: 1px; - font-family: $jse-font; - font-size: $jse-font-size; - } - .jsoneditor-treepath-seperator { - margin: 2px; - font-size: 9pt; - font-family: $jse-font; + } + div { + &.jsoneditor-contextmenu-root { + position: absolute; + left: 0; } + } + .jsoneditor-treepath-show-all-btn { + position: absolute; + background-color: $jse-light-bg; + left: 0; + height: 20px; + padding: 0 3px; + cursor: pointer; + } + .jsoneditor-treepath-element { + margin: 1px; + font-family: $jse-font; + font-size: $jse-font-size; + } + .jsoneditor-treepath-seperator { + margin: 2px; + font-size: 9pt; + font-family: $jse-font; + } } .jsoneditor-treepath span.jsoneditor-treepath-element:hover, .jsoneditor-treepath span.jsoneditor-treepath-seperator:hover { - cursor: pointer; - text-decoration: underline; + cursor: pointer; + text-decoration: underline; } diff --git a/src/scss/jsoneditor/_variables.scss b/src/scss/jsoneditor/_variables.scss index 9abdafdcd..2fe53a639 100644 --- a/src/scss/jsoneditor/_variables.scss +++ b/src/scss/jsoneditor/_variables.scss @@ -54,7 +54,7 @@ $jse-date: #a1a1a1 !default; $jse-font: arial, sans-serif !default; $jse-font-mono: "dejavu sans mono", "droid sans mono", consolas, monaco, "lucida console", "courier new", courier, - monospace, sans-serif !default; + monospace, sans-serif !default; $jse-font-size: 10pt !default; $jse-icons: "./img/jsoneditor-icons.svg" !default;