bootstrap-generators 2.1.1 → 2.2.1

data/README.md

@@ -205,6 +205,24 @@ LESS version:
     @headingsFontWeight:    bold;    // instead of browser default, bold
     @headingsColor:         inherit; // empty to use BS default, @textColor
 
+
+    // Component sizing
+    // -------------------------
+    // Based on 14px font-size and 20px line-height
+
+    @fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+    @fontSizeSmall:         @baseFontSize * 0.85; // ~12px
+    @fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+    @paddingLarge:          11px 19px; // 44px
+    @paddingSmall:          2px 10px;  // 26px
+    @paddingMini:           1px 6px;   // 24px
+
+    @baseBorderRadius:      4px;
+    @borderRadiusLarge:     6px;
+    @borderRadiusSmall:     3px;
+
+
     // Tables
     // -------------------------
     @tableBackground:                   transparent; // overall background-color
@@ -241,9 +259,11 @@ LESS version:
     // -------------------------
     @inputBackground:               @white;
     @inputBorder:                   #ccc;
-    @inputBorderRadius:             3px;
+    @inputBorderRadius:             @baseBorderRadius;
     @inputDisabledBackground:       @grayLighter;
     @formActionsBackground:         #f5f5f5;
+    @inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
     // Dropdowns
     // -------------------------
@@ -264,6 +284,7 @@ LESS version:
     // COMPONENT VARIABLES
     // --------------------------------------------------
 
+
     // Z-index master list
     // -------------------------
     // Used for a bird's eye view of components dependent on the z-axis
@@ -305,6 +326,7 @@ LESS version:
     // Navbar
     // -------------------------
     @navbarCollapseWidth:             979px;
+    @navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
     @navbarHeight:                    40px;
     @navbarBackgroundHighlight:       #ffffff;
@@ -487,6 +509,24 @@ SCSS version:
     $headingsFontWeight:    bold !default;    // instead of browser default, bold
     $headingsColor:         inherit !default; // empty to use BS default, $textColor
 
+
+    // Component sizing
+    // -------------------------
+    // Based on 14px font-size and 20px line-height
+
+    $fontSizeLarge:         $baseFontSize * 1.25; // ~18px
+    $fontSizeSmall:         $baseFontSize * 0.85; // ~12px
+    $fontSizeMini:          $baseFontSize * 0.75; // ~11px
+
+    $paddingLarge:          11px 19px; // 44px
+    $paddingSmall:          2px 10px;  // 26px
+    $paddingMini:           1px 6px;   // 24px
+
+    $baseBorderRadius:      4px;
+    $borderRadiusLarge:     6px;
+    $borderRadiusSmall:     3px;
+
+
     // Tables
     // -------------------------
     $tableBackground:                   transparent !default; // overall background-color
@@ -523,9 +563,11 @@ SCSS version:
     // -------------------------
     $inputBackground:               $white !default;
     $inputBorder:                   #ccc !default;
-    $inputBorderRadius:             3px !default;
+    $inputBorderRadius:             $baseBorderRadius !default;
     $inputDisabledBackground:       $grayLighter !default;
     $formActionsBackground:         #f5f5f5 !default;
+    $inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
     // Dropdowns
     // -------------------------
@@ -546,6 +588,7 @@ SCSS version:
     // COMPONENT VARIABLES
     // --------------------------------------------------
 
+
     // Z-index master list
     // -------------------------
     // Used for a bird's eye view of components dependent on the z-axis
@@ -587,6 +630,7 @@ SCSS version:
     // Navbar
     // -------------------------
     $navbarCollapseWidth:             979px !default;
+    $navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
 
     $navbarHeight:                    40px !default;
     $navbarBackgroundHighlight:       #ffffff !default;
@@ -598,7 +642,7 @@ SCSS version:
     $navbarLinkColorHover:            $grayDark !default;
     $navbarLinkColorActive:           $gray !default;
     $navbarLinkBackgroundHover:       transparent !default;
-    $navbarLinkBackgroundActive:      darken($navbarBackground, 5.25%) !default;
+    $navbarLinkBackgroundActive:      darken($navbarBackground, 5%) !default;
 
     $navbarBrandColor:                $navbarLinkColor !default;
 
@@ -676,6 +720,7 @@ SCSS version:
     // GRID
     // --------------------------------------------------
 
+
     // Default 940px grid
     // -------------------------
     $gridColumns:             12 !default;

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = "2.1.1"
+    VERSION = "2.2.1"
   end
 end

data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss

@@ -57,6 +57,24 @@ $headingsFontFamily:    inherit !default; // empty to use BS default, $baseFontF
 $headingsFontWeight:    bold !default;    // instead of browser default, bold
 $headingsColor:         inherit !default; // empty to use BS default, $textColor
 
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+$fontSizeLarge:         $baseFontSize * 1.25; // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85; // ~12px
+$fontSizeMini:          $baseFontSize * 0.75; // ~11px
+
+$paddingLarge:          11px 19px; // 44px
+$paddingSmall:          2px 10px;  // 26px
+$paddingMini:           1px 6px;   // 24px
+
+$baseBorderRadius:      4px;
+$borderRadiusLarge:     6px;
+$borderRadiusSmall:     3px;
+
+
 // Tables
 // -------------------------
 $tableBackground:                   transparent !default; // overall background-color
