bootstrap-sass 1.4.0 → 1.4.1

data/README.md

@@ -8,7 +8,7 @@ Enjoy.
 
 In your gemfile:
 
-    gem 'bootstrap-sass', '1.4.0'
+    gem 'bootstrap-sass', '1.4.1'
 
 ### CSS
 
@@ -16,6 +16,13 @@ In your SCSS file of choice:
 
     @import "bootstrap"; /* Use this to get all of Bootstrap's @mixins and $variables */
 
+Want to configure a variable? Thanks to bernado, this is now awesome *and* easy! Just define the variables you want to change *before* importing Bootstrap. SASS will respect your existing definition and won't overwrite it with the Bootstrap defaults.
+
+    $gridColumns: 12;
+    $gridColumnWidth: 60px;
+    $gridGutterWidth: 20px;
+    @import "bootstrap";
+
 ### Javascript
 
 In your Javascript manifest:

data/vendor/assets/javascripts/bootstrap-alerts.js

@@ -54,6 +54,7 @@
   * ====================== */
 
   var Alert = function ( content, options ) {
+    if (options == 'close') return this.close.call(content)
     this.settings = $.extend({}, $.fn.alert.defaults, options)
     this.$element = $(content)
       .delegate(this.settings.selector, 'click', this.close)
@@ -62,7 +63,10 @@
   Alert.prototype = {
 
     close: function (e) {
-      var $element = $(this).parent('.alert-message')
+      var $element = $(this)
+        , className = 'alert-message'
+
+      $element = $element.hasClass(className) ? $element : $element.parent()
 
       e && e.preventDefault()
       $element.removeClass('in')
@@ -90,9 +94,16 @@
 
     return this.each(function () {
       var $this = $(this)
+        , data
 
       if ( typeof options == 'string' ) {
-        return $this.data('alert')[options]()
+
+        data = $this.data('alert')
+
+        if (typeof data == 'object') {
+          return data[options].call( $this )
+        }
+
       }
 
       $(this).data('alert', new Alert( this, options ))

data/vendor/assets/javascripts/bootstrap-buttons.js

@@ -1,6 +1,6 @@
 /* ============================================================
  * bootstrap-buttons.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#dropdown
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2011 Twitter, Inc.
  *
@@ -31,9 +31,11 @@
 
     $el.html( data[state] || $.fn.button.defaults[state] )
 
-    state == 'loadingText' ?
-      $el.addClass(d).attr(d, d) :
-      $el.removeClass(d).removeAttr(d)
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
   }
 
   function toggle(el) {

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

@@ -37,7 +37,7 @@
     setContent: function () {
       var $tip = this.tip()
       $tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle())
-      $tip.find('.content p')[this.options.html ? 'html' : 'text'](this.getContent())
+      $tip.find('.content > *')[this.options.html ? 'html' : 'text'](this.getContent())
       $tip[0].className = 'popover'
     }
 
@@ -51,10 +51,11 @@
        , o = this.options
 
       if (typeof this.options.content == 'string') {
-        content = this.options.content
+        content = $e.attr(this.options.content)
       } else if (typeof this.options.content == 'function') {
         content = this.options.content.call(this.$element[0])
       }
+
       return content
     }
 
@@ -80,7 +81,10 @@
 
   $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
     placement: 'right'
+  , content: 'data-content'
   , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
   })
 
+  $.fn.twipsy.rejectAttrOptions.push( 'content' )
+
 }( window.jQuery || window.ender );

data/vendor/assets/javascripts/bootstrap-twipsy.js

@@ -168,10 +168,7 @@
     }
 
   , tip: function() {
-      if (!this.$tip) {
-        this.$tip = $('<div class="twipsy" />').html(this.options.template)
-      }
-      return this.$tip
+      return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template)
     }
 
   , validate: function() {
@@ -194,6 +191,10 @@
       this.enabled = !this.enabled
     }
 
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
   }
 
 
@@ -303,8 +304,18 @@
   , template: '<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>'
   }
 
+  $.fn.twipsy.rejectAttrOptions = [ 'title' ]
+
   $.fn.twipsy.elementOptions = function(ele, options) {
-    return $.extend({}, options, $(ele).data())
+    var data = $(ele).data()
+      , rejects = $.fn.twipsy.rejectAttrOptions
+      , i = rejects.length
+
+    while (i--) {
+      delete data[rejects[i]]
+    }
+
+    return $.extend({}, options, data)
   }
 
 }( window.jQuery || window.ender );

data/vendor/assets/stylesheets/bootstrap/forms.css.scss

@@ -100,7 +100,7 @@ input[type=button], input[type=reset], input[type=submit] {
 
 select, input[type=file] {
   height: $baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
-  height: auto; // reset for IE7. bah.
+  *height: auto; // reset for IE7. bah.
   line-height: $baseline * 1.5;
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
 }

data/vendor/assets/stylesheets/bootstrap/mixins.css.scss

@@ -166,7 +166,7 @@
   background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
   background-image: linear-gradient(left, $startColor, $endColor); // Le standard
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=1); // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=1); // IE9 and down
 }
 @mixin vertical-gradient($startColor: #555, $endColor: #333) {
   background-color: $endColor;
@@ -178,7 +178,7 @@
   background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
   background-image: linear-gradient(top, $startColor, $endColor); // The standard
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=0); // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0); // IE9 and down
 }
 @mixin directional-gradient($startColor: #555, $endColor: #333, $deg: 45deg) {
   background-color: $endColor;
@@ -198,7 +198,7 @@
   background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
 }
 
 // Reset filters for IE

data/vendor/assets/stylesheets/bootstrap/patterns.css.scss

@@ -398,7 +398,7 @@ a.menu:after, .dropdown-toggle:after {
 // Tabbable areas
 .tab-content, .pill-content {
 }
-.tab-content > .tab-pane, .pill-content > .pill-pane {
+.tab-content > .tab-pane, .pill-content > .pill-pane, .tab-content > div, .pill-content > div {
   display: none;
 }
 .tab-content > .active, .pill-content > .active {
@@ -950,7 +950,7 @@ button.btn, input[type=submit].btn {
 
 .label {
   padding: 1px 3px 2px;
-  font-size: $basefont * .75;
+  font-size: $basefont * 0.75;
   font-weight: bold;
   color: $white;
   text-transform: uppercase;

data/vendor/assets/stylesheets/bootstrap/scaffolding.css.scss

@@ -106,23 +106,24 @@ a {
 
 // Offset column options
 .row {
-  & > .offset1   { @include offset(1); }
-  & > .offset2   { @include offset(2); }
-  & > .offset3   { @include offset(3); }
-  & > .offset4   { @include offset(4); }
-  & > .offset5   { @include offset(5); }
-  & > .offset6   { @include offset(6); }
-  & > .offset7   { @include offset(7); }
-  & > .offset8   { @include offset(8); }
-  & > .offset9   { @include offset(9); }
-  & > .offset10  { @include offset(10); }
-  & > .offset11  { @include offset(11); }
-  & > .offset12  { @include offset(12); }
+  > .offset1   { @include offset(1); }
+  > .offset2   { @include offset(2); }
+  > .offset3   { @include offset(3); }
+  > .offset4   { @include offset(4); }
+  > .offset5   { @include offset(5); }
+  > .offset6   { @include offset(6); }
+  > .offset7   { @include offset(7); }
+  > .offset8   { @include offset(8); }
+  > .offset9   { @include offset(9); }
+  > .offset10  { @include offset(10); }
+  > .offset11  { @include offset(11); }
+  > .offset12  { @include offset(12); }
 }
 
 // Unique column sizes for 16-column grid
 .span-one-third     { width: 300px; }
 .span-two-thirds    { width: 620px; }
-.offset-one-third   { margin-left: 340px; }
-.offset-two-thirds  { margin-left: 660px; }
-
+.row {
+ > .offset-one-third   { margin-left: 340px; }
+ > .offset-two-thirds  { margin-left: 660px; }
+}

data/vendor/assets/stylesheets/bootstrap/tables.css.scss

@@ -36,7 +36,7 @@ table {
 
 // Condensed table
 .condensed-table {
-  .th, .td {
+  th, td {
     padding: 5px 5px 4px;
   }
 }

data/vendor/assets/stylesheets/bootstrap/variables.css.scss

@@ -3,49 +3,49 @@
  * ----------------------------------------------------- */
 
 // Links
-$linkColor:         #0069d6;
-$linkColorHover:    darken($linkColor, 15);
+$linkColor:         #0069d6 !default;
+$linkColorHover:    darken($linkColor, 15) !default;
 
 // Grays
-$black:             #000;
-$grayDark:          lighten($black, 25%);
-$gray:              lighten($black, 50%);
-$grayLight:         lighten($black, 75%);
-$grayLighter:       lighten($black, 90%);
-$white:             #fff;
+$black:             #000 !default;
+$grayDark:          lighten($black, 25%) !default;
+$gray:              lighten($black, 50%) !default;
+$grayLight:         lighten($black, 75%) !default;
+$grayLighter:       lighten($black, 90%) !default;
+$white:             #fff !default;
 
 // Accent Colors
-$blue:              #049CDB;
-$blueDark:          #0064CD;
-$green:             #46a546;
-$red:               #9d261d;
-$yellow:            #ffc40d;
-$orange:            #f89406;
-$pink:              #c3325f;
-$purple:            #7a43b6;
+$blue:              #049CDB !default;
+$blueDark:          #0064CD !default;
+$green:             #46a546 !default;
+$red:               #9d261d !default;
+$yellow:            #ffc40d !default;
+$orange:            #f89406 !default;
+$pink:              #c3325f !default;
+$purple:            #7a43b6 !default;
 
 // Baseline grid
-$basefont:          13px;
-$baseline:          18px;
+$basefont:          13px !default;
+$baseline:          18px !default;
 
 // Griditude
 // Modify the grid styles in mixins.less
-$gridColumns:       16;
-$gridColumnWidth:   40px;
-$gridGutterWidth:   20px;
-$extraSpace:        ($gridGutterWidth * 2); // For our grid calculations
-$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
+$gridColumns:       16 !default;
+$gridColumnWidth:   40px !default;
+$gridGutterWidth:   20px !default;
+$extraSpace:        ($gridGutterWidth * 2) !default; // For our grid calculations
+$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
 
 // Color Scheme
 // Use this to roll your own color schemes if you like (unused by Bootstrap by default)
-$baseColor:         $blue;                  // Set a base color
-$complement:        spin($baseColor, 180);  // Determine a complementary color
-$split1:            spin($baseColor, 158);  // Split complements
-$split2:            spin($baseColor, -158);
-$triad1:            spin($baseColor, 135);  // Triads colors
-$triad2:            spin($baseColor, -135);
-$tetra1:            spin($baseColor, 90);   // Tetra colors
-$tetra2:            spin($baseColor, -90);
-$analog1:           spin($baseColor, 22);   // Analogs colors
-$analog2:           spin($baseColor, -22);
+$baseColor:         $blue !default;                  // Set a base color
+$complement:        spin($baseColor, 180) !default;  // Determine a complementary color
+$split1:            spin($baseColor, 158) !default;  // Split complements
+$split2:            spin($baseColor, -158) !default;
+$triad1:            spin($baseColor, 135) !default;  // Triads colors
+$triad2:            spin($baseColor, -135) !default;
+$tetra1:            spin($baseColor, 90) !default;   // Tetra colors
+$tetra2:            spin($baseColor, -90) !default;
+$analog1:           spin($baseColor, 22) !default;   // Analogs colors
+$analog2:           spin($baseColor, -22) !default;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70249967724180 !ruby/object:Gem::Requirement
+  requirement: &70344330905660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249967724180
+  version_requirements: *70344330905660
 description: 
 email: tom@conceptcoding.co.uk
 executables: []