jenkins-bot has submitted this change and it was merged. Change subject: Fix cssmin and concat for grunt build ......................................................................
Fix cssmin and concat for grunt build Bug: T136619 Change-Id: If145dd91b3d5cdb35c3b50c1e0a78952340f8c22 --- M Gruntfile.js M index.html 2 files changed, 9 insertions(+), 17 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index f96cc4f..bb0d1e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -53,16 +53,8 @@ dest: 'dist' } }, - concat: { - options: { - separator: ';' - }, - dist: {} - }, - uglify: { - options: {}, - dist: {} - }, + concat: {}, + uglify: {}, copy: { release: { files: [ @@ -79,8 +71,8 @@ expand: true, cwd: './', src: [ - 'vendor/leaflet/**', 'i18n/**', 'vendor/jquery.uls/**', - '*.html', 'logo.svg', 'robots.txt' + 'i18n/**', 'vendor/jquery.uls/**', '*.html', 'logo.svg', + 'robots.txt' ], dest: 'dist' } @@ -119,7 +111,7 @@ 'jshint', 'jscs', 'jsonlint', 'banana', 'qunit' ] ); grunt.registerTask( 'build', [ - 'clean', 'copy', 'useminPrepare', 'cssmin', 'concat', 'uglify', 'filerev', 'usemin' + 'clean', 'copy', 'useminPrepare', 'concat', 'cssmin', 'uglify', 'filerev', 'usemin' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/index.html b/index.html index 0758bf3..5484112 100644 --- a/index.html +++ b/index.html @@ -6,8 +6,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <title>Wikidata Query Service (Beta)</title> + <link rel="stylesheet" href="vendor/jquery.uls/css/jquery.uls.css"> <!-- build:css css/style.min.css --> - <link rel="stylesheet" href="vendor/select2/dist/css/select2.css"> <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-theme.min.css"> <link rel="stylesheet" href="vendor/bootstrap-tags/css/bootstrap-tags.css"> @@ -15,17 +15,17 @@ <link rel="stylesheet" href="vendor/jqcloud/jqcloud.css"> <link rel="stylesheet" href="vendor/codemirror/lib/codemirror.css"> <link rel="stylesheet" href="vendor/codemirror/addon/hint/show-hint.css"> + <link rel="stylesheet" href="vendor/select2/dist/css/select2.css"> <link rel="stylesheet" href="vendor/lightbox/ekko-lightbox.min.css"> <link rel="stylesheet" href="vendor/vis/vis.min.css"> - <link rel="stylesheet" href="style.css"> - <!-- endbuild --> - <link rel="stylesheet" href="vendor/jquery.uls/css/jquery.uls.css"> <link rel="stylesheet" href="vendor/jquery.uls/css/jquery.uls.grid.css"> <link rel="stylesheet" href="vendor/jquery.uls/css/jquery.uls.lcd.css"> <link rel="stylesheet" href="vendor/jquery.uls/css/jquery.uls.mobile.css"> <link rel="stylesheet" href="vendor/leaflet/leaflet.css"> <link rel="stylesheet" href="vendor/leaflet/addon/fullscreen/leaflet.fullscreen.css"> <link rel="stylesheet" href="vendor/leaflet/addon/boxzoom/L.Control.ZoomBox.css"> + <link rel="stylesheet" href="style.css"> + <!-- endbuild --> <link rel="shortcut icon" href="//www.wikidata.org/static/favicon/testwikidata.ico"> <!-- build:js js/shim.min.js --> -- To view, visit https://gerrit.wikimedia.org/r/292107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If145dd91b3d5cdb35c3b50c1e0a78952340f8c22 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de> Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits