Merge pull request #110 from jeremyben/master

Upgrade to Bootstrap 3.3.6

Author: maxmx

README.md

@@ -1,7 +1,7 @@
-Bootstrap Stylus 3.3.5
+Bootstrap Stylus 3.3.6
 ======================
 
-Port of the amazing [Bootstrap 3.3.5](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
+Port of the amazing [Bootstrap 3.3.6](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
 
 ## Installing
 

bootstrap/button-groups.styl

@@ -159,12 +159,12 @@
     border-radius 0
 
   &:first-child:not(:last-child)
-    border-top-right-radius $btn-border-radius-base
+    border-top-radius($btn-border-radius-base)
     border-bottom-radius(0)
 
   &:last-child:not(:first-child)
-    border-bottom-left-radius $btn-border-radius-base
     border-top-radius(0)
+    border-bottom-radius($btn-border-radius-base)
 
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn
   border-radius 0

bootstrap/carousel.styl

@@ -92,6 +92,7 @@
   color $carousel-control-color
   text-align center
   text-shadow $carousel-text-shadow
+  background-color rgba(0, 0, 0, 0) // Fix IE9 click-thru bug
   // We can't have this transition here because WebKit cancels the carousel
   // animation if you trip this while in the middle of another animation.
 
@@ -219,18 +220,18 @@
     .glyphicon-chevron-right,
     .icon-prev,
     .icon-next
-      width 30px
-      height 30px
-      margin-top -15px
-      font-size 30px
+      width ($carousel-control-font-size * 1.5)
+      height ($carousel-control-font-size * 1.5)
+      margin-top ($carousel-control-font-size / -2)
+      font-size ($carousel-control-font-size * 1.5)
 
     .glyphicon-chevron-left,
     .icon-prev
-      margin-left -15px
+      margin-left ($carousel-control-font-size / -2)
 
     .glyphicon-chevron-right,
     .icon-next
-      margin-right -15px
+      margin-right ($carousel-control-font-size / -2)
 
   // Show and left align the captions
   .carousel-caption

bootstrap/forms.styl

@@ -122,6 +122,11 @@ output
   // Placeholder
   placeholder()
 
+  // Unstyle the caret on `<select>`s in IE10+.
+  &::-ms-expand
+    border: 0;
+    background-color: transparent;
+
   // Disabled and read-only inputs
   //
   // HTML5 says that controls under a fieldset > legend:first-child won't be

bootstrap/glyphicons.styl

@@ -28,10 +28,10 @@
 // Individual icons
 .glyphicon-asterisk
   &:before
-    content "\2a"
+    content "\002a"
 .glyphicon-plus
   &:before
-    content "\2b"
+    content "\002b"
 .glyphicon-euro,
 .glyphicon-eur
   &:before

bootstrap/index.styl

@@ -1,5 +1,5 @@
 /*!!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

bootstrap/input-groups.styl

@@ -28,6 +28,9 @@
 
     width 100%
     margin-bottom 0
+    
+    &:focus
+      z-index 3
 
 // Sizing options
 //
@@ -72,17 +75,17 @@
   text-align center
   background-color $input-group-addon-bg
   border 1px solid $input-group-addon-border-color
-  border-radius $border-radius-base
+  border-radius $input-border-radius
 
   // Sizing
   &.input-sm
     padding $padding-small-vertical $padding-small-horizontal
     font-size $font-size-small
-    border-radius $border-radius-small
+    border-radius $input-border-radius-small
   &.input-lg
     padding $padding-large-vertical $padding-large-horizontal
     font-size $font-size-large
-    border-radius $border-radius-large
+    border-radius $input-border-radius-large
 
   // Nuke default margins from checkboxes and radios to vertically center within.
   input[type="radio"],

bootstrap/mixins/vendor-prefixes.styl

@@ -1,7 +1,7 @@
 // Vendor Prefixes
 //
 // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
-// Autoprefixer in our Gruntfile. They will be removed in v4.
+// Autoprefixer in our Gruntfile. They have been removed in v4.
 
 // - Animations
 // - Backface visibility

bootstrap/pagination.styl

@@ -36,7 +36,7 @@
   > li > span
     &:hover,
     &:focus
-      z-index 3
+      z-index 2
       color $pagination-hover-color
       background-color $pagination-hover-bg
       border-color $pagination-hover-border
@@ -46,7 +46,7 @@
     &,
     &:hover,
     &:focus
-      z-index 2
+      z-index 3
       color $pagination-active-color
       background-color $pagination-active-bg
       border-color $pagination-active-border

bootstrap/theme.styl

@@ -1,5 +1,5 @@
 /*!!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */