Merge pull request #89 from kane-c/master

Upgrade to Bootstrap v3.3.2

README.md

@@ -1,7 +1,7 @@
-Bootstrap Stylus 3.3.1
+Bootstrap Stylus 3.3.2
 ======================
 
-Port of the amazing [Bootstrap 3.3.1](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
+Port of the amazing [Bootstrap 3.3.2](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/button-groups.styl

@@ -64,12 +64,12 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn
   border-radius 0
 
-.btn-group > .btn-group:first-child
+.btn-group > .btn-group:first-child:not(:last-child)
   > .btn:last-child,
   > .dropdown-toggle
     border-right-radius(0)
 
-.btn-group > .btn-group:last-child > .btn:first-child
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child
   border-left-radius(0)
 
 // On active and open, don't show outline
@@ -214,7 +214,7 @@
 
 [data-toggle="buttons"]
   > .btn
-  > .brn-group > .btn
+  > .btn-group > .btn
     input[type="radio"],
     input[type="checkbox"]
       position absolute

bootstrap/buttons.styl

@@ -100,7 +100,7 @@
   &:hover,
   &:focus
     color $link-hover-color
-    text-decoration underline
+    text-decoration $link-hover-decoration
     background-color transparent
 
   &[disabled],

bootstrap/carousel.styl

@@ -26,9 +26,9 @@
 
     // WebKit CSS3 transforms for supported devices
     @media all and (transform-3d), (-webkit-transform-3d)
-      transition transform .6s ease-in-out
-      backface-visibility hidden
-      perspective 1000
+      transition-transform(.6s ease-in-out)
+      backface-visibility(hidden)
+      perspective(1000)
 
       &.next,
       &.active.right
@@ -137,6 +137,7 @@
     width 20px
     height 20px
     margin-top -10px
+    line-height 1
     font-family serif
 
   .icon-prev
@@ -178,6 +179,7 @@
     // Internet Explorer 8-9 does not support clicks on elements without a set
     // `background-color`. We cannot use `filter` since that's not viewed as a
     // background color by the browser. Thus, a hack is needed.
+    // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
     //
     // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
     // set alpha transparency for the best results possible.

bootstrap/close.styl

@@ -22,6 +22,7 @@
   // Additional properties for button version
   // iOS requires the button element instead of an anchor tag.
   // If you want the anchor version, it requires `href="#"`.
+  // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
   button&
     padding 0
     cursor pointer

bootstrap/dropdowns.styl

@@ -15,6 +15,7 @@
   border-left $caret-width-base solid transparent
 
 // The dropdown wrapper (div)
+.dropup,
 .dropdown
   position relative
 
@@ -168,7 +169,7 @@
   .dropdown-menu
     top auto
     bottom 100%
-    margin-bottom 1px
+    margin-bottom 2px
 
 
 // Component alignment

bootstrap/forms.styl

@@ -113,7 +113,7 @@ output
   background-color $input-bg
   background-image none // Reset unusual Firefox-on-Android default style see https://github.com/necolas/normalize.css/issues/214
   border 1px solid $input-border
-  border-radius $input-border-radius
+  border-radius $input-border-radius // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
   box-shadow inset 0 1px 1px rgba(0, 0, 0, .075)
   transition border-color ease-in-out .15s, box-shadow ease-in-out .15s
 
@@ -133,7 +133,7 @@ output
   fieldset[disabled] &
     cursor $cursor-disabled
     background-color $input-bg-disabled
-    opacity 1 // iOS fix for unreadable disabled content
+    opacity 1 // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
 
   // Reset height for `textarea`s
   textarea&
@@ -156,7 +156,7 @@ input[type="search"]
 // In Mobile Safari, setting `display block` on temporal inputs causes the
 // 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
+// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
 
 @media screen and (-webkit-min-device-pixel-ratio 0)
   input[type="date"],
@@ -165,10 +165,12 @@ input[type="search"]
   input[type="month"]
     line-height $input-height-base
 
-    &.input-sm
+    &.input-sm,
+    .input-group-sm &
       line-height $input-height-small
 
-    &.input-lg
+    &.input-lg,
+    .input-group-lg &
       line-height $input-height-large
 
 
@@ -275,14 +277,35 @@ input[type="checkbox"]
 //
 // Build on `.form-control` with modifier classes to decrease or increase the
 // height and font-size of form controls.
+//
+// The `.form-group-* form-control` variations are sadly duplicated to avoid the
+// issue documented in https://github.com/twbs/bootstrap/issues/15074.
+
+.input-sm
+  input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small)
+
+.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)
 
-.input-sm,
-.form-group-sm .form-control
-  input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $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
 
 .input-lg
-.form-group-lg .form-control
-  input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large)
+  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
 
 
 // Form control feedback states
@@ -400,8 +423,7 @@ input[type="checkbox"]
       vertical-align middle
 
     // Remove default margin on radios/checkboxes that were used for stacking, and
-    // then undo the floating of radios and checkboxes to match (which also avoids
-    // a bug in WebKit https://github.com/twbs/bootstrap/issues/1969).
+    // then undo the floating of radios and checkboxes to match
     .radio,
     .checkbox
       display inline-block

bootstrap/glyphicons.styl

@@ -11,7 +11,7 @@
 @font-face
   font-family 'Glyphicons Halflings'
   src url($icon-font-path + $icon-font-name + '.eot')
-  src url($icon-font-path + $icon-font-name + '.eot?#iefix') format('embedded-opentype'), url($icon-font-path + $icon-font-name + '.woff') format('woff'), url($icon-font-path + $icon-font-name + '.ttf') format('truetype'), url($icon-font-path + $icon-font-name + '.svg#' + $icon-font-svg-id) format('svg')
+  src url($icon-font-path + $icon-font-name + '.eot?#iefix') format('embedded-opentype'), url($icon-font-path + $icon-font-name + '.woff2') format('woff2'), url($icon-font-path + $icon-font-name + '.woff') format('woff'), url($icon-font-path + $icon-font-name + '.ttf') format('truetype'), url($icon-font-path + $icon-font-name + '.svg#' + $icon-font-svg-id) format('svg')
 
 // Catchall baseclass
 .glyphicon
@@ -627,3 +627,189 @@
 .glyphicon-tree-deciduous
   &:before
     content "\e200"
+.glyphicon-cd
+  &:before
+    content "\e201"
+.glyphicon-save-file
+  &:before
+    content "\e202"
+.glyphicon-open-file
+  &:before
+    content "\e203"
+.glyphicon-level-up
+  &:before
+    content "\e204"
+.glyphicon-copy
+  &:before
+    content "\e205"
+.glyphicon-paste
+  &:before
+    content "\e206"
+// The following 2 Glyphicons are omitted for the time being because
+// they currently use Unicode codepoints that are outside the
+// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
+// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
+// Notably, the bug affects some older versions of the Android Browser.
+// More info: https://github.com/twbs/bootstrap/issues/10106
+// .glyphicon-door
+//   &:before
+//     content "\1f6aa"
+// .glyphicon-key
+//   &:before
+//     content "\1f511"
+.glyphicon-alert
+  &:before
+    content "\e209"
+.glyphicon-equalizer
+  &:before
+    content "\e210"
+.glyphicon-king
+  &:before
+    content "\e211"
+.glyphicon-queen
+  &:before
+    content "\e212"
+.glyphicon-pawn
+  &:before
+    content "\e213"
+.glyphicon-bishop
+  &:before
+    content "\e214"
+.glyphicon-knight
+  &:before
+    content "\e215"
+.glyphicon-baby-formula
+  &:before
+    content "\e216"
+.glyphicon-tent
+  &:before
+    content "\26fa"
+.glyphicon-blackboard
+  &:before
+    content "\e218"
+.glyphicon-bed
+  &:before
+    content "\e219"
+.glyphicon-apple
+  &:before
+    content "\f8ff"
+.glyphicon-erase
+  &:before
+    content "\e221"
+.glyphicon-hourglass
+  &:before
+    content "\231b"
+.glyphicon-lamp
+  &:before
+    content "\e223"
+.glyphicon-duplicate
+  &:before
+    content "\e224"
+.glyphicon-piggy-bank
+  &:before
+    content "\e225"
+.glyphicon-scissors
+  &:before
+    content "\e226"
+.glyphicon-bitcoin
+  &:before
+    content "\e227"
+.glyphicon-yen
+  &:before
+    content "\00a5"
+.glyphicon-ruble
+  &:before
+    content "\20bd"
+.glyphicon-scale
+  &:before
+    content "\e230"
+.glyphicon-ice-lolly
+  &:before
+    content "\e231"
+.glyphicon-ice-lolly-tasted
+  &:before
+    content "\e232"
+.glyphicon-education
+  &:before
+    content "\e233"
+.glyphicon-option-horizontal
+  &:before
+    content "\e234"
+.glyphicon-option-vertical
+  &:before
+    content "\e235"
+.glyphicon-menu-hamburger
+  &:before
+    content "\e236"
+.glyphicon-modal-window
+  &:before
+    content "\e237"
+.glyphicon-oil
+  &:before
+    content "\e238"
+.glyphicon-grain
+  &:before
+    content "\e239"
+.glyphicon-sunglasses
+  &:before
+    content "\e240"
+.glyphicon-text-size
+  &:before
+    content "\e241"
+.glyphicon-text-color
+  &:before
+    content "\e242"
+.glyphicon-text-background
+  &:before
+    content "\e243"
+.glyphicon-object-align-top
+  &:before
+    content "\e244"
+.glyphicon-object-align-bottom
+  &:before
+    content "\e245"
+.glyphicon-object-align-horizontal
+  &:before
+    content "\e246"
+.glyphicon-object-align-left
+  &:before
+    content "\e247"
+.glyphicon-object-align-vertical
+  &:before
+    content "\e248"
+.glyphicon-object-align-right
+  &:before
+    content "\e249"
+.glyphicon-triangle-right
+  &:before
+    content "\e250"
+.glyphicon-triangle-left
+  &:before
+    content "\e251"
+.glyphicon-triangle-bottom
+  &:before
+    content "\e252"
+.glyphicon-triangle-top
+  &:before
+    content "\e253"
+.glyphicon-console
+  &:before
+    content "\e254"
+.glyphicon-superscript
+  &:before
+    content "\e255"
+.glyphicon-subscript
+  &:before
+    content "\e256"
+.glyphicon-menu-left
+  &:before
+    content "\e257"
+.glyphicon-menu-right
+  &:before
+    content "\e258"
+.glyphicon-menu-down
+  &:before
+    content "\e259"
+.glyphicon-menu-up
+  &:before
+    content "\e260"

bootstrap/index.styl

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