twitter-bootstrap-rails 2.0.2 → 2.0.4

data/vendor/toolkit/twitter/bootstrap/sprites.less

@@ -6,27 +6,29 @@
 // ICONS
 // -----
 
-// All icons receive the styles of the <i> tag with a base class
-// of .i and are then given a unique class to add width, height,
+// All icons receive the styles of the <i> tag with a base class 
+// of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
-// <i class="i icon-inbox"></i>.
+// <i class="icon-inbox"></i>.
 
-// For the white version of the  icons, just add the .icon-white class:
-// <i class="i icon-inbox icon-white"></i>
+// For the white version of the icons, just add the .icon-white class:
+// <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: asset-url('twitter/bootstrap/glyphicons-halflings.png');
+  background-image: url(@iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
   .ie7-restore-right-whitespace();
 }
 .icon-white {
-  background-image: asset-url('twitter/bootstrap/glyphicons-halflings-white.png');
+  background-image: url(@iconWhiteSpritePath);
 }
 
 .icon-glass              { background-position: 0      0; }

data/vendor/toolkit/twitter/bootstrap/tables.less

@@ -11,6 +11,7 @@ table {
   max-width: 100%;
   border-collapse: collapse;
   border-spacing: 0;
+  background-color: @tableBackground;
 }
 
 // BASELINE STYLES
@@ -25,23 +26,26 @@ table {
     padding: 8px;
     line-height: @baseLineHeight;
     text-align: left;
-    border-top: 1px solid #ddd;
+    vertical-align: top;
+    border-top: 1px solid @tableBorder;
   }
   th {
     font-weight: bold;
-    vertical-align: bottom;
   }
