Merge pull request #92 from kane-c/master

maxmx · maxmx · commit c0dd549fb09b · 2015-03-17T21:34:05.000-04:00
Upgrade Bootstrap to v3.3.4
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-Bootstrap Stylus 3.3.2
+Bootstrap Stylus 3.3.4
 ======================
 
-Port of the amazing [Bootstrap 3.3.2](https://github.com/twbs/bootstrap) to [Stylus 0.47.0](http://learnboost.github.com/stylus/).
+Port of the amazing [Bootstrap 3.3.4](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.
 
diff --git a/bootstrap/badges.styl b/bootstrap/badges.styl
@@ -27,7 +27,8 @@
     position relative
     top -1px
 
-  .btn-xs &
+  .btn-xs &,
+  .btn-group-xs > .btn &
     top 0
     padding 1px 5px
 
diff --git a/bootstrap/component-animations.styl b/bootstrap/component-animations.styl
@@ -16,11 +16,9 @@
 
 .collapse
   display none
-  visibility hidden
 
   &.in
     display block
-    visibility visible
 
   tr&.in
     display table-row
diff --git a/bootstrap/dropdowns.styl b/bootstrap/dropdowns.styl
@@ -10,7 +10,7 @@
   height 0
   margin-left 2px
   vertical-align middle
-  border-top $caret-width-base solid
+  border-top $caret-width-base dashed
   border-right $caret-width-base solid transparent
   border-left $caret-width-base solid transparent
 
diff --git a/bootstrap/forms.styl b/bootstrap/forms.styl
@@ -131,10 +131,13 @@ output
   &[disabled],
   &[readonly],
   fieldset[disabled] &
-    cursor $cursor-disabled
     background-color $input-bg-disabled
     opacity 1 // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
 
+  &[disabled],
+  fieldset[disabled] &
+    cursor $cursor-disabled
+
   // Reset height for `textarea`s
   textarea&
     height auto
@@ -180,7 +183,7 @@ input[type="search"]
 // horizontal forms, use the predefined grid classes.
 
 .form-group
-  margin-bottom 15px
+  margin-bottom $form-group-margin-bottom
 
 
 // Checkboxes and radios
@@ -216,6 +219,7 @@ input[type="search"]
 // Radios and checkboxes on same line
 .radio-inline,
 .checkbox-inline
+  position relative
   display inline-block
   padding-left 20px
   margin-bottom 0
@@ -266,6 +270,7 @@ input[type="checkbox"]
   padding-bottom ($padding-base-vertical + 1)
   // Remove default margin from `p`
   margin-bottom 0
+  min-height ($line-height-computed + $font-size-base)
 
   &.input-lg,
   &.input-sm
@@ -293,6 +298,7 @@ input[type="checkbox"]
     padding $padding-small-vertical $padding-small-horizontal
     font-size $font-size-small
     line-height $line-height-small
+    min-height ($line-height-computed + $font-size-small)
 
 .input-lg
   input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large)
@@ -306,6 +312,7 @@ input[type="checkbox"]
     padding $padding-large-vertical $padding-large-horizontal
     font-size $font-size-large
     line-height $line-height-large
+    min-height ($line-height-computed + $font-size-large)
 
 
 // Form control feedback states
diff --git a/bootstrap/glyphicons.styl b/bootstrap/glyphicons.styl
@@ -714,12 +714,24 @@
 .glyphicon-bitcoin
   &:before
     content "\e227"
+.glyphicon-btc
+  &:before
+    content "\e227"
+.glyphicon-xbt
+  &:before
+    content "\e227"
 .glyphicon-yen
   &:before
     content "\00a5"
+.glyphicon-jpy
+  &:before
+    content "\00a5"
 .glyphicon-ruble
   &:before
     content "\20bd"
+.glyphicon-rub
+  &:before
+    content "\20bd"
 .glyphicon-scale
   &:before
     content "\e230"
diff --git a/bootstrap/index.styl b/bootstrap/index.styl
@@ -1,5 +1,5 @@
-/*!
- * Bootstrap v3.3.2 (http://getbootstrap.com)
+/*!!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
diff --git a/bootstrap/mixins/text-overflow.styl b/bootstrap/mixins/text-overflow.styl
@@ -1,7 +1,7 @@
 // Text overflow
 // Requires inline-block or block for proper styling
-text-overflow()
-  text-overflow arguments
-  if arguments == ellipsis
+text-overflow(type=ellipsis)
+  text-overflow type
+  if type == ellipsis
     overflow hidden unless @overflow
     white-space nowrap unless @white-space
diff --git a/bootstrap/modals.styl b/bootstrap/modals.styl
@@ -60,11 +60,12 @@
 
 // Modal background
 .modal-backdrop
-  position absolute
+  position fixed
   top 0
   right 0
-  left 0
   bottom 0
+  left 0
+  z-index $zindex-modal-background
   background-color $modal-backdrop-bg
 
   // Fade for backdrop
diff --git a/bootstrap/navbar.styl b/bootstrap/navbar.styl
@@ -62,7 +62,6 @@
 
     &.collapse
       display block !important
-      visibility visible !important
       height auto !important
       padding-bottom 0 // Override default setting
       overflow visible !important
diff --git a/bootstrap/navs.styl b/bootstrap/navs.styl
@@ -191,11 +191,9 @@
 .tab-content
   > .tab-pane
     display none
-    visibility hidden
 
   > .active
     display block
-    visibility visible
 
 
 // Dropdowns
diff --git a/bootstrap/normalize.styl b/bootstrap/normalize.styl
@@ -1,4 +1,4 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*!! normalize.css v3.0.2 | MIT License | git.io/normalize */
 
 //
 // 1. Set default font family to sans-serif.
diff --git a/bootstrap/panels.styl b/bootstrap/panels.styl
@@ -123,8 +123,8 @@
     > tbody:last-child,
     > tfoot:last-child
       > tr:last-child
-        border-top-left-radius ($panel-border-radius - 1)
-        border-top-right-radius ($panel-border-radius - 1)
+        border-bottom-left-radius ($panel-border-radius - 1)
+        border-bottom-right-radius ($panel-border-radius - 1)
 
         td:first-child,
         th:first-child
diff --git a/bootstrap/responsive-embed.styl b/bootstrap/responsive-embed.styl
@@ -22,10 +22,10 @@
     width 100%
     border 0
 
-  // Modifier class for 16:9 aspect ratio
-  &.embed-responsive-16by9
-    padding-bottom 56.25%
+// Modifier class for 16:9 aspect ratio
+.embed-responsive-16by9
+  padding-bottom 56.25%
 
-  // Modifier class for 4:3 aspect ratio
-  &.embed-responsive-4by3
-    padding-bottom 75%
+// Modifier class for 4:3 aspect ratio
+.embed-responsive-4by3
+  padding-bottom 75%
diff --git a/bootstrap/scaffolding.styl b/bootstrap/scaffolding.styl
@@ -130,3 +130,14 @@ hr
     margin 0
     overflow visible
     clip auto
+
+
+// iOS "clickable elements" fix for role="button"
+//
+// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
+// for traditionally non-focusable elements with role="button"
+// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
+
+[role="button"]
+  cursor pointer
diff --git a/bootstrap/theme.styl b/bootstrap/theme.styl
@@ -1,5 +1,5 @@
-/*!
- * Bootstrap v3.3.2 (http://getbootstrap.com)
+/*!!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
diff --git a/bootstrap/tooltip.styl b/bootstrap/tooltip.styl
@@ -8,7 +8,6 @@
   position absolute
   z-index $zindex-tooltip
   display block
-  visibility visible
   // Reset font and text properties given new insertion method
   font-family $font-family-base
   font-size $font-size-small
diff --git a/bootstrap/utilities.styl b/bootstrap/utilities.styl
@@ -42,7 +42,6 @@
 
 .hidden
   display none !important
-  visibility hidden !important
 
 
 // For Affix plugin
diff --git a/bootstrap/variables.styl b/bootstrap/variables.styl
@@ -207,6 +207,9 @@ $input-height-large ?=             (ceil($font-size-large * $line-height-large)
 //** Small `.form-control` height
 $input-height-small ?=             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
 
+//** `.form-group` margin
+$form-group-margin-bottom ?=       15px
+
 $legend-color ?=                   $gray-dark
 $legend-border-color ?=            #e5e5e5
 
@@ -256,17 +259,18 @@ $dropdown-caret-color ?=         #000
 
 //-- Z-index master list
 //
-// Warning ?= Avoid customizing these values. They're used for a bird's eye view
+// Warning: Avoid customizing these values. They're used for a bird's eye view
 // of components dependent on the z-axis and are designed to all work together.
 //
-// Note ?= These variables are not generated into the Customizer.
+// Note: These variables are not generated into the Customizer.
 
 $zindex-navbar ?=           1000
 $zindex-dropdown ?=         1000
 $zindex-popover ?=          1060
 $zindex-tooltip ?=          1070
 $zindex-navbar-fixed ?=     1030
-$zindex-modal ?=            1040
+$zindex-modal-background ?= 1040
+$zindex-modal ?=            1050
 
 
 //== Media queries breakpoints
diff --git a/js/affix.js b/js/affix.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.3.2
+ * Bootstrap: affix.js v3.3.4
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -21,14 +21,14 @@
       .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
     this.$element     = $(element)
-    this.affixed      =
-    this.unpin        =
+    this.affixed      = null
+    this.unpin        = null
     this.pinnedOffset = null
 
     this.checkPosition()
   }
 
-  Affix.VERSION  = '3.3.2'
+  Affix.VERSION  = '3.3.4'
 
   Affix.RESET    = 'affix affix-top affix-bottom'
 
@@ -78,7 +78,7 @@
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-    var scrollHeight = $('body').height()
+    var scrollHeight = $(document.body).height()
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
diff --git a/js/alert.js b/js/alert.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.3.2
+ * Bootstrap: alert.js v3.3.4
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -18,7 +18,7 @@
     $(el).on('click', dismiss, this.close)
   }
 
-  Alert.VERSION = '3.3.2'
+  Alert.VERSION = '3.3.4'
 
   Alert.TRANSITION_DURATION = 150
 
diff --git a/js/button.js b/js/button.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.3.2
+ * Bootstrap: button.js v3.3.4
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
     this.isLoading = false
   }
 
-  Button.VERSION  = '3.3.2'
+  Button.VERSION  = '3.3.4'
 
   Button.DEFAULTS = {
     loadingText: 'loading...'
diff --git a/js/carousel.js b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.3.2
+ * Bootstrap: carousel.js v3.3.4
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -17,10 +17,10 @@
     this.$element    = $(element)
     this.$indicators = this.$element.find('.carousel-indicators')
     this.options     = options
-    this.paused      =
-    this.sliding     =
-    this.interval    =
-    this.$active     =
+    this.paused      = null
+    this.sliding     = null
+    this.interval    = null
+    this.$active     = null
     this.$items      = null
 
     this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
@@ -30,7 +30,7 @@
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.VERSION  = '3.3.2'
+  Carousel.VERSION  = '3.3.4'
 
   Carousel.TRANSITION_DURATION = 600
 
diff --git a/js/collapse.js b/js/collapse.js
diff --git a/js/dropdown.js b/js/dropdown.js
diff --git a/js/modal.js b/js/modal.js
diff --git a/js/popover.js b/js/popover.js
diff --git a/js/scrollspy.js b/js/scrollspy.js
diff --git a/js/tab.js b/js/tab.js
diff --git a/js/tooltip.js b/js/tooltip.js
diff --git a/js/transition.js b/js/transition.js
diff --git a/package.json b/package.json
