diff --git a/.gitignore b/.gitignore
index ad28d89..9a1d2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.sass-cache/*
\ No newline at end of file
+.sass-cache/*
+node_modules
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..acd0cd0
--- /dev/null
+++ b/Gruntfile.js
@@ -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']);
+
+};
\ No newline at end of file
diff --git a/README.md b/README.md
index 858770d..04303e7 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,24 @@ Either clone this repository and drop in manually, or install from bower:
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
-* 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.
## Contributers
diff --git a/component.json b/component.json
index 0946c4d..4e5e9dc 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "Skeleton-SCSS",
- "version": "1.0.0",
+ "version": "1.0.1",
"main": "css/skeleton.css",
"ignore": [
"**/.*",
diff --git a/css/skeleton.css b/css/skeleton.css
index fcda9fd..eff5121 100644
--- a/css/skeleton.css
+++ b/css/skeleton.css
@@ -1,6 +1,6 @@
/*
-* Skeleton V1.2
-* Copyright 2011, Dave Gamache
+* Skeleton SCSS V1.0
+* Skeleton is Copyright 2011, Dave Gamache
*
* SCSS Conversion and Mixins by Nick Pack
*
@@ -74,7 +74,7 @@ body {
margin-right: 10px; }
.column.alpha, .columns.alpha {
margin-left: 0; }
- .column.omerga, .columns.omerga {
+ .column.omega, .columns.omega {
margin-right: 0; }
.row {
diff --git a/css/skeleton.min.css b/css/skeleton.min.css
new file mode 100644
index 0000000..024d6e9
--- /dev/null
+++ b/css/skeleton.min.css
@@ -0,0 +1,2 @@
+/* Skeleton-SCSS 1.0.0 17-05-2013 */
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.remove-bottom{margin-bottom:0!important}.half-bottom{margin-bottom:10px!important}.add-bottom{margin-bottom:20px!important}body{background:#fff;font:14px/21px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#444;-webkit-text-size-adjust:100%}.container{position:relative;margin:0 auto;padding:0}.column,.columns{float:left;display:inline;margin-left:10px;margin-right:10px}.column.alpha,.columns.alpha{margin-left:0}.column.omega,.columns.omega{margin-right:0}.row{margin-bottom:20px}.container{width:960px}.container .columns.one,.container .column.one{width:40px}.container .columns.two,.container .column.two{width:100px}.container .columns.three,.container .column.three{width:160px}.container .columns.four,.container .column.four{width:220px}.container .columns.five,.container .column.five{width:280px}.container .columns.six,.container .column.six{width:340px}.container .columns.seven,.container .column.seven{width:400px}.container .columns.eight,.container .column.eight{width:460px}.container .columns.nine,.container .column.nine{width:520px}.container .columns.ten,.container .column.ten{width:580px}.container .columns.eleven,.container .column.eleven{width:640px}.container .columns.twelve,.container .column.twelve{width:700px}.container .columns.thirteen,.container .column.thirteen{width:760px}.container .columns.fourteen,.container .column.fourteen{width:820px}.container .columns.fifteen,.container .column.fifteen{width:880px}.container .columns.sixteen,.container .column.sixteen{width:940px}.container .columns.one-third,.container .column.one-third{width:300px}.container .columns.two-thirds,.container .column.two-thirds{width:620px}.container .offset-by-one{padding-left:60px}.container .offset-by-two{padding-left:120px}.container .offset-by-three{padding-left:180px}.container .offset-by-four{padding-left:240px}.container .offset-by-five{padding-left:300px}.container .offset-by-six{padding-left:360px}.container .offset-by-seven{padding-left:420px}.container .offset-by-eight{padding-left:480px}.container .offset-by-nine{padding-left:540px}.container .offset-by-ten{padding-left:600px}.container .offset-by-eleven{padding-left:660px}.container .offset-by-twelve{padding-left:720px}.container .offset-by-thirteen{padding-left:780px}.container .offset-by-fourteen{padding-left:840px}.container .offset-by-fifteen{padding-left:900px}@media only screen and (max-width:959px){.container{width:768px}.container .columns.one,.container .column.one{width:28px}.container .columns.two,.container .column.two{width:76px}.container .columns.three,.container .column.three{width:124px}.container .columns.four,.container .column.four{width:172px}.container .columns.five,.container .column.five{width:220px}.container .columns.six,.container .column.six{width:268px}.container .columns.seven,.container .column.seven{width:316px}.container .columns.eight,.container .column.eight{width:364px}.container .columns.nine,.container .column.nine{width:412px}.container .columns.ten,.container .column.ten{width:460px}.container .columns.eleven,.container .column.eleven{width:508px}.container .columns.twelve,.container .column.twelve{width:556px}.container .columns.thirteen,.container .column.thirteen{width:604px}.container .columns.fourteen,.container .column.fourteen{width:652px}.container .columns.fifteen,.container .column.fifteen{width:700px}.container .columns.sixteen,.container .column.sixteen{width:748px}.container .columns.one-third,.container .column.one-third{width:236px}.container .columns.two-thirds,.container .column.two-thirds{width:492px}.container .offset-by-one{padding-left:48px}.container .offset-by-two{padding-left:96px}.container .offset-by-three{padding-left:144px}.container .offset-by-four{padding-left:192px}.container .offset-by-five{padding-left:240px}.container .offset-by-six{padding-left:288px}.container .offset-by-seven{padding-left:336px}.container .offset-by-eight{padding-left:384px}.container .offset-by-nine{padding-left:432px}.container .offset-by-ten{padding-left:480px}.container .offset-by-eleven{padding-left:528px}.container .offset-by-twelve{padding-left:576px}.container .offset-by-thirteen{padding-left:624px}.container .offset-by-fourteen{padding-left:672px}.container .offset-by-fifteen{padding-left:720px}.container{width:768px}.column.alpha,.columns.alpha{margin-right:10px}.column.omega,.columns.omega{margin-left:10px}.alpha.omega{margin-right:0;margin-left:0}}@media only screen and (max-width:767px){.container{width:90%}.container .column,.container .columns{margin:0}.container .column.one,.container .column.two,.container .column.three,.container .column.four,.container .column.five,.container .column.six,.container .column.seven,.container .column.eight,.container .column.nine,.container .column.ten,.container .column.eleven,.container .column.twelve,.container .column.thirteen,.container .column.fourteen,.container .column.fifteen,.container .column.sixteen,.container .column.one-third,.container .column.two-thirds,.container .columns.one,.container .columns.two,.container .columns.three,.container .columns.four,.container .columns.five,.container .columns.six,.container .columns.seven,.container .columns.eight,.container .columns.nine,.container .columns.ten,.container .columns.eleven,.container .columns.twelve,.container .columns.thirteen,.container .columns.fourteen,.container .columns.fifteen,.container .columns.sixteen,.container .columns.one-third,.container .columns.two-thirds{width:100%}.container .offset-by-one,.container .offset-by-two,.container .offset-by-three,.container .offset-by-four,.container .offset-by-five,.container .offset-by-six,.container .offset-by-seven,.container .offset-by-eight,.container .offset-by-nine,.container .offset-by-ten,.container .offset-by-eleven,.container .offset-by-twelve,.container .offset-by-thirteen,.container .offset-by-fourteen,.container .offset-by-fifteen{padding-left:0}}.container:after{content:"\0020";display:block;height:0;clear:both;visibility:hidden}.clearfix:before,.clearfix:after,.row:before,.row:after{content:'\0020';display:block;overflow:hidden;visibility:hidden;width:0;height:0}.row:after,.clearfix:after{clear:both}.row,.clearfix{zoom:1}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}h1,h2,h3,h4,h5,h6{color:#181818;font-family:Georgia,"Times New Roman",serif;font-weight:400}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{font-weight:inherit}h1{font-size:46px;line-height:50px;margin:0 0 14px}h2{font-size:35px;line-height:40px;margin:0 0 10px}h3{font-size:28px;line-height:34px;margin:0 0 8px}h4{font-size:21px;line-height:30px;margin:0 0 4px}h5{font-size:17px;line-height:24px}h6{font-size:14px;line-height:21px}.subheader{color:#777}p{margin:0 0 20px}p img{margin:0}p.lead{font-size:21px;line-height:27px;color:#777}em{font-style:italic}strong{font-weight:700;color:#333}small{font-size:80%}blockquote,blockquote p{font-size:17px;line-height:24px;color:#777;font-style:italic}blockquote{margin:0 0 20px;padding:9px 20px 0 19px;border-left:1px solid #ddd}blockquote cite{display:block;font-size:12px;color:#555}blockquote cite:before{content:"\2014 \0020"}blockquote cite a,blockquote cite a:visited,blockquote cite a:visited{color:#555}hr{border:solid #ddd;border-width:1px 0 0;clear:both;margin:10px 0 30px;height:0}a,a:visited{color:#333;text-decoration:underline;outline:0}a:hover,a:focus{color:#000;text-decoration:none}p a,p a:visited{line-height:inherit}ul,ol{margin:0 0 20px}ul{list-style:none outside}ol{list-style:decimal}ol,ul.square,ul.circle,ul.disc{margin:0 0 0 30px}ul.square{list-style:square outside}ul.circle{list-style:circle outside}ul.disc{list-style:disc outside}ul ul,ul ol,ol ol,ol ul{margin:4px 0 5px 30px;font-size:90%}li{line-height:18px;margin:0 0 12px}ul.large li{line-height:21px}li p{line-height:21px}.button,button,input[type=submit],input[type=reset],input[type=button]{background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #aaa;border-top:1px solid #ccc;border-left:1px solid #ccc;border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;color:#444;display:inline-block;font-size:11px;font-weight:700;text-decoration:none;text-shadow:0 1px rgba(255,255,255,.75);cursor:pointer;margin:0 0 20px;line-height:normal;padding:8px 10px;font-family:HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif}.button:hover,button:hover,input[type=submit]:hover,input[type=reset]:hover,input[type=button]:hover{background-color:rgba(153,153,153,.3);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.3)),to(rgba(0,0,0,.3)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-moz-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:-o-linear-gradient(top,rgba(255,255,255,.3),rgba(0,0,0,.3));background-image:linear-gradient(to bottom,rgba(255,255,255,.3),rgba(0,0,0,.3));background-repeat:repeat-x;color:#222;border:1px solid #888;border-top:1px solid #aaa;border-left:1px solid #aaa}.button:active,button:active,input[type=submit]:active,input[type=reset]:active,input[type=button]:active{background-color:rgba(153,153,153,.2);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.2)),to(rgba(0,0,0,.2)));background-image:-webkit-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-moz-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:-o-linear-gradient(top,rgba(255,255,255,.2),rgba(0,0,0,.2));background-image:linear-gradient(to bottom,rgba(255,255,255,.2),rgba(0,0,0,.2));background-repeat:repeat-x;border:1px solid #666}.button.full-width,button.full-width,input[type=submit].full-width,input[type=reset].full-width,input[type=button].full-width{width:100%;padding-left:0!important;padding-right:0!important;text-align:center}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}form{margin:0 0 20px}fieldset{margin:0 0 20px}input[type=search],input[type=url]{-webkit-appearance:textfield;-moz-appearance:textfield}input[type=text],input[type=password],input[type=email],input[type=search],input[type=url],input[type=number],input[type=tel],textarea,select{border:1px solid #ccc;padding:6px 4px;outline:0;border-radius:2px;-webkit-border-radius:2px;-moz-border-radius:2px;font:13px HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#777;width:210px;max-width:100%;display:block;margin:0 0 20px;background:#fff}select{padding:0}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=search]:focus,input[type=url]:focus,input[type=number]:focus,input[type=tel]:focus,textarea:focus{border:1px solid #aaa;color:#444;-moz-box-shadow:0 0 3px rgba(0,0,0,.2);-webkit-box-shadow:0 0 3px rgba(0,0,0,.2);box-shadow:0 0 3px rgba(0,0,0,.2)}textarea{min-height:60px}label,legend{display:block;font-weight:700;font-size:13px}select{width:220px}input[type=checkbox]{display:inline}label span,legend span{font-weight:400;font-size:13px;color:#444}img.scale-with-grid{max-width:100%;height:auto}
\ No newline at end of file
diff --git a/index.html b/index.html
index 140e54b..47cf571 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
-
+