bootstrap-sass-rails 2.0.1.2 → 2.0.2.0

data/vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss

@@ -3,7 +3,7 @@
 // -------------------------------------------------------------------------------------------
 
 
-// STRUCTURAL LAYOUT
+// Body reset
 // -----------------
 
 body {
@@ -12,11 +12,11 @@ body {
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $textColor;
-  background-color: $white;
+  background-color: $bodyBackground;
 }
 
 
-// LINKS
+// Links
 // -----
 
 a {

data/vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss

@@ -11,7 +11,7 @@
 // and background-position. Your resulting HTML will look like
 // <i class="icon-inbox"></i>.
 
-// For the white version of the  icons, just add the .icon-white class:
+// For the white version of the icons, just add the .icon-white class:
 // <i class="icon-inbox icon-white"></i>
 
 [class^="icon-"],

data/vendor/assets/stylesheets/twitter/bootstrap/_tables.scss

@@ -11,6 +11,7 @@ table {
   max-width: 100%;
   border-collapse: collapse;
   border-spacing: 0;
+  background-color: $tableBackground;
 }
 
 // BASELINE STYLES
@@ -26,7 +27,7 @@ table {
     line-height: $baseLineHeight;
     text-align: left;
     vertical-align: top;
-    border-top: 1px solid #ddd;
+    border-top: 1px solid $tableBorder;
   }
   th {
     font-weight: bold;
@@ -36,13 +37,15 @@ table {
     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;
   }
 }
 
@@ -63,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
   @include 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,
@@ -108,7 +110,7 @@ table {
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-      background-color: #f9f9f9;
+      background-color: $tableBackgroundAccent;
     }
   }
 }
@@ -120,7 +122,7 @@ table {
 .table {
   tbody tr:hover td,
   tbody tr:hover th {
-    background-color: #f5f5f5;
+    background-color: $tableBackgroundHover;
   }
 }
 
@@ -129,11 +131,6 @@ table {
 // -----------------
 
 // Change the columns
-@mixin tableColumns($columnSpan: 1) {
-  float: none;
-  width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16;
-  margin-left: 0;
-}
 table {
   .span1     { @include tableColumns(1); }
   .span2     { @include tableColumns(2); }
@@ -147,4 +144,16 @@ table {
   .span10    { @include tableColumns(10); }
   .span11    { @include tableColumns(11); }
   .span12    { @include tableColumns(12); }
+  .span13    { @include tableColumns(13); }
+  .span14    { @include tableColumns(14); }
+  .span15    { @include tableColumns(15); }
+  .span16    { @include tableColumns(16); }
+  .span17    { @include tableColumns(17); }
+  .span18    { @include tableColumns(18); }
+  .span19    { @include tableColumns(19); }
+  .span20    { @include tableColumns(20); }
+  .span21    { @include tableColumns(21); }
+  .span22    { @include tableColumns(22); }
+  .span23    { @include tableColumns(23); }
+  .span24    { @include tableColumns(24); }
 }

data/vendor/assets/stylesheets/twitter/bootstrap/_type.scss

@@ -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;
@@ -126,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
 // ----
@@ -154,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 {

data/vendor/assets/stylesheets/twitter/bootstrap/_variables.scss

@@ -7,11 +7,8 @@
 // GLOBAL VALUES
 // --------------------------------------------------
 
-// Links
-$linkColor:             #08c !default;
-$linkColorHover:        darken($linkColor, 15%) !default;
-
 // Grays
+// -------------------------
 $black:                 #000 !default;
 $grayDarker:            #222 !default;
 $grayDark:              #333 !default;
@@ -20,7 +17,9 @@ $grayLight:             #999 !default;
 $grayLighter:           #eee !default;
 $white:                 #fff !default;
 
+
 // Accent colors
+// -------------------------
 $blue:                  #049cdb !default;
 $blueDark:              #0064cd !default;
 $green:                 #46a546 !default;
@@ -30,14 +29,78 @@ $orange:                #f89406 !default;
 $pink:                  #c3325f !default;
 $purple:                #7a43b6 !default;
 
+
+// Scaffolding
+// -------------------------
+$bodyBackground:        $white !default;
+$textColor:             $grayDark !default;
+
+
+// Links
+// -------------------------
+$linkColor:             #08c !default;
+$linkColorHover:        darken($linkColor, 15%) !default;
+
+
 // Typography
+// -------------------------
 $baseFontSize:          13px !default;
 $baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $baseLineHeight:        18px !default;
-$textColor:             $grayDark !default;
+$altFontFamily:         Georgia, "Times New Roman", Times, serif !default;
+
+$headingsFontFamily:    inherit !default; // empty to use BS default, @baseFontFamily
+$headingsFontWeight:    bold !default;    // instead of browser default, bold
+$headingsColor:         inherit !default; // empty to use BS default, @textColor
+
+
+// Tables
+// -------------------------
+$tableBackground:                   transparent !default; // overall background-color
+$tableBackgroundAccent:             #f9f9f9 !default; // for striping
+$tableBackgroundHover:              #f5f5f5 !default; // for hover
+$tableBorder:                       #ddd !default; // table and cell border
+
 
 // Buttons
-$primaryButtonBackground:    $linkColor !default;
+// -------------------------
+$btnBackground:                     $white !default;
+$btnBackgroundHighlight:            darken($white, 10%) !default;
+$btnBorder:                         darken($white, 20%) !default;
+
+$btnPrimaryBackground:              $linkColor !default;
+$btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 15%) !default;
+
+$btnInfoBackground:                 #5bc0de !default;
+$btnInfoBackgroundHighlight:        #2f96b4 !default;
+
+$btnSuccessBackground:              #62c462 !default;
+$btnSuccessBackgroundHighlight:     #51a351 !default;
+
+$btnWarningBackground:              lighten($orange, 15%) !default;
+$btnWarningBackgroundHighlight:     $orange !default;
+
+$btnDangerBackground:               #ee5f5b !default;
+$btnDangerBackgroundHighlight:      #bd362f !default;
+
+$btnInverseBackground:              $gray !default;
+$btnInverseBackgroundHighlight:     $grayDarker !default;
+
+
+// Forms
+// -------------------------
+$inputBackground:               $white !default;
+$inputBorder:                   #ccc !default;
+$inputDisabledBackground:       $grayLighter !default;
+
+
+// Dropdowns
+// -------------------------
+$dropdownBackground:            $white !default;
+$dropdownBorder:                rgba(0,0,0,.2) !default;
+$dropdownLinkColor:             $grayDark !default;
+$dropdownLinkColorHover:        $white !default;
+$dropdownLinkBackgroundHover:   $linkColor !default;
 
 
 
@@ -45,6 +108,7 @@ $primaryButtonBackground:    $linkColor !default;
 // --------------------------------------------------
 
 // 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 !default;
@@ -54,17 +118,25 @@ $zindexFixedNavbar:     1030 !default;
 $zindexModalBackdrop:   1040 !default;
 $zindexModal:           1050 !default;
 
+
 // Sprite icons path
+// -------------------------
 $iconSpritePath:        "twitter/bootstrap/glyphicons-halflings.png" !default;
 $iconWhiteSpritePath:   "twitter/bootstrap/glyphicons-halflings-white.png" !default;
 
+
 // Input placeholder text color
+// -------------------------
 $placeholderText:       $grayLight !default;
 
+
 // Hr border color
+// -------------------------
 $hrBorder:              $grayLighter !default;
 
+
 // Navbar
+// -------------------------
 $navbarHeight:                    40px !default;
 $navbarBackground:                $grayDarker !default;
 $navbarBackgroundHighlight:       $grayDark !default;
@@ -72,9 +144,25 @@ $navbarBackgroundHighlight:       $grayDark !default;
 $navbarText:                      $grayLight !default;
 $navbarLinkColor:                 $grayLight !default;
 $navbarLinkColorHover:            $white !default;
+$navbarLinkColorActive:           $navbarLinkColorHover !default;
 $navbarLinkBackgroundHover:       transparent !default;
+$navbarLinkBackgroundActive:      $navbarBackground !default;
+
+$navbarSearchBackground:          lighten($navbarBackground, 25%) !default;
+$navbarSearchBackgroundFocus:     $white !default;
+$navbarSearchBorder:              darken($navbarSearchBackground, 30%) !default;
+$navbarSearchPlaceholderColor:    #ccc !default;
+
+
+// Hero unit
+// -------------------------
+$heroUnitBackground:              $grayLighter !default;
+$heroUnitHeadingColor:            inherit !default;
+$heroUnitLeadColor:               inherit !default;
+
 
 // Form states and alerts
+// -------------------------
 $warningText:             #c09853 !default;
 $warningBackground:       #fcf8e3 !default;
 $warningBorder:           darken(adjust_hue($warningBackground, -10deg), 3%) !default;
@@ -93,15 +181,19 @@ $infoBorder:              darken(adjust_hue($infoBackground, -10deg), 7%) !defau
 
 
 
+
 // GRID
 // --------------------------------------------------
 
 // Default 940px grid
+// -------------------------
 $gridColumns:             12 !default;
 $gridColumnWidth:         60px !default;
 $gridGutterWidth:         20px !default;
 $gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
 
+
 // Fluid grid
+// -------------------------
 $fluidGridColumnWidth:    6.382978723% !default;
 $fluidGridGutterWidth:    2.127659574% !default;

data/vendor/assets/stylesheets/twitter/bootstrap/_wells.scss

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1.2
+  version: 2.0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70106186914980 !ruby/object:Gem::Requirement
+  requirement: &70152550514080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70106186914980
+  version_requirements: *70152550514080
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70106186914340 !ruby/object:Gem::Requirement
+  requirement: &70152550513480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70106186914340
+  version_requirements: *70152550513480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106186913840 !ruby/object:Gem::Requirement
+  requirement: &70152550513000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70106186913840
+  version_requirements: *70152550513000
 description: Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps,
   and more. It includes base CSS styles for typography, forms, buttons, tables, grids,
   navigation, alerts, and more.
@@ -76,6 +76,7 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap.js
 - vendor/assets/stylesheets/twitter/bootstrap/_accordion.scss
 - vendor/assets/stylesheets/twitter/bootstrap/_alerts.scss
+- vendor/assets/stylesheets/twitter/bootstrap/_badges.scss
 - vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss
 - vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss
 - vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss
@@ -152,6 +153,7 @@ files:
 - test/dummy/tmp/cache/assets/E3A/D90/sprockets%2Fce0dbefdb4416ebc42589ecdbf7d7857
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_accordion.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_alerts.scssc
+- test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_badges.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_breadcrumbs.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_button-groups.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_buttons.scssc
@@ -218,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3487475609302555863
+      hash: 630178751143479804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,10 +229,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3487475609302555863
+      hash: 630178751143479804
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: HTML, CSS, and JS toolkit from Twitter converted to Sasss and the Rails asset
@@ -276,6 +278,7 @@ test_files:
 - test/dummy/tmp/cache/assets/E3A/D90/sprockets%2Fce0dbefdb4416ebc42589ecdbf7d7857
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_accordion.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_alerts.scssc
+- test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_badges.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_breadcrumbs.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_button-groups.scssc
 - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_buttons.scssc