Skip to content

Commit

Permalink
Merge pull request #3 from joeleisner/release/3.0.2
Browse files Browse the repository at this point in the history
Release 3.0.2
  • Loading branch information
joeleisner committed Feb 3, 2017
2 parents 03876f1 + 4db0b92 commit 3465dc5
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 76 deletions.
3 changes: 3 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"esversion": 6
}
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
.git/
.gitignore
.jshintrc
.sass-cache/
gulp/
gulpfile.js
Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [Version 3.0.2](https://github.com/joeleisner/chassis-css/releases/tag/v3.0.2)
Even more minor fixes and improvements:
* Proper styling for nested columns!
* Nested rows now remove left/right padding, keeping your content aligned and visually cohesive
* All build-system javascript has been upgraded to ES2015 (ES6)
* Gulp task names have been simplified
* The following packages were upgraded: `autoprefixer`, `cssnano`, and `gulp-postcss`

## [Version 3.0.1](https://github.com/joeleisner/chassis-css/releases/tag/v3.0.1)
Minor fixes and improvements:
* A more verbose CSS reset within its own SASS partial
Expand Down
4 changes: 2 additions & 2 deletions gulp/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var autoprefixer = require('autoprefixer'),
cssnano = require('cssnano');
let autoprefixer = require('autoprefixer'),
cssnano = require('cssnano');

module.exports = {
autoprefixer: [autoprefixer({browsers:['last 2 versions']})],
Expand Down
35 changes: 17 additions & 18 deletions gulp/header.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
var header = require('gulp-header'),
pkg = require('../package.json');
let header = require('gulp-header'),
pkg = require('../package.json');

module.exports = function(min) {
var bannerExp = [
'/**',
' * <%= pkg.name %> - <%= pkg.description %>',
' * @version <%= pkg.version %>',
' * @author <%= pkg.author %>',
' * @link <%= pkg.homepage %>',
' * @license <%= pkg.license %>',
' */',
'',
''
].join('\n');
var bannerMin = [
'/* <%= pkg.name %> <%= pkg.version %> | <%= pkg.license %> | <%= pkg.homepage %> */',
''
].join('\n');
return min ? header(bannerMin, {pkg:pkg}) : header(bannerExp, {pkg:pkg});
let bannerExp =
`/**
* <%= pkg.name %> - <%= pkg.description %>
* @version <%= pkg.version %>
* @author <%= pkg.author %>
* @link <%= pkg.homepage %>
* @license <%= pkg.license %>
*/
`,
bannerMin =
`/* <%= pkg.name %> <%= pkg.version %> | <%= pkg.license %> | <%= pkg.homepage %> */
`;
return min ? header(bannerMin, {pkg}) : header(bannerExp, {pkg});
};
33 changes: 16 additions & 17 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
// Require
var config = require('./gulp/config.js'),
filter = require('gulp-filter'),
gulp = require('gulp'),
header = require('./gulp/header.js'),
let config = require('./gulp/config.js'),
filter = require('gulp-filter'),
gulp = require('gulp'),
header = require('./gulp/header.js'),
postcss = require('gulp-postcss'),
rename = require('gulp-rename'),
sass = require('gulp-sass');
rename = require('gulp-rename'),
sass = require('gulp-sass');

// Default Task
// Default
gulp.task('default', ['watch']);

// Watch Task
gulp.task('watch', function() {
// Watch
gulp.task('watch', () => {
gulp.watch(config.watch, ['build']);
});

// Build Task
gulp.task('build', ['compile-sass', 'package-sass']);
// Build
gulp.task('build', ['compile', 'package']);

// Compile SASS
gulp.task('compile-sass', function() {
// Compile
gulp.task('compile', () => {
return gulp.src(config.src)
.pipe(sass().on('error', sass.logError)) // Input
.pipe(postcss(config.autoprefixer)) // Autoprefixer
Expand All @@ -31,9 +30,9 @@ gulp.task('compile-sass', function() {
.pipe(gulp.dest(config.dest.css)); // Minified Ouput
});

// Package SASS
gulp.task('package-sass', function() {
var f = filter(['src/chassis.sass'],{restore:true}); // Filter Parameters
// Package
gulp.task('package', () => {
let f = filter(['src/chassis.sass'],{restore:true}); // Filter Parameters
return gulp.src(config.watch) // Input
.pipe(f) // Filter
.pipe(rename({prefix:'_'})) // Rename
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chassis-css",
"version": "3.0.1",
"version": "3.0.2",
"description": "The minimalistic grid & typography framework by Joel Eisner",
"keywords": [
"css",
Expand All @@ -13,12 +13,12 @@
"author": "Joel Eisner <jeisner93@gmail.com>",
"license": "MIT",
"devDependencies": {
"autoprefixer": "^6.4.1",
"cssnano": "^3.7.4",
"autoprefixer": "^6.7.2",
"cssnano": "^3.10.0",
"gulp": "^3.9.1",
"gulp-filter": "^4.0.0",
"gulp-header": "^1.8.8",
"gulp-postcss": "^6.1.0",
"gulp-postcss": "^6.3.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.3.1"
}
Expand Down
11 changes: 9 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Check out the comprehensive guide and example at http://www.joeleisner.com/chass

## Changelog

## [Version 3.0.2](https://github.com/joeleisner/chassis-css/releases/tag/v3.0.2)
Even more minor fixes and improvements:
* Proper styling for nested columns!
* Nested rows now remove left/right padding, keeping your content aligned and visually cohesive
* All build-system javascript has been upgraded to ES2015 (ES6)
* The following packages were upgraded: `autoprefixer`, `cssnano`, and `gulp-postcss`

### [Version 3.0.1](https://github.com/joeleisner/chassis-css/releases/tag/v3.0.1)
Minor fixes and improvements:
* A more verbose CSS reset within its own SASS partial
Expand Down Expand Up @@ -50,11 +57,11 @@ $ gulp build
```
#### CSS
```
$ gulp compile-sass
$ gulp compile
```
#### SASS
```
$ gulp package-sass
$ gulp package
```

## Author
Expand Down
10 changes: 10 additions & 0 deletions src/partials/_grid.sass
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@
float: left
box-sizing: border-box
padding: $spacing+px ($spacing * 2)+px
.row
width: auto
margin-left: -30px
margin-right: -30px

=grid--sm()
.container
width: $container-sm-width
[class*='col-']
padding: 10px
.row
margin-left: -10px
margin-right: -10px
+grid-generate()

=grid--md()
Expand All @@ -33,3 +40,6 @@
width: $container-lg-width
[class*='col-']
padding: $spacing+px
.row
margin-left: -15px
margin-right: -15px

0 comments on commit 3465dc5

Please sign in to comment.