diff --git a/app/package-lock.json b/app/package-lock.json index c4b4966a16..8720d18275 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -6601,51 +6601,6 @@ "tslint": "^5.20.1", "webpack": "^4.0.0", "yorkie": "^2.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", - "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - } - }, - "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", - "dev": true, - "optional": true, - "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" - } - } } }, "@vue/cli-plugin-unit-jest": { @@ -6785,17 +6740,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -6879,18 +6823,6 @@ "graceful-fs": "^4.1.6" } }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -7004,18 +6936,6 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", - "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -11744,6 +11664,51 @@ } } }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", + "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, + "optional": true, + "requires": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + } + } + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -20377,6 +20342,43 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.8", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", + "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "vue-router": { "version": "3.4.6", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.6.tgz", diff --git a/app/src/interfaces/wysiwyg/tinymce-overrides.css b/app/src/interfaces/wysiwyg/tinymce-overrides.css index 716e9a1276..30665e7434 100644 --- a/app/src/interfaces/wysiwyg/tinymce-overrides.css +++ b/app/src/interfaces/wysiwyg/tinymce-overrides.css @@ -9,7 +9,17 @@ color: var(--foreground-normal); } -.tox .tox-tbtn svg { +.tox .tox-listbox__select-chevron svg, +.tox .tox-collection__item-caret svg { + fill: var(--foreground-normal); +} + +.tox .tox-swatches__picker-btn svg { + fill: var(--foreground-normal); +} + +.tox .tox-tbtn svg, +.tox .tox-tbtn:hover svg { fill: var(--foreground-normal); } @@ -97,6 +107,10 @@ left 0 top 0 var(--background-subdued); } +.tox .tox-pop__dialog .tox-toolbar { + margin-bottom: -2px; +} + body.dark .tox .tox-toolbar, body.dark .tox .tox-toolbar__primary, body.dark .tox .tox-toolbar__overflow { @@ -113,13 +127,34 @@ body.dark .tox .tox-toolbar__overflow { } } +.tox .tox-swatches__picker-btn, +.tox .tox-swatches__picker-btn:hover, +.tox .tox-swatches__picker-btn:active, +.tox .tox-split-button:hover { + -webkit-box-shadow: unset; + box-shadow: unset; +} + .tox .tox-tbtn--enabled, .tox .tox-tbtn--enabled:hover, -.tox .tox-tbtn:hover { +.tox .tox-split-button:hover, +.tox .tox-tbtn:hover, +.tox .tox-split-button:focus { color: var(--foreground-normal); background: var(--border-normal); } +.tox .tox-swatches__picker-btn:hover { + background: transparent; + border: none; +} + +.tox .tox-swatch:hover, +.tox .tox-swatch:focus { + -webkit-transform: scale(1.2); + transform: scale(1.2); +} + .mce-content-body { margin: 20px; } @@ -206,20 +241,16 @@ body.dark .tox .tox-toolbar__overflow { color: var(--foreground-normal); } +.tox .tox-collection--list .tox-collection__item--enabled, .tox .tox-collection--list .tox-collection__item--active { color: var(--foreground-normal) !important; - background-color: var(--background-page) !important; -} - -.tox .tox-collection--list .tox-collection__item--enabled { - color: var(--foreground-normal); - background-color: var(--background-page); + background-color: var(--background-normal-alt) !important; } .tox .tox-textfield:focus, .tox .tox-selectfield select:focus, .tox .tox-textarea:focus { - border-color: var(--foreground-subdued); + border-color: var(--primary); } .tox .tox-button { @@ -314,8 +345,39 @@ body.dark .tox .tox-toolbar__overflow { background-color: var(--background-normal-alt); } +.tox .tox-pop__dialog, +.tox:not([dir='rtl']) .tox-toolbar__group:not(:last-of-type), +.tox .tox-collection--list .tox-collection__group { + border-color: var(--border-normal); +} + + +.tox .tox-insert-table-picker__label { + color: var(--foreground-normal); +} + +.tox .tox-insert-table-picker > div { + border-color: var(--border-normal); +} + +.tox .tox-insert-table-picker .tox-insert-table-picker__selected { + border-color: var(--primary); +} + +.tox .tox-pop.tox-pop--top::after { + border-bottom-color: var(--background-subdued); +} + +.tox .tox-pop.tox-pop--top::before { + border-bottom-color: var(--border-normal); +} + +.tox .tox-dialog-wrap__backdrop .tox-rgba-preview { + visibility: hidden; +} + @media screen and (max-width: 767px) { .tox .tox-dialog__body-nav-item { text-align: center; } -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 2bcc1aa84e..008b35c12c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15912,6 +15912,7 @@ "lodash": "^4.17.19", "macos-release": "^2.4.1", "memcached": "^2.2.2", + "mime-types": "^2.1.27", "ms": "^2.1.2", "mssql": "^6.2.0", "mysql": "^2.18.1", @@ -15925,6 +15926,7 @@ "pg": "^8.4.1", "pino": "^6.4.1", "pino-colada": "^2.1.0", + "qs": "^6.9.4", "rate-limiter-flexible": "^2.1.10", "resolve-cwd": "^3.0.0", "sharp": "^0.25.4", @@ -15987,6 +15989,11 @@ "integrity": "sha512-64/bYByMrhWULUaCd+6/72c9PMWhiVFs3EVxl9Ct6a3v/U8+rKgqP2w+kKg/BIGgMJyB+Bk/eNivT32Al+Jghw==", "optional": true }, + "qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" + }, "uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",