-  td {
-    vertical-align: top;
+  // Bottom align for column headings
+  thead th {
+    vertical-align: bottom;
   }
   // Remove top border from thead by default
-  thead:first-child tr th,
-  thead:first-child tr td {
+  colgroup + thead tr:first-child th,
+  colgroup + thead tr:first-child td,
+  thead:first-child tr:first-child th,
+  thead:first-child tr:first-child td {
     border-top: 0;
   }
   // Account for multiple tbody instances
   tbody + tbody {
-    border-top: 2px solid #ddd;
+    border-top: 2px solid @tableBorder;
   }
 }
 
@@ -62,15 +66,14 @@ table {
 // ----------------
 
 .table-bordered {
-  border: 1px solid #ddd;
+  border: 1px solid @tableBorder;
+  border-left: 0;
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapsed; // IE7 can't round corners anyway
   .border-radius(4px);
-  th + th,
-  td + td,
-  th + td,
-  td + th {
-    border-left: 1px solid #ddd;
+  th,
+  td {
+    border-left: 1px solid @tableBorder;
   }
   // Prevent a double border
   thead:first-child tr:first-child th,
@@ -107,22 +110,27 @@ table {
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-      background-color: #f9f9f9;
+      background-color: @tableBackgroundAccent;
     }
   }
 }
 
 
+// HOVER EFFECT
+// ------------
+// Placed here since it has to come after the potential zebra striping
+.table {
+  tbody tr:hover td,
+  tbody tr:hover th {
+    background-color: @tableBackgroundHover;
+  }
+}
+
 
 // TABLE CELL SIZING
 // -----------------
 
 // Change the columns
-.tableColumns(@columnSpan: 1) {
-  float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
-  margin-left: 0;
-}
 table {
   .span1     { .tableColumns(1); }
   .span2     { .tableColumns(2); }
@@ -136,4 +144,16 @@ table {
   .span10    { .tableColumns(10); }
   .span11    { .tableColumns(11); }
   .span12    { .tableColumns(12); }
+  .span13    { .tableColumns(13); }
+  .span14    { .tableColumns(14); }
+  .span15    { .tableColumns(15); }
+  .span16    { .tableColumns(16); }
+  .span17    { .tableColumns(17); }
+  .span18    { .tableColumns(18); }
+  .span19    { .tableColumns(19); }
+  .span20    { .tableColumns(20); }
+  .span21    { .tableColumns(21); }
+  .span22    { .tableColumns(22); }
+  .span23    { .tableColumns(23); }
+  .span24    { .tableColumns(24); }
 }

data/vendor/toolkit/twitter/bootstrap/thumbnails.less

@@ -2,13 +2,13 @@
 // ----------
 
 .thumbnails {
-  margin-left: -20px;
+  margin-left: -@gridGutterWidth;
   list-style: none;
   .clearfix();
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 @baseLineHeight 20px;
+  margin: 0 0 @baseLineHeight @gridGutterWidth;
 }
 .thumbnail {
   display: block;

data/vendor/toolkit/twitter/bootstrap/type.less

@@ -28,8 +28,9 @@ p {
 
 h1, h2, h3, h4, h5, h6 {
   margin: 0;
-  font-weight: bold;
-  color: @grayDark;
+  font-family: @headingsFontFamily;
+  font-weight: @headingsFontWeight;
+  color: @headingsColor;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
     font-weight: normal;
@@ -110,7 +111,8 @@ ol {
 li {
   line-height: @baseLineHeight;
 }
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -125,10 +127,23 @@ dd {
 }
 dt {
   font-weight: bold;
+  line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
 }
 dd {
   margin-left: @baseLineHeight / 2;
 }
+// Horizontal layout (like forms)
+.dl-horizontal {
+  dt {
+    float: left;
+    clear: left;
+    width: 120px;
+    text-align: right;
+  }
+  dd {
+    margin-left: 130px;
+  }
+}
 
 // MISC
 // ----
@@ -137,7 +152,7 @@ dd {
 hr {
   margin: @baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid @hrBorder;
   border-bottom: 1px solid @white;
 }
 
@@ -153,12 +168,14 @@ em {
 }
 
 // Abbreviations and acronyms
-abbr {
-  font-size: 90%;
-  text-transform: uppercase;
+abbr[title] {
   border-bottom: 1px dotted #ddd;
   cursor: help;
 }
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
 
 // Blockquotes
 blockquote {
@@ -195,7 +212,7 @@ blockquote {
 // Quotes
 q:before,
 q:after,
-blockquote:before, 
+blockquote:before,
 blockquote:after {
   content: "";
 }

data/vendor/toolkit/twitter/bootstrap/variables.less

@@ -7,11 +7,9 @@
 // GLOBAL VALUES
 // --------------------------------------------------
 
-// Links
-@linkColor:             #08c;
-@linkColorHover:        darken(@linkColor, 15%);
 
 // Grays
+// -------------------------
 @black:                 #000;
 @grayDarker:            #222;
 @grayDark:              #333;
@@ -20,7 +18,9 @@
 @grayLighter:           #eee;
 @white:                 #fff;
 
+
 // Accent colors
+// -------------------------
 @blue:                  #049cdb;
 @blueDark:              #0064cd;
 @green:                 #46a546;
@@ -30,14 +30,79 @@
 @pink:                  #c3325f;
 @purple:                #7a43b6;
 
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15%);
+
+
 // Typography
+// -------------------------
 @baseFontSize:          13px;
 @baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
 @baseLineHeight:        18px;
-@textColor:             @grayDark;
+@altFontFamily:         Georgia, "Times New Roman", Times, serif;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
 
 // Buttons
-@primaryButtonBackground:    @linkColor;
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         darken(@white, 20%);
+
+@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              @gray;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputDisabledBackground:       @grayLighter;
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkBackgroundHover:   @linkColor;
+
 
 
 
@@ -45,19 +110,35 @@
 // --------------------------------------------------
 
 // Z-index master list
+// -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-@zindexDropdown:        1000;
-@zindexPopover:         1010;
-@zindexTooltip:         1020;
-@zindexFixedNavbar:     1030;
-@zindexModalBackdrop:   1040;
-@zindexModal:           1050;
+@zindexDropdown:          1000;
+@zindexPopover:           1010;
+@zindexTooltip:           1020;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
 
 // Input placeholder text color
-@placeholderText:       @grayLight;
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
 
 // Navbar
+// -------------------------
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
@@ -65,8 +146,25 @@
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;
 @navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
+@navbarSearchBackground:          lighten(@navbarBackground, 25%);
+@navbarSearchBackgroundFocus:     @white;
+@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
+@navbarSearchPlaceholderColor:    #ccc;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
 
 // Form states and alerts
+// -------------------------
 @warningText:             #c09853;
 @warningBackground:       #fcf8e3;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
@@ -85,15 +183,19 @@
 
 
 
+
 // GRID
 // --------------------------------------------------
 
 // Default 940px grid
+// -------------------------
 @gridColumns:             12;
 @gridColumnWidth:         60px;
 @gridGutterWidth:         20px;
 @gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
+
 // Fluid grid
+// -------------------------
 @fluidGridColumnWidth:    6.382978723%;
 @fluidGridGutterWidth:    2.127659574%;

data/vendor/toolkit/twitter/bootstrap/wells.less

@@ -15,3 +15,13 @@
     border-color: rgba(0,0,0,.15);
   }
 }
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(3px);
+}

data/vendor/toolkit/twitter/bootstrap_base.less

@@ -0,0 +1,2 @@
+@import "bootstrap/variables.less";
+@import "bootstrap/mixins.less";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &69818520 !ruby/object:Gem::Requirement
+  requirement: &73258230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *69818520
+  version_requirements: *73258230
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &69817160 !ruby/object:Gem::Requirement
+  requirement: &73257980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *69817160
+  version_requirements: *73257980
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &69816460 !ruby/object:Gem::Requirement
+  requirement: &73257730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *69816460
+  version_requirements: *73257730
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69815810 !ruby/object:Gem::Requirement
+  requirement: &73257390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *69815810
+  version_requirements: *73257390
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
   Rails 3.1 Asset Pipeline
 email:
@@ -84,17 +84,17 @@ files:
 - lib/generators/bootstrap/themed/templates/index.html.haml
 - lib/generators/bootstrap/themed/templates/index.html.slim
 - lib/generators/bootstrap/install/templates/bootstrap.coffee
+- lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
 - lib/generators/bootstrap/install/templates/application.js
 - lib/generators/bootstrap/install/templates/application.css
-- lib/generators/bootstrap/install/templates/bootstrap.less
 - lib/generators/bootstrap/install/install_generator.rb
 - lib/twitter-bootstrap-rails.rb
 - lib/twitter/bootstrap/rails/bootstrap.rb
 - lib/twitter/bootstrap/rails/version.rb
 - lib/twitter/bootstrap/rails/engine.rb
+- lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb
 - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
 - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
-- vendor/assets/stylesheets/twitter/bootstrap.css.less
 - vendor/assets/javascripts/twitter/bootstrap.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
@@ -108,7 +108,7 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
-- vendor/toolkit/twitter/bootstrap.less
+- vendor/toolkit/twitter/bootstrap_base.less
 - vendor/toolkit/twitter/bootstrap/thumbnails.less
 - vendor/toolkit/twitter/bootstrap/code.less
 - vendor/toolkit/twitter/bootstrap/navbar.less
@@ -123,6 +123,7 @@ files:
 - vendor/toolkit/twitter/bootstrap/component-animations.less
 - vendor/toolkit/twitter/bootstrap/responsive.less
 - vendor/toolkit/twitter/bootstrap/popovers.less
+- vendor/toolkit/twitter/bootstrap/badges.less
 - vendor/toolkit/twitter/bootstrap/alerts.less
 - vendor/toolkit/twitter/bootstrap/scaffolding.less
 - vendor/toolkit/twitter/bootstrap/navs.less

data/lib/generators/bootstrap/install/templates/bootstrap.less

@@ -1,6 +0,0 @@
-@import "twitter/bootstrap";
-
-// import responsive layout
-@import "twitter/bootstrap/responsive";
-
-// Your custom stylesheets goes here (override Less here)

data/vendor/assets/stylesheets/twitter/bootstrap.css.less

@@ -1 +0,0 @@
-@import "twitter/bootstrap/bootstrap";

data/vendor/toolkit/twitter/bootstrap.less

@@ -1 +0,0 @@
-@import "bootstrap/bootstrap.less";