@@ -93,9 +111,11 @@ $btnInverseBackgroundHighlight:     $grayDarker !default;
 // -------------------------
 $inputBackground:               $white !default;
 $inputBorder:                   #ccc !default;
-$inputBorderRadius:             3px !default;
+$inputBorderRadius:             $baseBorderRadius !default;
 $inputDisabledBackground:       $grayLighter !default;
 $formActionsBackground:         #f5f5f5 !default;
+$inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
@@ -116,6 +136,7 @@ $dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive !default;
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -157,6 +178,7 @@ $wellBackground:                  #f5f5f5 !default;
 // Navbar
 // -------------------------
 $navbarCollapseWidth:             979px !default;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
 
 $navbarHeight:                    40px !default;
 $navbarBackgroundHighlight:       #ffffff !default;
@@ -168,7 +190,7 @@ $navbarLinkColor:                 #777 !default;
 $navbarLinkColorHover:            $grayDark !default;
 $navbarLinkColorActive:           $gray !default;
 $navbarLinkBackgroundHover:       transparent !default;
-$navbarLinkBackgroundActive:      darken($navbarBackground, 5.25%) !default;
+$navbarLinkBackgroundActive:      darken($navbarBackground, 5%) !default;
 
 $navbarBrandColor:                $navbarLinkColor !default;
 
@@ -246,6 +268,7 @@ $popoverArrowOuterColor:  rgba(0,0,0,.25) !default;
 // GRID
 // --------------------------------------------------
 
+
 // Default 940px grid
 // -------------------------
 $gridColumns:             12 !default;

data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less

@@ -57,6 +57,24 @@
 @headingsFontWeight:    bold;    // instead of browser default, bold
 @headingsColor:         inherit; // empty to use BS default, @textColor
 
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           1px 6px;   // 24px
+
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
 // Tables
 // -------------------------
 @tableBackground:                   transparent; // overall background-color
@@ -93,9 +111,11 @@
 // -------------------------
 @inputBackground:               @white;
 @inputBorder:                   #ccc;
-@inputBorderRadius:             3px;
+@inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         #f5f5f5;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
@@ -116,6 +136,7 @@
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -157,6 +178,7 @@
 // Navbar
 // -------------------------
 @navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
 @navbarHeight:                    40px;
 @navbarBackgroundHighlight:       #ffffff;

data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss

@@ -1,5 +1,5 @@
 @import "bootstrap-variables";
-@import "bootstrap";
+@import "bootstrap.scss";
 
 body {
   padding-top: $navbarHeight + 20px;

data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss

@@ -1,5 +1,5 @@
 @import "bootstrap-variables";
-@import "bootstrap";
+@import "bootstrap.scss";
 
 body {
   padding-top: $navbarHeight + 20px;

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-affix.js v2.1.1
+ * bootstrap-affix.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -28,7 +28,9 @@
 
   var Affix = function (element, options) {
     this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
     this.$element = $(element)
     this.checkPosition()
   }

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.1.1
+ * bootstrap-alert.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -83,8 +83,6 @@
  /* ALERT DATA-API
   * ============== */
 
-  $(function () {
-    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
-  })
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
 }(window.jQuery);

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.1.1
+ * bootstrap-button.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -85,12 +85,10 @@
  /* BUTTON DATA-API
   * =============== */
 
-  $(function () {
-    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      var $btn = $(e.target)
-      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-      $btn.button('toggle')
-    })
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
   })
 
 }(window.jQuery);

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.1.1
+ * bootstrap-carousel.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -94,9 +94,7 @@
         , direction = type == 'next' ? 'left' : 'right'
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
-        , e = $.Event('slide', {
-            relatedTarget: $next[0]
-          })
+        , e
 
       this.sliding = true
 
@@ -104,6 +102,10 @@
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      })
+
       if ($next.hasClass('active')) return
 
       if ($.support.transition && this.$element.hasClass('slide')) {
@@ -163,14 +165,12 @@
  /* CAROUSEL DATA-API
   * ================= */
 
-  $(function () {
-    $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
-      var $this = $(this), href
-        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-        , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
-      $target.carousel(options)
-      e.preventDefault()
-    })
+  $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+    $target.carousel(options)
+    e.preventDefault()
   })
 
 }(window.jQuery);

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.1.1
+ * bootstrap-collapse.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -143,16 +143,14 @@
  /* COLLAPSIBLE DATA-API
   * ==================== */
 
-  $(function () {
-    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-      var $this = $(this), href
-        , target = $this.attr('data-target')
-          || e.preventDefault()
-          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-        , option = $(target).data('collapse') ? 'toggle' : $this.data()
-      $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-      $(target).collapse(option)
-    })
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
   })
 
 }(window.jQuery);

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.1.1
+ * bootstrap-dropdown.js v2.2.1
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -100,8 +100,9 @@
   }
 
   function clearMenus() {
-    getParent($(toggle))
-      .removeClass('open')
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
   }
 
   function getParent($this) {
@@ -138,13 +139,10 @@
   /* APPLY TO STANDARD DROPDOWN ELEMENTS
    * =================================== */
 
-  $(function () {
-    $('html')
-      .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
-    $('body')
-      .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-      .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-      .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-  })
+  $(document)
+    .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
+    .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
 }(window.jQuery);