bootstrap-sass-rails 3.0.2.1 → 3.0.3.0

data/README.md

@@ -67,6 +67,26 @@ within `.css.scss` files.
 }
 ```
 
+You can also use the generator to generate custom bootstrap includes to override your variables and load only
+the components you need.
+
+```
+rails generate bootstrap:customize
+```
+
+Then you just need to include the bootstrap-custom file in your application.css
+
+```css
+@import "bootstrap-custom";
+```
+
+The generator has a `--css-components` option that includes all available bootstrap components in the
+custom include file. You can pick and choose what you need from there. There can be dependencies between
+the different components, please check the Bootstrap homepage for details.
+
+For the Javascript components there is a `--js-components` option. The same rules as for the CSS components
+apply, if you are unsure about the order and dependencies please check the upstream homepage.
+
 ### Javascripts
 
 Using the JavaScript works the same way. You can include them all with a

data/app/assets/javascripts/twitter/bootstrap/affix.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.2
+ * Bootstrap: affix.js v3.0.3
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/alert.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.2
+ * Bootstrap: alert.js v3.0.3
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/button.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.2
+ * Bootstrap: button.js v3.0.3
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -54,15 +54,21 @@
 
   Button.prototype.toggle = function () {
     var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true
 
     if ($parent.length) {
       var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
-        .trigger('change')
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
+      if ($input.prop('type') === 'radio') {
+        // see if clicking on current one
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }
 
-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
   }
 
 

data/app/assets/javascripts/twitter/bootstrap/carousel.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.2
+ * Bootstrap: carousel.js v3.0.3
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -69,7 +69,7 @@
 
     if (pos > (this.$items.length - 1) || pos < 0) return
 
-    if (this.sliding)       return this.$element.one('slid', function () { that.to(pos) })
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
     if (activeIndex == pos) return this.pause().cycle()
 
     return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -121,7 +121,7 @@
 
     if (this.$indicators.length) {
       this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid', function () {
+      this.$element.one('slid.bs.carousel', function () {
         var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
         $nextIndicator && $nextIndicator.addClass('active')
       })
@@ -139,7 +139,7 @@
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
         })
         .emulateTransitionEnd(600)
     } else {
@@ -148,7 +148,7 @@
       $active.removeClass('active')
       $next.addClass('active')
       this.sliding = false
-      this.$element.trigger('slid')
+      this.$element.trigger('slid.bs.carousel')
     }
 
     isCycling && this.cycle()

data/app/assets/javascripts/twitter/bootstrap/collapse.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.2
+ * Bootstrap: collapse.js v3.0.3
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/dropdown.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.2
+ * Bootstrap: dropdown.js v3.0.3
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -26,7 +26,7 @@
   var backdrop = '.dropdown-backdrop'
   var toggle   = '[data-toggle=dropdown]'
   var Dropdown = function (element) {
-    var $el = $(element).on('click.bs.dropdown', this.toggle)
+    $(element).on('click.bs.dropdown', this.toggle)
   }
 
   Dropdown.prototype.toggle = function (e) {
@@ -41,7 +41,7 @@
 
     if (!isActive) {
       if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we we use a backdrop because click events don't delegate
+        // if mobile we use a backdrop because click events don't delegate
         $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
       }
 
@@ -123,9 +123,9 @@
   $.fn.dropdown = function (option) {
     return this.each(function () {
       var $this = $(this)
-      var data  = $this.data('dropdown')
+      var data  = $this.data('bs.dropdown')
 
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }

data/app/assets/javascripts/twitter/bootstrap/modal.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.2
+ * Bootstrap: modal.js v3.0.3
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/popover.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.2
+ * Bootstrap: popover.js v3.0.3
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/scrollspy.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.2
+ * Bootstrap: scrollspy.js v3.0.3
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -113,7 +113,7 @@
         .addClass('active')
     }
 
-    active.trigger('activate')
+    active.trigger('activate.bs.scrollspy')
   }
 
 

data/app/assets/javascripts/twitter/bootstrap/tab.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.2
+ * Bootstrap: tab.js v3.0.3
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/javascripts/twitter/bootstrap/tooltip.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.2
+ * Bootstrap: tooltip.js v3.0.3
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================

data/app/assets/javascripts/twitter/bootstrap/transition.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.2
+ * Bootstrap: transition.js v3.0.3
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/stylesheets/twitter/bootstrap/_badges.scss

@@ -22,6 +22,12 @@
   &:empty {
     display: none;
   }
+
+  // Quick fix for badges in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }
 
 // Hover state, but only for links
@@ -34,12 +40,6 @@ a.badge {
   }
 }
 
-// Quick fix for labels/badges in buttons
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
 // Account for counters in navs
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {

data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss

@@ -2,37 +2,6 @@
 // Button groups
 // --------------------------------------------------
 
-// Button carets
-//
-// Match the button text color to the arrow/caret for indicating dropdown-ness.
-
-.caret {
-  .btn-default & {
-    border-top-color: $btn-default-color;
-  }
-  .btn-primary &,
-  .btn-success &,
-  .btn-warning &,
-  .btn-danger &,
-  .btn-info & {
-    border-top-color: #fff;
-  }
-}
-.dropup {
-  .btn-default .caret {
-    border-bottom-color: $btn-default-color;
-  }
-  .btn-primary,
-  .btn-success,
-  .btn-warning,
-  .btn-danger,
-  .btn-info {
-   .caret {
-      border-bottom-color: #fff;
-    }
-  }
-}
-
 // Make the div behave like a button
 .btn-group,
 .btn-group-vertical {
@@ -178,7 +147,8 @@
 
 .btn-group-vertical {
   > .btn,
-  > .btn-group {
+  > .btn-group,
+  > .btn-group > .btn {
     display: block;
     float: none;
     width: 100%;
@@ -238,11 +208,15 @@
   width: 100%;
   table-layout: fixed;
   border-collapse: separate;
-  .btn {
+  > .btn,
+  > .btn-group {
     float: none;
     display: table-cell;
     width: 1%;
   }
+  > .btn-group .btn {
+    width: 100%;
+  }
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss

@@ -6,7 +6,6 @@
 // Base styles
 // --------------------------------------------------
 
-// Core styles
 .btn {
   display: inline-block;
   margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
     @include opacity(.65);
     @include box-shadow(none);
   }
-
 }
 
 
@@ -123,13 +121,12 @@
   // line-height: ensure even-numbered height of button next to large input
   @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
 }
-.btn-sm,
-.btn-xs {
+.btn-sm {
   // line-height: ensure proper height of button next to small input
   @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 .btn-xs {
-  padding: 1px 5px;
+  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss

@@ -91,6 +91,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
+    outline: none;
     color: $carousel-control-color;
     text-decoration: none;
     @include opacity(.9);

data/app/assets/stylesheets/twitter/bootstrap/_close.scss

@@ -21,6 +21,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="#"`.

