Merge pull request #31 from lusini/master

fix variable name within make-xs-column mixin

Author: maxmx

Gruntfile.js

@@ -32,15 +32,14 @@ module.exports = function(grunt) {
         use: [
           require('nib')
         ]
-        },
-        import: [
-          'nib'
-        ],
-        files: {
-          'dist/theme.css': 'stylus/theme.styl' // 1:1 compile
-        }
+      },
+      import: [
+        'nib'
+      ],
+      files: {
+        'dist/theme.css': 'stylus/theme.styl' // 1:1 compile
       }
-
+    }
   },
 
   watch: {
@@ -73,18 +72,20 @@ module.exports = function(grunt) {
   uglify: {
     dist: {
       files: {
-        'dist/bootstrap.min.js': ['js/transition.js',
-                                  'js/alert.js',
-                                  'js/button.js',
-                                  'js/carousel.js',
-                                  'js/collapse.js',
-                                  'js/dropdown.js',
-                                  'js/modal.js',
-                                  'js/tooltip.js',
-                                  'js/popover.js',
-                                  'js/scrollspy.js',
-                                  'js/tab.js',
-                                  'js/affix.js']
+        'dist/bootstrap.min.js': [
+            'js/transition.js',
+            'js/alert.js',
+            'js/button.js',
+            'js/carousel.js',
+            'js/collapse.js',
+            'js/dropdown.js',
+            'js/modal.js',
+            'js/tooltip.js',
+            'js/popover.js',
+            'js/scrollspy.js',
+            'js/tab.js',
+            'js/affix.js'
+        ]
       }
     }
   },
@@ -102,4 +103,4 @@ module.exports = function(grunt) {
   grunt.registerTask('theme', ['stylus:theme', 'cssmin:theme']);
   grunt.registerTask('watch', ['stylus:bootstrap', 'watch:css']);
   grunt.registerTask('build', ['clean','stylus:bootstrap', 'stylus:theme', 'cssmin:bootstrap', 'cssmin:theme', 'uglify']);
-};
+};

stylus/mixins.styl

@@ -542,7 +542,7 @@ make-row(gutter = $grid-gutter-width) {
 make-xs-column(columns, gutter = $grid-gutter-width) {
   position: relative;
   float: left;
-  width: percentage(columns, grid-columns)
+  width: percentage(columns, $grid-columns)
   // Prevent columns from collapsing when empty
   min-height: 1px;
   // Inner gutter via padding