Merge branch 'develop'

pull/77/MERGE
13621160019@163.com 2021-10-30 15:24:11 +08:00
commit a9a7c3989f
11 changed files with 19123 additions and 9141 deletions

2
web/gulpfile.js vendored
View File

@ -1,6 +1,6 @@
const gulp = require('gulp'); const gulp = require('gulp');
const plumber = require('gulp-plumber'); const plumber = require('gulp-plumber');
const sass = require('gulp-sass'); const sass = require('gulp-sass')(require('sass'));
const autoprefixer = require('gulp-autoprefixer'); const autoprefixer = require('gulp-autoprefixer');
const rtlcss = require('gulp-rtlcss'); const rtlcss = require('gulp-rtlcss');
const rename = require('gulp-rename'); const rename = require('gulp-rename');

28241
web/package-lock.json generated vendored

File diff suppressed because it is too large Load Diff

7
web/package.json vendored
View File

@ -35,7 +35,7 @@
"leaflet.tilelayer.colorfilter": "^1.2.5", "leaflet.tilelayer.colorfilter": "^1.2.5",
"lodash": "^4.17.20", "lodash": "^4.17.20",
"moment": "^2.28.0", "moment": "^2.28.0",
"node-sass": "^4.14.1", "node-sass": "^6.0.1",
"plyr": "^3.6.2", "plyr": "^3.6.2",
"prism-react-renderer": "^0.1.7", "prism-react-renderer": "^0.1.7",
"prism-themes": "^1.4.0", "prism-themes": "^1.4.0",
@ -97,8 +97,9 @@
"gulp-plumber": "^1.2.1", "gulp-plumber": "^1.2.1",
"gulp-rename": "^1.4.0", "gulp-rename": "^1.4.0",
"gulp-rtlcss": "^1.4.1", "gulp-rtlcss": "^1.4.1",
"gulp-sass": "^4.1.0", "gulp-sass": "^5.0.0",
"gulp-sourcemaps": "^2.6.5", "gulp-sourcemaps": "^2.6.5",
"prettier": "1.17.1" "prettier": "1.17.1",
"sass": "^1.43.4"
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long