Merge pull request #97 from kane-c/master

Upgrade to Bootstrap v3.3.5

Author: maxmx

README.md

@@ -1,7 +1,7 @@
-Bootstrap Stylus 3.3.4
+Bootstrap Stylus 3.3.5
 ======================
 
-Port of the amazing [Bootstrap 3.3.4](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
+Port of the amazing [Bootstrap 3.3.5](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
 
 There might be some slight color differences due to the differences between the color functions in LESS and those in Stylus.
 

bootstrap/badges.styl

@@ -12,7 +12,7 @@
   font-weight $badge-font-weight
   color $badge-color
   line-height $badge-line-height
-  vertical-align baseline
+  vertical-align middle
   white-space nowrap
   text-align center
   background-color $badge-bg

bootstrap/button-groups.styl

@@ -33,6 +33,7 @@
   margin-left -5px // Offset the first child's margin
   @extend .clearfix
 
+  .btn,
   .btn-group,
   .input-group
     float left
@@ -158,11 +159,11 @@
     border-radius 0
 
   &:first-child:not(:last-child)
-    border-top-right-radius $border-radius-base
+    border-top-right-radius $btn-border-radius-base
     border-bottom-radius(0)
 
   &:last-child:not(:first-child)
-    border-bottom-left-radius $border-radius-base
+    border-bottom-left-radius $btn-border-radius-base
     border-top-radius(0)
 
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn

bootstrap/buttons.styl

@@ -17,7 +17,7 @@
   background-image none // Reset unusual Firefox-on-Android default style see https://github.com/necolas/normalize.css/issues/214
   border 1px solid transparent
   white-space nowrap
-  button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base)
+  button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base)
   user-select none
 
   &,
@@ -43,10 +43,14 @@
   &[disabled],
   fieldset[disabled] &
     cursor $cursor-disabled
-    pointer-events none // Future-proof disabling of clicks
     opacity-ie(.65)
     box-shadow none
 
+  a&
+    &.disabled,
+    fieldset[disabled] &
+      pointer-events none // Future-proof disabling of clicks on `<a>` elements
+
 
 // Alternate buttons
 // --------------------------------------------------
@@ -116,14 +120,14 @@
 
 .btn-lg
   // line-height ensure even-numbered height of button next to large input
-  button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large)
+  button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large)
 
 .btn-sm
   // line-height ensure proper height of button next to small input
-  button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small)
+  button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small)
 
 .btn-xs
-  button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small)
+  button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small)
 
 
 // Block button

bootstrap/carousel.styl

@@ -28,7 +28,7 @@
     @media all and (transform-3d), (-webkit-transform-3d)
       transition-transform(.6s ease-in-out)
       backface-visibility(hidden)
-      perspective(1000)
+      perspective(1000px)
 
       &.next,
       &.active.right
@@ -119,6 +119,7 @@
   .glyphicon-chevron-right
     position absolute
     top 50%
+    margin-top -10px
     z-index 5
     display inline-block
 
@@ -136,7 +137,6 @@
   .icon-next
     width 20px
     height 20px
-    margin-top -10px
     line-height 1
     font-family serif
 

bootstrap/dropdowns.styl

@@ -11,6 +11,7 @@
   margin-left 2px
   vertical-align middle
   border-top $caret-width-base dashed
+  border-top s("%s solid \9", $caret-width-base) // IE8
   border-right $caret-width-base solid transparent
   border-left $caret-width-base solid transparent
 
@@ -163,8 +164,10 @@
   // Reverse the caret
   .caret
     border-top 0
-    border-bottom $caret-width-base solid
+    border-bottom $caret-width-base dashed
+    border-bottom s("%s solid \9", $caret-width-base) // IE8
     content ""
+
   // Different positioning for bottom up menu
   .dropdown-menu
     top auto

bootstrap/forms.styl

@@ -51,7 +51,6 @@ input[type="checkbox"]
   margin-top unquote('1px \9') // IE8-9
   line-height normal
 
-// Set the height of file controls to match text inputs
 input[type="file"]
   display block
 
@@ -160,13 +159,16 @@ input[type="search"]
 // text within the input to become vertically misaligned. As a workaround, we
 // set a pixel line-height that matches the given height of the input, but only
 // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
