Merge pull request #110 from jeremyben/master

Upgrade to Bootstrap 3.3.6

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)
  */

bootstrap/type.styl

@@ -216,7 +216,7 @@ dd
   dd
     @extend .clearfix // Clear the floated `dt` if an empty `dd` is present
 
-  @media (min-width $grid-float-breakpoint)
+  @media (min-width $dl-horizontal-breakpoint)
     dt
       float left
       width ($dl-horizontal-offset - 20)

bootstrap/variables.styl

@@ -863,5 +863,7 @@ $blockquote-border-color ?=   $gray-lighter
 $page-header-border-color ?=  $gray-lighter
 //** Width of horizontal description list titles
 $dl-horizontal-offset ?=      $component-offset-horizontal
+//** Point at which .dl-horizontal becomes horizontal
+$dl-horizontal-breakpoint ?=  $grid-float-breakpoint
 //** Horizontal line color.
 $hr-border ?=                 $gray-lighter

bower.json

@@ -2,7 +2,7 @@
   "name": "bootstrap-stylus",
   "version": "5.0.1",
   "main": "bootstrap/index.styl",
-  "description": "A port of Bootstrap 3.3.5 to Stylus",
+  "description": "A port of Bootstrap 3.3.6 to Stylus",
   "ignore": [
     "**/.*",
     "node_modules",

js/affix.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.3.5
+ * Bootstrap: affix.js v3.3.6
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
     this.checkPosition()
   }
 
-  Affix.VERSION  = '3.3.5'
+  Affix.VERSION  = '3.3.6'
 
   Affix.RESET    = 'affix affix-top affix-bottom'
 

js/alert.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.3.5
+ * Bootstrap: alert.js v3.3.6
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -18,7 +18,7 @@
     $(el).on('click', dismiss, this.close)
   }
 
-  Alert.VERSION = '3.3.5'
+  Alert.VERSION = '3.3.6'
 
   Alert.TRANSITION_DURATION = 150
 

js/button.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.3.5
+ * Bootstrap: button.js v3.3.6
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
     this.isLoading = false
   }
 
-  Button.VERSION  = '3.3.5'
+  Button.VERSION  = '3.3.6'
 
   Button.DEFAULTS = {
     loadingText: 'loading...'

js/carousel.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.3.5
+ * Bootstrap: carousel.js v3.3.6
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.VERSION  = '3.3.5'
+  Carousel.VERSION  = '3.3.6'
 
   Carousel.TRANSITION_DURATION = 600
 

js/collapse.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.3.5
+ * Bootstrap: collapse.js v3.3.6
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -29,7 +29,7 @@
     if (this.options.toggle) this.toggle()
   }
 
-  Collapse.VERSION  = '3.3.5'
+  Collapse.VERSION  = '3.3.6'
 
   Collapse.TRANSITION_DURATION = 350
 

js/dropdown.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.3.5
+ * Bootstrap: dropdown.js v3.3.6
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
     $(element).on('click.bs.dropdown', this.toggle)
   }
 
-  Dropdown.VERSION = '3.3.5'
+  Dropdown.VERSION = '3.3.6'
 
   function getParent($this) {
     var selector = $this.attr('data-target')
@@ -51,7 +51,7 @@
       if (e.isDefaultPrevented()) return
 
       $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
+      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
     })
   }
 
@@ -85,7 +85,7 @@
 
       $parent
         .toggleClass('open')
-        .trigger('shown.bs.dropdown', relatedTarget)
+        .trigger($.Event('shown.bs.dropdown', relatedTarget))
     }
 
     return false

js/modal.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.3.5
+ * Bootstrap: modal.js v3.3.6
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -33,7 +33,7 @@
     }
   }
 
-  Modal.VERSION  = '3.3.5'
+  Modal.VERSION  = '3.3.6'
 
   Modal.TRANSITION_DURATION = 300
   Modal.BACKDROP_TRANSITION_DURATION = 150

js/popover.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.3.5
+ * Bootstrap: popover.js v3.3.6
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
 
   if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  Popover.VERSION  = '3.3.5'
+  Popover.VERSION  = '3.3.6'
 
   Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
     placement: 'right',

js/scrollspy.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.3.5
+ * Bootstrap: scrollspy.js v3.3.6
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
     this.process()
   }
 
-  ScrollSpy.VERSION  = '3.3.5'
+  ScrollSpy.VERSION  = '3.3.6'
 
   ScrollSpy.DEFAULTS = {
     offset: 10

js/tab.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.3.5
+ * Bootstrap: tab.js v3.3.6
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
     // jscs:enable requireDollarBeforejQueryAssignment
   }
 
-  Tab.VERSION = '3.3.5'
+  Tab.VERSION = '3.3.6'
 
   Tab.TRANSITION_DURATION = 150
 

js/tooltip.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.3.5
+ * Bootstrap: tooltip.js v3.3.6
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -26,7 +26,7 @@
     this.init('tooltip', element, options)
   }
 
-  Tooltip.VERSION  = '3.3.5'
+  Tooltip.VERSION  = '3.3.6'
 
   Tooltip.TRANSITION_DURATION = 150
 

js/transition.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.3.5
+ * Bootstrap: transition.js v3.3.6
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2011-2015 Twitter, Inc.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-styl",
-  "description": "Port of the amazing Bootstrap 3.3.5 to Stylus",
+  "description": "Port of the amazing Bootstrap 3.3.6 to Stylus",
   "repository": {
     "type": "git",
     "url": "http://github.com/maxmx/bootstrap-stylus.git"
@@ -9,7 +9,7 @@
     "bootstrap",
     "stylus"
   ],
-  "version": "5.0.1",
+  "version": "5.0.2",
   "devDependencies": {
     "grunt": "~0.4.5",
     "stylus": "~0.47.0",