Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314348
Change subject: Clean up gulp build and fab deploy
......................................................................
Clean up gulp build and fab deploy
Change-Id: I2907b20b034e88c8b8957a5a2124d238c84a3585
---
M fabfile.py
M gulpfile.js
M package.json
M src/layouts/compare/index.html
4 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/48/314348/1
diff --git a/fabfile.py b/fabfile.py
index c896cbd..802a5f0 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -172,7 +172,7 @@
# Also transfer shared resources to the root of the dashboard
# (This setup may change later)
- put('{}/fonts'.format(source), root, use_sudo=True)
+ put('{}/themes'.format(source), root, use_sudo=True)
@task
diff --git a/gulpfile.js b/gulpfile.js
index 6a8f4de..f664c45 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,7 +15,7 @@
rjs = require('gulp-requirejs-bundler'),
uglify = require('gulp-uglify'),
concat = require('gulp-concat'),
- minifyCSS = require('gulp-minify-css'),
+ minifyCSS = require('gulp-clean-css'),
htmlreplace = require('gulp-html-replace'),
jshint = require('gulp-jshint');
@@ -199,7 +199,7 @@
gulp.task('css', ['clean'], function () {
return gulp.src(layout.cssSources)
- .pipe(minifyCSS())
+ .pipe(minifyCSS({processImportFrom: ['!fonts.googleapis.com']}))
.pipe(concat('styles.css'))
.pipe(gulp.dest(layout.destPath));
});
diff --git a/package.json b/package.json
index 6f811f9..fce3573 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "dashiki",
"version": "0.0.0",
"devDependencies": {
- "pageviews": "~1.1.0",
"chalk": "~0.4.0",
"cheerio": "^0.19.0",
"deeply": "~0.1.0",
@@ -10,10 +9,10 @@
"event-stream": "~3.1.0",
"git-rev-sync": "^1.0.0",
"gulp": "^3.8.5",
+ "gulp-clean-css": "^2.0.13",
"gulp-concat": "~2.2.0",
"gulp-html-replace": "~1.0.0",
"gulp-jshint": "~1.8.0",
- "gulp-minify-css": "^1.0.0",
"gulp-rename": "~1.2.0",
"gulp-replace": "~0.4.0",
"gulp-requirejs-bundler": "^0.1.1",
@@ -26,6 +25,7 @@
"karma-requireglobal-preprocessor": "0.0.0",
"karma-requirejs": "^0.2.1",
"karma-sinon": "^1.0.3",
+ "pageviews": "~1.1.0",
"requirejs": "^2.1.11",
"sinon": "^1.10.3",
"yargs": "^3.7.2"
diff --git a/src/layouts/compare/index.html b/src/layouts/compare/index.html
index 4a1064f..3fb78b0 100644
--- a/src/layouts/compare/index.html
+++ b/src/layouts/compare/index.html
@@ -13,16 +13,10 @@
<title>Compare</title>
<!-- endbuild -->
- <link rel="stylesheet" type="text/css"
href="//fonts.googleapis.com/css?family=Open+Sans:400,600">
-
<section class="minify">
<!-- build:css -->
<!-- always pick and choose semantic ui components, full build
includes things like chatrooms! -->
<!-- we have symlinked the modules used from bower_modules into style
directory -->
- <!-- note: semantic < 1.0 docs available here for convenience:
- http://legacy.semantic-ui.com/
- (later versions of semantic have breaking changes)
- -->
<link href="/src/css/semantic2.reset.css" rel="stylesheet">
<link href="/src/css/semantic2.site.css" rel="stylesheet">
--
To view, visit https://gerrit.wikimedia.org/r/314348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2907b20b034e88c8b8957a5a2124d238c84a3585
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