+//
+// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
 
 @media screen and (-webkit-min-device-pixel-ratio 0)
   input[type="date"],
   input[type="time"],
   input[type="datetime-local"],
   input[type="month"]
-    line-height $input-height-base
+    &.form-control
+      line-height $input-height-base
 
     &.input-sm,
     .input-group-sm &
@@ -291,28 +293,52 @@ input[type="checkbox"]
 
 .form-group-sm
   .form-control
-    input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small)
-
-  .form-control-static
     height $input-height-small
     padding $padding-small-vertical $padding-small-horizontal
     font-size $font-size-small
     line-height $line-height-small
+    border-radius $input-border-radius-small
+
+  select.form-control
+    height $input-height-small
+    line-height $input-height-small
+
+  textarea.form-control,
+  select[multiple].form-control
+    height auto
+
+  .form-control-static
+    height $input-height-small
     min-height ($line-height-computed + $font-size-small)
+    padding ($padding-small-vertical + 1) $padding-small-horizontal
+    font-size $font-size-small
+    line-height $line-height-small
 
 .input-lg
   input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large)
 
 .form-group-lg
   .form-control
-    input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large)
-
-  .form-control-static
     height $input-height-large
     padding $padding-large-vertical $padding-large-horizontal
     font-size $font-size-large
     line-height $line-height-large
+    border-radius $input-border-radius-large
+
+  select.form-control
+    height $input-height-large
+    line-height $input-height-large
+
+  textarea.form-control,
+  select[multiple].form-control
+    height auto
+
+  .form-control-static
+    height $input-height-large
     min-height ($line-height-computed + $font-size-large)
+    padding ($padding-large-vertical + 1) $padding-large-horizontal
+    font-size $font-size-large
+    line-height $line-height-large
 
 
 // Form control feedback states
@@ -340,12 +366,16 @@ input[type="checkbox"]
   text-align center
   pointer-events none
 
-.input-lg + .form-control-feedback
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback
   width $input-height-large
   height $input-height-large
   line-height $input-height-large
 
-.input-sm + .form-control-feedback
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback
   width $input-height-small
   height $input-height-small
   line-height $input-height-small
@@ -490,7 +520,7 @@ input[type="checkbox"]
   // Reposition the icon because it's now within a grid column and columns have
   // `position relative` on them. Also accounts for the grid gutter padding.
   .has-feedback .form-control-feedback
-    right ($grid-gutter-width / 2)
+    right floor($grid-gutter-width / 2)
 
   // Form group sizes
   //
@@ -500,11 +530,13 @@ input[type="checkbox"]
     @media (min-width $screen-sm-min)
       .control-label
         padding-top (($padding-large-vertical * $line-height-large) + 1)
+        font-size $font-size-large
 
   .form-group-sm
     @media (min-width $screen-sm-min)
       .control-label
         padding-top ($padding-small-vertical + 1)
+        font-size $font-size-small
 
     .form-control
       @extend .input-sm

bootstrap/index.styl

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

bootstrap/input-groups.styl

@@ -139,6 +139,7 @@
   &:first-child
     > .btn,
     > .btn-group
+      z-index 2
       margin-right -1px
   &:last-child
     > .btn,

bootstrap/jumbotron.styl

@@ -4,7 +4,8 @@
 
 
 .jumbotron
-  padding $jumbotron-padding ($jumbotron-padding / 2)
+  padding-top $jumbotron-padding
+  padding-bottom $jumbotron-padding
   margin-bottom $jumbotron-padding
   color $jumbotron-color
   background-color $jumbotron-bg
@@ -29,7 +30,8 @@
     max-width 100%
 
   @media screen and (min-width $screen-sm-min)
-    padding ($jumbotron-padding * 1.6) 0
+    padding-top ($jumbotron-padding * 1.6)
+    padding-bottom ($jumbotron-padding * 1.6)
 
     .container &,
     .container-fluid &
@@ -38,4 +40,4 @@
 
     h1,
     .h1
-      font-size ($font-size-base * 4.5)
+      font-size $jumbotron-heading-font-size