Merge pull request #112 from kane-c/bootstrap-3.3.6

Bootstrap 3.3.6

Author: maxmx

bootstrap/forms.styl

@@ -534,7 +534,7 @@ input[type="checkbox"]
   .form-group-lg
     @media (min-width $screen-sm-min)
       .control-label
-        padding-top (($padding-large-vertical * $line-height-large) + 1)
+        padding-top ($padding-large-vertical + 1)
         font-size $font-size-large
 
   .form-group-sm

bootstrap/jumbotron.styl

@@ -25,6 +25,8 @@
   .container &,
   .container-fluid &
     border-radius $border-radius-large // Only round corners at higher resolutions if contained in a container
+    padding-left ($grid-gutter-width / 2)
+    padding-right ($grid-gutter-width / 2)
 
   .container
     max-width 100%

bootstrap/mixins/buttons.styl

@@ -40,12 +40,9 @@ button-variant($color, $background, $border)
   &.disabled,
   &[disabled],
   fieldset[disabled] &
-    &,
     &:hover,
     &:focus,
-    &.focus,
-    &:active,
-    &.active
+    &.focus
       background-color $background
       border-color $border
 

bootstrap/mixins/grid.styl

@@ -6,8 +6,8 @@
 container-fixed($gutter = $grid-gutter-width)
   margin-right auto
   margin-left auto
-  padding-left ($gutter / 2)
-  padding-right ($gutter / 2)
+  padding-left floor($gutter / 2)
+  padding-right ceil($gutter / 2)
   clearfix()
 
 // Creates a wrapper for a series of columns

bootstrap/mixins/hide-text.styl

@@ -6,7 +6,7 @@
 //
 // Source https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 
-// Deprecated as of v3.01(will be removed in v4)
+// Deprecated as of v3.01 (has been removed in v4)
 hide-text()
   font unquote('0/0') a
   color transparent

bootstrap/modals.styl

@@ -80,7 +80,8 @@
 .modal-header
   padding $modal-title-padding
   border-bottom 1px solid $modal-header-border-color
-  min-height ($modal-title-padding + $modal-title-line-height)
+  clearfix()
+
 // Close icon
 .modal-header .close
   margin-top -2px

package.json

@@ -12,13 +12,13 @@
   "version": "5.0.3",
   "devDependencies": {
     "grunt": "~0.4.5",
-    "stylus": "~0.47.0",
-    "grunt-autoprefixer": "~3.0.0",
-    "grunt-contrib-stylus": "0.18.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-contrib-cssmin": "~0.12.3",
+    "grunt-autoprefixer": "~3.0.3",
+    "grunt-contrib-cssmin": "~0.14.0",
     "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-uglify": "~0.9.1"
+    "grunt-contrib-stylus": "~0.18.0",
+    "grunt-contrib-uglify": "~0.9.2",
+    "grunt-contrib-watch": "~0.6.1",
+    "stylus": "~0.47.0"
   },
   "dependencies": {},
   "main": "index.js"