Merge branch 'feature/grunt' into develop

This commit is contained in:
Nick Pack 2013-05-17 11:21:02 +01:00
commit 85a07ded62
7 changed files with 107 additions and 6 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
.sass-cache/* .sass-cache/*
node_modules

46
Gruntfile.js Normal file
View File

@ -0,0 +1,46 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
// CSS
sass: {
dist: {
files: {
'css/skeleton.css': 'scss/skeleton.scss',
}
}
},
csslint: {
scssoutput: {
options: {
import: false
},
src: ['css/skeleton.css']
}
},
cssmin: {
compress: {
options: {
banner: '/* <%= pkg.name %> <%= pkg.version %> <%= grunt.template.today("dd-mm-yyyy") %> */'
},
files: {
'css/skeleton.min.css': 'css/skeleton.css'
}
},
},
watch: {
files: 'scss/**/*',
tasks: ['sass', 'csslint', 'cssmin']
}
});
grunt.loadNpmTasks('grunt-contrib-csslint');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.registerTask('lint', ['sass', 'csslint']);
grunt.registerTask('minify', ['cssmin']);
grunt.registerTask('build', ['sass', 'cssmin']);
};

View File

@ -14,8 +14,24 @@ Either clone this repository and drop in manually, or install from bower:
bower install --save Skeleton-SCSS bower install --save Skeleton-SCSS
``` ```
## Building
I've added grunt configuration to the repository for those of you that use it.
There are 4 main tasks added:
* build - Runs Sass to create the stylesheet from the source files, places the output in ./css then creates a minified version of the file and places it into the same directory
* lint - This runs CSSLint over the output CSS file (Note that there are a few bits in skeleton that I need to fix!)
* minify - This literally just runs cssmin, useful if you've edited skeleton.css directly
* watch - This will monitor the scss directory for changes and automatically rebuild the css and minified css (Effectively the same as sass --watch but with added minification)
### To get started with the grunt tools
You need to npm install grunt-cli to start with, otherwise you wont have a runner!
Then following that, from the root dir of this project, run `npm install` which will set up all of the required dependencies.
You should be good to go.
## Changelog ## Changelog
* Apr 23, 2013 - Skeleton SCSS v1.0 - Additional variable conversions and bower submission. * May 17, 2013 - (v1.0.1) Added grunt build tools
* Apr 23, 2013 - (v1.0.0) Skeleton SCSS v1.0 - Additional variable conversions, changes based on feedback to the original project and bower submission.
* Jan 31, 2013 - Completed SCSS conversion of Skeleton 1.2. * Jan 31, 2013 - Completed SCSS conversion of Skeleton 1.2.
## Contributers ## Contributers

6
css/skeleton.css vendored
View File

@ -1,6 +1,6 @@
/* /*
* Skeleton V1.2 * Skeleton SCSS V1.0
* Copyright 2011, Dave Gamache * Skeleton is Copyright 2011, Dave Gamache
* *
* SCSS Conversion and Mixins by Nick Pack * SCSS Conversion and Mixins by Nick Pack
* *
@ -74,7 +74,7 @@ body {
margin-right: 10px; } margin-right: 10px; }
.column.alpha, .columns.alpha { .column.alpha, .columns.alpha {
margin-left: 0; } margin-left: 0; }
.column.omerga, .columns.omerga { .column.omega, .columns.omega {
margin-right: 0; } margin-right: 0; }
.row { .row {

2
css/skeleton.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -18,7 +18,7 @@
<!-- CSS <!-- CSS
================================================== --> ================================================== -->
<link rel="stylesheet" href="css/skeleton.css"> <link rel="stylesheet" href="css/skeleton.min.css">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

36
package.json Normal file
View File

@ -0,0 +1,36 @@
{
"name": "Skeleton-SCSS",
"title": "Skeleton SCSS",
"description": "Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
"version": "1.0.0",
"homepage": "https://github.com/nickpack/Skeleton-SCSS",
"author": {
"name": "Nick Pack",
"email": "nick@nickpack.com",
"url": "http://0xdeadfa11.net"
},
"repository": {
"type": "git",
"url": "git@github.com:nickpack/Skeleton-SCSS.git"
},
"bugs": {
"url": "https://github.com/nickpack/Skeleton-SCSS/issues"
},
"licenses": [
{
"type": "MIT",
"url": "https://github.com/nickpack/Skeleton-SCSS/blob/master/LICENSE-MIT"
}
],
"main": "./index",
"keywords": [
"static"
],
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-watch": "~0.3.1",
"grunt-contrib-sass": "~0.3.0",
"grunt-contrib-csslint": "~0.1.1",
"grunt-contrib-cssmin": "~0.5.0"
}
}