Merge branch 'release/3.0.0.0'

* release/3.0.0.0:
  Bump version to 3.0.0.0
  Update to Bootstrap 3.0.0
  Glyphicons is now officially part of BS3
  Integrate changes up to twbs/bootstrap@c0f477a
  Integrate changes up to twbs/bootstrap@fee3f1e
  Integrate changes up to twbs/bootstrap@b9620a1
  Integrate changes up to twbs/bootstrap@13d2616

Author: mjonuschat

README.md

@@ -67,26 +67,6 @@ within `.css.scss` files.
 }
 ```
 
-### Icon Fonts
-
-To ease the common use case of extending Twitter Bootstrap with a icon
-font the official [Glyphicons for Bootstrap]() icon font has been
-included in this gem.
-
-You can use it like this
-
-```css
-/*
- *= require twitter/bootstrap/_glyphicons.scss
- */
-```
-
-or
-
-```css
-@import "twitter/bootstrap/glyphicons";
-```
-
 ### Javascripts
 
 Using the JavaScript works the same way. You can include them all with a

app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot

@@ -40,7 +40,7 @@
     clearMenus()
 
     if (!isActive) {
-      if ('ontouchstart' in document.documentElement) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
         // if mobile we we use a backdrop because click events don't delegate
         $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
       }
@@ -52,9 +52,9 @@
       $parent
         .toggleClass('open')
         .trigger('shown.bs.dropdown')
-    }
 
-    $this.focus()
+      $this.focus()
+    }
 
     return false
   }

app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg

@@ -25,7 +25,7 @@
 
   var Modal = function (element, options) {
     this.options   = options
-    this.$element  = $(element).on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+    this.$element  = $(element)
     this.$backdrop =
     this.isShown   = null
 
@@ -54,6 +54,8 @@
 
     this.escape()
 
+    this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
     this.backdrop(function () {
       var transition = $.support.transition && that.$element.hasClass('fade')
 
@@ -76,7 +78,7 @@
       var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
 
       transition ?
-        that.$element
+        that.$element.find('.modal-dialog') // wait for modal to slide in
           .one($.support.transition.end, function () {
             that.$element.focus().trigger(e)
           })
@@ -238,7 +240,7 @@
   })
 
   $(document)
-    .on('shown.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
 }(window.jQuery);

app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf

@@ -108,10 +108,11 @@
 
     clearTimeout(self.timeout)
 
+    self.hoverState = 'in'
+
     if (!self.options.delay || !self.options.delay.show) return self.show()
 
-    self.hoverState = 'in'
-    self.timeout    = setTimeout(function () {
+    self.timeout = setTimeout(function () {
       if (self.hoverState == 'in') self.show()
     }, self.options.delay.show)
   }
@@ -122,10 +123,11 @@
 
     clearTimeout(self.timeout)
 
+    self.hoverState = 'out'
+
     if (!self.options.delay || !self.options.delay.hide) return self.hide()
 
-    self.hoverState = 'out'
-    self.timeout    = setTimeout(function () {
+    self.timeout = setTimeout(function () {
       if (self.hoverState == 'out') self.hide()
     }, self.options.delay.hide)
   }
@@ -258,7 +260,9 @@
     var $tip = this.tip()
     var e    = $.Event('hide.bs.' + this.type)
 
-    function complete() { $tip.detach() }
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
+    }
 
     this.$element.trigger(e)
 

app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff

@@ -42,7 +42,7 @@
 
   // http://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el    = this
+    var called = false, $el = this
     $(this).one($.support.transition.end, function () { called = true })
     var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
     setTimeout(callback, duration)

app/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.eot

@@ -21,43 +21,39 @@
 @import "twitter/bootstrap/type";
 @import "twitter/bootstrap/code";
 @import "twitter/bootstrap/grid";
-
 @import "twitter/bootstrap/tables";
 @import "twitter/bootstrap/forms";
 @import "twitter/bootstrap/buttons";
 
-// Components: common
+// Components
 @import "twitter/bootstrap/component-animations";
-@import "twitter/bootstrap/input-groups";
+@import "twitter/bootstrap/glyphicons";
 @import "twitter/bootstrap/dropdowns";
-@import "twitter/bootstrap/list-group";
-@import "twitter/bootstrap/panels";
-@import "twitter/bootstrap/wells";
-@import "twitter/bootstrap/close";
-
-// Components: Nav
+@import "twitter/bootstrap/button-groups";
+@import "twitter/bootstrap/input-groups";
 @import "twitter/bootstrap/navs";
 @import "twitter/bootstrap/navbar";
-@import "twitter/bootstrap/button-groups";
 @import "twitter/bootstrap/breadcrumbs";
 @import "twitter/bootstrap/pagination";
 @import "twitter/bootstrap/pager";
+@import "twitter/bootstrap/labels";
+@import "twitter/bootstrap/badges";
+@import "twitter/bootstrap/jumbotron";
+@import "twitter/bootstrap/thumbnails";
+@import "twitter/bootstrap/alerts";
+@import "twitter/bootstrap/progress-bars";
+@import "twitter/bootstrap/media";
+@import "twitter/bootstrap/list-group";
+@import "twitter/bootstrap/panels";
+@import "twitter/bootstrap/wells";
+@import "twitter/bootstrap/close";
 
-// Components: Popovers
+// Components w/ JavaScript
 @import "twitter/bootstrap/modals";
 @import "twitter/bootstrap/tooltip";
 @import "twitter/bootstrap/popovers";
-
-// Components: Misc
-@import "twitter/bootstrap/alerts";
-@import "twitter/bootstrap/thumbnails";
-@import "twitter/bootstrap/media";
-@import "twitter/bootstrap/labels";
-@import "twitter/bootstrap/badges";
-@import "twitter/bootstrap/progress-bars";
 @import "twitter/bootstrap/carousel";
-@import "twitter/bootstrap/jumbotron";
 
 // Utility classes
-@import "twitter/bootstrap/utilities"; // Has to be last to override when necessary
+@import "twitter/bootstrap/utilities";
 @import "twitter/bootstrap/responsive-utilities";

app/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.otf

@@ -9,9 +9,7 @@
 .alert {
   padding: $alert-padding;
   margin-bottom: $line-height-computed;
-  color: $alert-text;
-  background-color: $alert-bg;
-  border: 1px solid $alert-border;
+  border: 1px solid transparent;
   border-radius: $alert-border-radius;
 
   // Headings for larger alerts
@@ -20,14 +18,9 @@
     // Specified for the h4 to prevent conflicts of changing $headingsColor
     color: inherit;
   }
-  // Match the hr to the border of the alert
-  hr {
-    border-top-color: darken($alert-border, 5%);
-  }
   // Provide class for links that match alerts
   .alert-link {
     font-weight: $alert-link-font-weight;
-    color: darken($alert-text, 10%);
   }
 
   // Improve alignment and spacing of inner content
@@ -63,9 +56,12 @@
 .alert-success {
   @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
 }
-.alert-danger {
-  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
-}
 .alert-info {
   @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
 }
+.alert-warning {
+  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
+}
+.alert-danger {
+  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
+}

app/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.svg

@@ -18,16 +18,18 @@
     border-top-color: #fff;
   }
 }
-.dropup .caret {
-  .btn-default & {
+.dropup {
+  & .btn-default .caret {
     border-bottom-color: $btn-default-color;
   }
-  .btn-primary &,
-  .btn-success &,
-  .btn-warning &,
-  .btn-danger &,
-  .btn-info & {
-    border-bottom-color: #fff;
+  .btn-primary,
+  .btn-success,
+  .btn-warning,
+  .btn-danger,
+  .btn-info {
+   .caret {
+      border-bottom-color: #fff;
+    }
   }
 }
 
@@ -157,11 +159,12 @@
 }
 // Carets in other button sizes
 .btn-lg .caret {
-  border-width: $caret-width-large;
+  border-width: $caret-width-large $caret-width-large 0;
+  border-bottom-width: 0;
 }
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
-  border-bottom-width: $caret-width-large;
+  border-width: 0 $caret-width-large $caret-width-large;
 }
 
 
@@ -229,6 +232,7 @@
   display: table;
   width: 100%;
   table-layout: fixed;
+  border-collapse: separate;
   .btn {
     float: none;
     display: table-cell;

app/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.ttf

@@ -35,13 +35,14 @@
   &:active,
   &.active {
     outline: 0;
+    background-image: none;
     @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
-    cursor: default;
+    cursor: not-allowed;
     pointer-events: none; // Future-proof disabling of clicks
     @include opacity(.65);
     @include box-shadow(none);
@@ -53,28 +54,16 @@
 // Alternate buttons
 // --------------------------------------------------
 
-.btn-default {
-  @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
-}
-.btn-primary {
-  @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
-}
+@include button-variant('.btn-default', $btn-default-color, $btn-default-bg, $btn-default-border);
+@include button-variant('.btn-primary', $btn-primary-color, $btn-primary-bg, $btn-primary-border);
 // Warning appears as orange
-.btn-warning {
-  @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
-}
+@include button-variant('.btn-warning', $btn-warning-color, $btn-warning-bg, $btn-warning-border);
 // Danger and error appear as red
-.btn-danger {
-  @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
-}
+@include button-variant('.btn-danger', $btn-danger-color, $btn-danger-bg, $btn-danger-border);
 // Success appears as green
-.btn-success {
-  @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
-}
+@include button-variant('.btn-success', $btn-success-color, $btn-success-bg, $btn-success-border);
 // Info appears as blue-green
-.btn-info {
-  @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
-}
+@include button-variant('.btn-info', $btn-info-color, $btn-info-bg, $btn-info-border);
 
 
 // Link buttons
@@ -130,7 +119,7 @@
   @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 .btn-xs {
-  padding: 3px 5px;
+  padding: 1px 5px;
 }
 
 

app/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.woff

@@ -21,7 +21,7 @@
     // Account for jankitude on images
     > img,
     > a > img {
-      @extend .img-responsive;
+      @include img-responsive();
       line-height: 1;
     }
   }
@@ -98,12 +98,17 @@
 
   // Toggles
   .icon-prev,
-  .icon-next {
+  .icon-next,
+  .glyphicon-chevron-left,
+  .glyphicon-chevron-right {
     position: absolute;
     top: 50%;
     left: 50%;
     z-index: 5;
     display: inline-block;
+  }
+  .icon-prev,
+  .icon-next {
     width:  20px;
     height: 20px;
     margin-top: -10px;