bootstrap-generators 2.1.1 → 2.2.1

data/vendor/twitter/bootstrap/sass/_sprites.scss

@@ -30,8 +30,6 @@
 
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
 .nav-pills > .active > a > [class^="icon-"],
 .nav-pills > .active > a > [class*=" icon-"],
 .nav-list > .active > a > [class^="icon-"],
@@ -41,7 +39,9 @@
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"] {
   background-image: url($iconWhiteSpritePath);
 }
 

data/vendor/twitter/bootstrap/sass/_tables.scss

@@ -71,7 +71,7 @@ table {
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapse; // IE7 can't round corners anyway
   border-left: 0;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   th,
   td {
     border-left: 1px solid $tableBorder;
@@ -133,12 +133,14 @@ table {
   colgroup + tbody tr:first-child td:last-child {
     -webkit-border-top-right-radius: 4px;
             border-top-right-radius: 4px;
-         -moz-border-radius-topleft: 4px;
+         -moz-border-radius-topright: 4px;
   }
 
 }
 
 
+
+
 // ZEBRA-STRIPING
 // --------------
 
@@ -170,17 +172,20 @@ table {
 // -----------------
 
 // Reset default grid behavior
-table [class*=span],
-.row-fluid table [class*=span] {
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
   display: table-cell;
   float: none; // undo default grid column styles
   margin-left: 0; // undo default grid column styles
 }
 
 // Change the column widths to account for td/th padding
-.table {
-  @for $i from 1 through 24 {
-    .span#{$i} { @include tableColumns($i); }
+.table td,
+.table th {
+  @for $i from 1 through 12 {
+    &.span#{$i} { @include tableColumns($i); }
   }
 }
 
@@ -205,7 +210,6 @@ table [class*=span],
   }
 }
 
-
 // Hover states for .table-hover
 .table-hover tbody tr {
   &.success:hover td {

data/vendor/twitter/bootstrap/sass/_thumbnails.scss

@@ -29,7 +29,7 @@
   padding: 4px;
   line-height: $baseLineHeight;
   border: 1px solid #ddd;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   @include box-shadow(0 1px 3px rgba(0,0,0,.055));
   @include transition(all .2s ease-in-out);
 }

data/vendor/twitter/bootstrap/sass/_tooltip.scss

@@ -27,7 +27,7 @@
   text-align: center;
   text-decoration: none;
   background-color: $tooltipBackground;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
 }
 
 // Arrows

data/vendor/twitter/bootstrap/sass/_type.scss

@@ -37,18 +37,17 @@ cite {
 .muted {
   color: $grayLight;
 }
-.text-warning {
-  color: $warningText;
-}
-.text-error {
-  color: $errorText;
-}
-.text-info {
-  color: $infoText;
-}
-.text-success {
-  color: $successText;
-}
+.text-warning { color: $warningText; }
+a.text-warning:hover { color: darken($warningText, 10%); }
+
+.text-error { color: $errorText; }
+a.text-error:hover { color: darken($errorText, 10%); }
+
+.text-info { color: $infoText; }
+a.text-info:hover { color: darken($infoText, 10%); }
+
+.text-success { color: $successText; }
+a.text-success:hover { color: darken($successText, 10%); }
 
 
 // Headings
@@ -58,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
   margin: ($baseLineHeight / 2) 0;
   font-family: $headingsFontFamily;
   font-weight: $headingsFontWeight;
-  line-height: 1;
+  line-height: $baseLineHeight;
   color: $headingsColor;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
@@ -67,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
     color: $grayLight;
   }
 }
-h1 { font-size: 36px; line-height: 40px; }
-h2 { font-size: 30px; line-height: 40px; }
-h3 { font-size: 24px; line-height: 40px; }
-h4 { font-size: 18px; line-height: 20px; }
-h5 { font-size: 14px; line-height: 20px; }
-h6 { font-size: 12px; line-height: 20px; }
 
-h1 small { font-size: 24px; }
-h2 small { font-size: 18px; }
-h3 small { font-size: 14px; }
-h4 small { font-size: 14px; }
+h1,
+h2,
+h3 { line-height: $baseLineHeight * 2; }
+
+h1 { font-size: $baseFontSize * 2.75; } // ~38px
+h2 { font-size: $baseFontSize * 2.25; } // ~32px
+h3 { font-size: $baseFontSize * 1.75; } // ~24px
+h4 { font-size: $baseFontSize * 1.25; } // ~18px
+h5 { font-size: $baseFontSize; }
+h6 { font-size: $baseFontSize * 0.85; } // ~12px
+
+h1 small { font-size: $baseFontSize * 1.75; } // ~24px
+h2 small { font-size: $baseFontSize * 1.25; } // ~18px
+h3 small { font-size: $baseFontSize; }
+h4 small { font-size: $baseFontSize; }
 
 
 // Page header
@@ -155,7 +159,9 @@ hr {
 }
 
 // Abbreviations and acronyms
-abbr[title] {
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted $grayLight;
 }

data/vendor/twitter/bootstrap/sass/_variables.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/vendor/twitter/bootstrap/sass/_wells.scss

@@ -10,7 +10,7 @@
   margin-bottom: 20px;
   background-color: $wellBackground;
   border: 1px solid darken($wellBackground, 7%);
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
@@ -21,9 +21,9 @@
 // Sizes
 .well-large {
   padding: 24px;
-  @include border-radius(6px);
+  @include border-radius($borderRadiusLarge);
 }
 .well-small {
   padding: 9px;
-  @include border-radius(3px);
+  @include border-radius($borderRadiusSmall);
 }

data/vendor/twitter/bootstrap/sass/bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.1
+ * Bootstrap v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -52,6 +52,7 @@
 
 // Components: Misc
 @import "thumbnails";
+@import "media";
 @import "labels-badges";
 @import "progress-bars";
 @import "accordion";

data/vendor/twitter/bootstrap/sass/responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.1.1
+ * Bootstrap Responsive v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-generators
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80500130 !ruby/object:Gem::Requirement
+  requirement: &71633580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *80500130
+  version_requirements: *71633580
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &80499520 !ruby/object:Gem::Requirement
+  requirement: &71633220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80499520
+  version_requirements: *71633220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80498910 !ruby/object:Gem::Requirement
+  requirement: &71632120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *80498910
+  version_requirements: *71632120
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &80498230 !ruby/object:Gem::Requirement
+  requirement: &71631550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *80498230
+  version_requirements: *71631550
 description: Bootstrap-generators provides Twitter Bootstrap generators for Rails
   3.1. Checkout http://twitter.github.com/bootstrap.
 email:
@@ -142,6 +142,7 @@ files:
 - vendor/twitter/bootstrap/less/hero-unit.less
 - vendor/twitter/bootstrap/less/labels-badges.less
 - vendor/twitter/bootstrap/less/layouts.less
+- vendor/twitter/bootstrap/less/media.less
 - vendor/twitter/bootstrap/less/mixins.less
 - vendor/twitter/bootstrap/less/modals.less
 - vendor/twitter/bootstrap/less/navbar.less
@@ -181,6 +182,7 @@ files:
 - vendor/twitter/bootstrap/sass/_hero-unit.scss
 - vendor/twitter/bootstrap/sass/_labels-badges.scss
 - vendor/twitter/bootstrap/sass/_layouts.scss
+- vendor/twitter/bootstrap/sass/_media.scss
 - vendor/twitter/bootstrap/sass/_mixins.scss
 - vendor/twitter/bootstrap/sass/_modals.scss
 - vendor/twitter/bootstrap/sass/_navbar.scss