data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss

@@ -10,12 +10,9 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   $caret-width-base solid $dropdown-caret-color;
+  border-top:   $caret-width-base solid;
   border-right: $caret-width-base solid transparent;
   border-left:  $caret-width-base solid transparent;
-  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
-  // we can just straight up remove this.
-  border-bottom: 0 dotted;
 }
 
 // The dropdown wrapper (div)
@@ -163,10 +160,8 @@
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
-    // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
-    // gets fixed, restore `border-top: 0;`.
-    border-top: 0 dotted;
-    border-bottom: $caret-width-base solid $dropdown-caret-color;
+    border-top: 0;
+    border-bottom: $caret-width-base solid;
     content: "";
   }
   // Different positioning for bottom up menu

data/app/assets/stylesheets/twitter/bootstrap/_forms.scss

@@ -152,6 +152,7 @@ output {
   }
 }
 
+
 // Reset height for `textarea`s
 textarea.form-control {
   height: auto;
@@ -306,6 +307,11 @@ input[type="checkbox"],
       display: inline-block;
     }
 
+    // Override `width: 100%;` when not within a `.form-group`
+    select.form-control {
+      width: auto;
+    }
+
     // 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).
@@ -342,6 +348,12 @@ input[type="checkbox"],
     margin-bottom: 0;
     padding-top: ($padding-base-vertical + 1); // Default padding plus a border
   }
+  // Account for padding we're adding to ensure the alignment and of help text
+  // and other content below items
+  .radio,
+  .checkbox {
+    min-height: $line-height-computed + ($padding-base-vertical + 1);
+  }
 
   // Make form groups behave like rows
   .form-group {

data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss

@@ -14,7 +14,7 @@
   src: font-url("#{$icon-font-path}#{$icon-font-name}.eot?#iefix") format('embedded-opentype'),
        font-url("#{$icon-font-path}#{$icon-font-name}.woff") format('woff'),
        font-url("#{$icon-font-path}#{$icon-font-name}.ttf") format('truetype'),
-       font-url("#{$icon-font-path}#{$icon-font-name}.svg#glyphicons_halflingsregular") format('svg');
+       font-url("#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular") format('svg');
 }
 
 // Catchall baseclass

data/app/assets/stylesheets/twitter/bootstrap/_grid.scss

@@ -5,6 +5,16 @@
 // Set the container width, and override it for fixed navbars in media queries
 .container {
   @include container-fixed();
+
+  @media (min-width: $screen-sm) {
+    width: $container-sm;
+  }
+  @media (min-width: $screen-md) {
+    width: $container-md;
+  }
+  @media (min-width: $screen-lg-min) {
+    width: $container-lg;
+  }
 }
 
 // mobile first defaults
@@ -18,11 +28,8 @@
 
 // Extra small grid
 //
-// Grid classes for extra small devices like smartphones. No offset, push, or
-// pull classes are present here due to the size of the target.
-//
-// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
 
 @include make-grid-columns-float(xs);
 @include make-grid($grid-columns, xs, width);
@@ -35,15 +42,8 @@
 //
 // Columns, offsets, pushes, and pulls for the small device range, from phones
 // to tablets.
-//
-// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
 
 @media (min-width: $screen-sm-min) {
-  .container {
-    width: $container-sm;
-  }
-
   @include make-grid-columns-float(sm);
   @include make-grid($grid-columns, sm, width);
   @include make-grid($grid-columns, sm, pull);
@@ -55,15 +55,8 @@
 // Medium grid
 //
 // Columns, offsets, pushes, and pulls for the desktop device range.
-//
-// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
 
 @media (min-width: $screen-md-min) {
-  .container {
-    width: $container-md;
-  }
-
   @include make-grid-columns-float(md);
   @include make-grid($grid-columns, md, width);
   @include make-grid($grid-columns, md, pull);
@@ -75,15 +68,8 @@
 // Large grid
 //
 // Columns, offsets, pushes, and pulls for the large desktop device range.
-//
-// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
 
 @media (min-width: $screen-lg-min) {
-  .container {
-    width: $container-lg;
-  }
-
   @include make-grid-columns-float(lg);
   @include make-grid($grid-columns, lg, width);
   @include make-grid($grid-columns, lg, pull);