bootstrap-sass 3.0.1.0 → 3.0.3.0

data/test/sass_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class SassTest < Test::Unit::TestCase
+  DUMMY_PATH = 'test/dummy_sass_only'
+
+  def test_font_helper
+    assert_match %r(url\(['"]?.*eot['"]?\)), @css
+  end
+
+  def setup
+    Dir.chdir DUMMY_PATH do
+      %x[bundle]
+    end
+    css_path = File.join Bootstrap.gem_path, 'tmp/bootstrap-sass-only.css'
+    command = "bundle exec ruby compile.rb #{css_path}"
+    Dir.chdir DUMMY_PATH do
+      assert silence_stream(STDOUT) {
+        system(command)
+      }, 'Sass-only compilation failed'
+    end
+    @css = File.read(css_path)
+  end
+end

data/test/test_helper.rb

@@ -6,7 +6,6 @@ require File.expand_path('dummy/config/environment', File.dirname(__FILE__))
 require 'test/unit'
 
 require 'sass'
-require 'lib/bootstrap-sass/compass_functions'
 require 'lib/bootstrap-sass/sass_functions'
 
 require 'rails/test_help'

data/vendor/assets/javascripts/bootstrap/affix.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.1
+ * Bootstrap: affix.js v3.0.3
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -123,4 +123,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/alert.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.1
+ * Bootstrap: alert.js v3.0.3
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -95,4 +95,4 @@
 
   $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/button.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.1
+ * 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')
   }
 
 
@@ -106,4 +112,4 @@
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/carousel.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.1
+ * 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()
@@ -214,4 +214,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/collapse.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.1
+ * Bootstrap: collapse.js v3.0.3
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -176,4 +176,4 @@
     $target.collapse(option)
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/dropdown.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.1
+ * 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)
     })
   }
@@ -151,4 +151,4 @@
     .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/modal.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.1
+ * Bootstrap: modal.js v3.0.3
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -243,4 +243,4 @@
     .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/popover.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.1
+ * Bootstrap: popover.js v3.0.3
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -114,4 +114,4 @@
     return this
   }
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/scrollspy.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.1
+ * 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')
   }
 
 
@@ -155,4 +155,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/tab.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.1
+ * Bootstrap: tab.js v3.0.3
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -132,4 +132,4 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/tooltip.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.1
+ * Bootstrap: tooltip.js v3.0.3
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -383,4 +383,4 @@
     return this
   }
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/javascripts/bootstrap/transition.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.1
+ * Bootstrap: transition.js v3.0.3
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -53,4 +53,4 @@
     $.support.transition = transitionEnd()
   })
 
-}(window.jQuery);
+}(jQuery);

data/vendor/assets/stylesheets/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/vendor/assets/stylesheets/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/vendor/assets/stylesheets/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/vendor/assets/stylesheets/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/vendor/assets/stylesheets/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/vendor/assets/stylesheets/bootstrap/_forms.scss

@@ -92,14 +92,6 @@ output {
   vertical-align: middle;
 }
 
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
-  @include placeholder();
-}
-
 
 // Common form controls
 //
@@ -142,6 +134,12 @@ output {
   // Customize the `:focus` state to imitate native WebKit styles.
   @include form-control-focus();
 
+  // Placeholder
+  //
+  // Placeholder text gets special styles because when browsers invalidate entire
+  // lines if it doesn't understand a selector/
+  @include placeholder();
+
   // Disabled and read-only inputs
   // Note: HTML5 says that controls under a fieldset > legend:first-child won't
   // be disabled if the fieldset is disabled. Due to implementation difficulty,
@@ -310,6 +308,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).
@@ -346,6 +349,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/vendor/assets/stylesheets/bootstrap/_glyphicons.scss

@@ -10,11 +10,11 @@
 // Import the fonts
 @font-face {
   font-family: 'Glyphicons Halflings';
-  src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
-  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');
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular'), '#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular')) format('svg');
 }
 
 // Catchall baseclass

data/vendor/assets/stylesheets/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);

data/vendor/assets/stylesheets/bootstrap/_input-groups.scss

@@ -10,7 +10,7 @@
   border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
 
   // Undo padding and float of grid classes
-  &.col {
+  &[class*="col-"] {
     float: none;
     padding-left: 0;
     padding-right: 0;

data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss

@@ -12,7 +12,8 @@
   color: $jumbotron-color;
   background-color: $jumbotron-bg;
 
-  h1 {
+  h1,
+  .h1 {
     line-height: 1;
     color: $jumbotron-heading-color;
   }
@@ -24,6 +25,10 @@
     border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
+  .container {
+    max-width: 100%;
+  }
+
   @media screen and (min-width: $screen-sm-min) {
     padding-top:    ($jumbotron-padding * 1.6);
     padding-bottom: ($jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
       padding-right: ($jumbotron-padding * 2);
     }
 
-    h1 {
+    h1,
+    .h1 {
       font-size: ($font-size-base * 4.5);
     }
   }

data/vendor/assets/stylesheets/bootstrap/_labels.scss

@@ -28,6 +28,12 @@
   &:empty {
     display: none;
   }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }
 
 // Colors