Skip to content

Commit

Permalink
Design system v2
Browse files Browse the repository at this point in the history
Change infographic color c
Fix module versions including linter and jeet
Imporve build error handling
Version bump
  • Loading branch information
danielfdsilva committed Nov 3, 2016
1 parent 2866d5d commit c238d28
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"react"
],
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"jsx": true
}
Expand Down
6 changes: 3 additions & 3 deletions assets/styles/openaq-design-system/settings/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ $base-semi-alpha-color: rgba($base-color, 0.08);

/* Infographic colors */

$infographic-color-a: #F8B400;
$infographic-color-a: #A65890;
$infographic-color-b: #F8634E;
$infographic-color-c: #A65890;
$infographic-color-c: #968AD3;


/* Typography
Expand Down Expand Up @@ -85,4 +85,4 @@ $medium-range: (768px, 991px);
$large-range: (992px, 1199px);
$xlarge-range: (1200px);

$screen: "only screen";
$screen: "only screen";
12 changes: 12 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var OPENAQ_ADDONS = require('./gulp-addons');

// The package.json
var pkg;
var prodBuild = false;

// /////////////////////////////////////////////////////////////////////////////
// ------------------------- Helper functions --------------------------------//
Expand All @@ -38,6 +39,11 @@ readPackage();
// ------------------------- Callable tasks ----------------------------------//
// ---------------------------------------------------------------------------//

gulp.task('default', ['clean'], function () {
prodBuild = true;
gulp.start('build');
});

gulp.task('serve', ['vendorScripts', 'javascript', 'styles'], function () {
browserSync({
port: 3000,
Expand Down Expand Up @@ -99,6 +105,9 @@ gulp.task('javascript', function () {
message: e.message
});
console.log('Javascript error:', e);
if (prodBuild) {
process.exit(1);
}
// Allows the watch to continue.
this.emit('end');
})
Expand Down Expand Up @@ -183,6 +192,9 @@ gulp.task('styles', function () {
message: e.message
});
console.log('Sass error:', e.toString());
if (prodBuild) {
process.exit(1);
}
// Allows the watch to continue.
this.emit('end');
}))
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openaq-design-system",
"version": "1.0.0",
"version": "2.0.0",
"description": "OpenAQ Design System",
"repository": {
"type": "git",
Expand Down Expand Up @@ -48,10 +48,10 @@
"collecticons-processor": "^2.0.0",
"del": "^2.2.0",
"envify": "^3.4.0",
"eslint": "^2.7.0",
"eslint-config-standard": "^5.1.0",
"eslint-plugin-promise": "^1.1.0",
"eslint-plugin-react": "^3.16.1",
"eslint": "^3.0.1",
"eslint-config-standard": "^6.0.0-beta",
"eslint-plugin-promise": "^3.3.0",
"eslint-plugin-react": "^5.2.2",
"eslint-plugin-standard": "^2.0.0",
"gulp": "^3.9.1",
"gulp-cache": "^0.4.2",
Expand All @@ -69,7 +69,7 @@
"gulp-uglify": "^1.5.4",
"gulp-useref": "^3.1.0",
"gulp-util": "^3.0.7",
"jeet": "^6.1.2",
"jeet": "6.1.4",
"node-bourbon": "^4.2.3",
"node-notifier": "^4.5.0",
"require-globify": "^1.3.0",
Expand Down

0 comments on commit c238d28

Please sign in to comment.