Separating files for simpler deep integration; Adding Sketch 2 templa…

…te file; Renaming internal functions

Gruntfile.js

@@ -14,16 +14,33 @@ module.exports = function(grunt) {
 		},
 		// LESS
 		less: {
-			target: {
+			main: {
+				files: {
+					'<%= pkg.codename %>.css': 'src/<%= pkg.codename %>.less',
+					'<%= pkg.codename %>.ie.css': 'src/<%= pkg.codename %>.ie.less'
+				}
+			},
+			min: {
 				options: {
 					report: 'min',
-					cleancss: false
+					cleancss: true
 				},
 				files: {
-					'<%= pkg.codename %>.css': [ 'src/<%= pkg.codename %>.less' ],
-					'<%= pkg.codename %>-ie.css': [ 'src/<%= pkg.codename %>-ie.less' ]
+					'<%= pkg.codename %>.min.css': 'src/<%= pkg.codename %>.less',
+					'<%= pkg.codename %>.ie.min.css': 'src/<%= pkg.codename %>.ie.less'
 				}
 			}
+
+
+		},
+		// Auto Prefixer
+		autoprefixer: {
+			options: {
+				borwsers: [ '> 1%', 'last 5 versions', 'Firefox ESR', 'Opera 12.1', '>= ie 8' ]
+			},
+			no_dest: {
+				 src: '*.css'
+			}
 		},
 		//Banner
 		usebanner: {
@@ -36,7 +53,9 @@ module.exports = function(grunt) {
 				files: {
 					src: [
 						'<%= pkg.codename %>.css',
-						'<%= pkg.codename %>-ie.css'
+						'<%= pkg.codename %>.min.css',
+						'<%= pkg.codename %>.ie.css',
+						'<%= pkg.codename %>.ie.min.css'
 					]
 				}
 			}
@@ -77,10 +96,11 @@ module.exports = function(grunt) {
 
 	// Load tasks
 	grunt.loadNpmTasks('grunt-contrib-less');
+	grunt.loadNpmTasks('grunt-autoprefixer');
 	grunt.loadNpmTasks('grunt-banner');
 	grunt.loadNpmTasks('grunt-npm2bower-sync');
 
 	// Default task.
-	grunt.registerTask('default', [ 'less', 'usebanner', 'sync', 'buildReadme' ]);
+	grunt.registerTask('default', [ 'less', 'autoprefixer', 'usebanner', 'sync', 'buildReadme' ]);
 
 };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Gridlock",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "description": "A responsive CSS grid system. Part of the Formstone Library.",
   "author": {
     "name": "Ben Plum",

fs.gridlock.css

@@ -1,5 +1,5 @@
 /* 
- * Gridlock v3.1.7 - 2014-09-14 
+ * Gridlock v3.2.0 - 2014-10-22 
  * A responsive CSS grid system. Part of the Formstone Library. 
  * http://formstone.it/gridlock/ 
  * 
@@ -9,32 +9,30 @@
 *,
 *:before,
 *:after {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 .gridlock .row {
+  width: 300px;
   margin-left: auto;
   margin-right: auto;
-  width: 300px;
 }
 .gridlock .row:after {
+  height: 0;
   clear: both;
   content: ".";
   display: block;
-  height: 0;
   line-height: 0;
   visibility: hidden;
 }
 .gridlock .row .row {
+  width: 102.08333333%;
   margin-left: -1.04166667%;
   margin-right: -1.04166667%;
-  width: 102.08333333%;
 }
 .gridlock .row .contained .row {
+  width: 100%;
   margin-left: 0;
   margin-right: 0;
-  width: 100%;
 }
 .gridlock .row [class*="all-"],
 .gridlock .row [class*="min-"],
@@ -52,14 +50,11 @@
 .gridlock .row [class*="tablet-"].padded,
 .gridlock .row [class*="desktop-"].padded,
 .gridlock .row [class*="max-"].padded {
+  box-sizing: content-box;
   margin-left: 0;
   margin-right: 0;
   padding-left: 1.04166667%;
   padding-right: 1.04166667%;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  *behavior: none;
 }
 .gridlock .row [class*="all-"].contained,
 .gridlock .row [class*="min-"].contained,

fs.gridlock-ie.css → fs.gridlock.ie.css

@@ -1,5 +1,5 @@
 /* 
- * Gridlock v3.1.7 - 2014-09-14 
+ * Gridlock v3.2.0 - 2014-10-22 
  * A responsive CSS grid system. Part of the Formstone Library. 
  * http://formstone.it/gridlock/ 
  * 
@@ -211,3 +211,11 @@
 .gridlock .row .contained.desktop-push-11 {
   margin-left: 91.66666667%;
 }
+.gridlock .row [class*="all-"].padded,
+.gridlock .row [class*="min-"].padded,
+.gridlock .row [class*="mobile-"].padded,
+.gridlock .row [class*="tablet-"].padded,
+.gridlock .row [class*="desktop-"].padded,
+.gridlock .row [class*="max-"].padded {
+  *behavior: none;
+}