diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 9c78c123d..f3810aec7 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -304,7 +304,7 @@ @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; @navbar-border-radius: @border-radius-base; -@navbar-padding-horizontal: floor(@grid-gutter-width / 2); +@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-collapse-max-height: 340px; diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 3bb5c3639..f9feb9b9b 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -106,7 +106,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-json-minify'); grunt.loadNpmTasks('grunt-text-replace'); // grunt.loadNpmTasks('grunt-mocha'); - grunt.loadNpmTasks('grunt-inline'); + // grunt.loadNpmTasks('grunt-inline'); grunt.loadNpmTasks('grunt-svgmin'); grunt.loadNpmTasks('grunt-exec'); @@ -660,7 +660,7 @@ module.exports = function(grunt) { grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']); grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less', - 'requirejs', 'concat', 'copy', 'svgmin', 'inline', 'json-minify', + 'requirejs', 'concat', 'copy', 'svgmin', /*'inline',*/ 'json-minify', 'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']); grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', /*'cssmin',*/ /*'copy:template-backup',*/ diff --git a/build/package.json b/build/package.json index f16bcf600..eb3bf793c 100644 --- a/build/package.json +++ b/build/package.json @@ -6,29 +6,28 @@ "dependencies": { "grunt": "^1.0.0", "grunt-contrib-clean": "^2.0.0", - "grunt-contrib-concat": "^0.5.1", - "grunt-contrib-copy": "^0.8.0", - "grunt-contrib-cssmin": "^3.0.0", - "grunt-contrib-htmlmin": "^2.0.0", - "grunt-contrib-imagemin": "^3.1.0", - "grunt-contrib-less": "^2.0.0", + "grunt-contrib-concat": "^2.0.0", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-cssmin": "^4.0.0", + "grunt-contrib-htmlmin": "^3.1.0", + "grunt-contrib-imagemin": "^4.0.0", + "grunt-contrib-less": "^3.0.0", "grunt-contrib-requirejs": "^1.0.0", - "grunt-contrib-uglify": "^4.0.1", - "grunt-inline": "0.3.4", - "grunt-json-minify": "^1.1.0", - "grunt-spritesmith": "^6.8.0", - "grunt-svgmin": "^6.0.0", - "grunt-text-replace": "0.3.11", - "iconsprite": "file:sprites", - "iconv-lite": "^0.5.1", - "less-plugin-clean-css": "1.5.0", - "lodash": "^4.17.20", + "grunt-contrib-uglify": "^5.0.1", "grunt-exec": "^3.0.0", + "grunt-json-minify": "^1.1.0", + "grunt-spritesmith": "^6.9.0", + "grunt-svgmin": "^6.0.1", + "grunt-text-replace": "0.4.0", + "iconsprite": "file:sprites", + "iconv-lite": "^0.6.3", + "less-plugin-clean-css": "1.5.1", + "lodash": "^4.17.21", "vinyl-fs": "^3.0.3" }, "devDependencies": { "chai": "1.9.1", - "mocha": "^6.2.2", - "grunt-mocha": "^1.0.0" + "grunt-mocha": "^1.0.0", + "mocha": "^9.2.0" } }