bootstrap-sass 2.0.1 → 2.0.2

data/vendor/assets/stylesheets/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;
@@ -121,10 +122,23 @@ dt, 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
 // ----
@@ -149,13 +163,16 @@ 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 {
   padding: 0 0 0 15px;

data/vendor/assets/stylesheets/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,47 +29,133 @@ $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;
 
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
 // 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:          asset-url("glyphicons-halflings.png", image) !default;
+$iconWhiteSpritePath:     asset-url("glyphicons-halflings-white.png", image) !default;
+
 
 // Input placeholder text color
+// -------------------------
 $placeholderText:         $grayLight !default;
 
-// HR border color
+
+// Hr border color
+// -------------------------
 $hrBorder:                $grayLighter !default;
 
+
 // Navbar
+// -------------------------
 $navbarHeight:                    40px !default;
 $navbarBackground:                $grayDarker !default;
 $navbarBackgroundHighlight:       $grayDark !default;
-$navbarLinkBackgroundHover:       transparent !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, -10), 3%) !default;
@@ -93,11 +178,14 @@ $infoBorder:              darken(adjust-hue($infoBackground, -10), 7%) !default;
 // --------------------------------------------------
 
 // 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/bootstrap/_wells.scss

@@ -14,4 +14,14 @@
     border-color: #ddd;
     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
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70123629250160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123629250160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70123633347860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70123633347860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: 
 email: tom@conceptcoding.co.uk
 executables: []
@@ -43,6 +53,7 @@ files:
 - vendor/assets/stylesheets/_bootstrap.scss
 - vendor/assets/stylesheets/bootstrap/_accordion.scss
 - vendor/assets/stylesheets/bootstrap/_alerts.scss
+- vendor/assets/stylesheets/bootstrap/_badges.scss
 - vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
 - vendor/assets/stylesheets/bootstrap/_button-groups.scss
 - vendor/assets/stylesheets/bootstrap/_buttons.scss
@@ -90,7 +101,6 @@ files:
 - vendor/assets/images/glyphicons-halflings-white.png
 - vendor/assets/images/glyphicons-halflings.png
 - lib/bootstrap-sass/compass_extensions.rb
-- lib/bootstrap-sass/config/sass-ie_hex_str.rb
 - lib/bootstrap-sass/config/sass_extentions.rb
 - lib/bootstrap-sass/engine.rb
 - lib/bootstrap-sass.rb
@@ -118,8 +128,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Twitter's Bootstrap, converted to SASS and ready to drop into Rails or Compass
+summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
 test_files: []
+has_rdoc: 

data/lib/bootstrap-sass/config/sass-ie_hex_str.rb

@@ -1,14 +0,0 @@
-require 'sass'
-
-module Sass::Script::Functions
-  # LARS: Snatched from compass - 2011-11-29 - used for gradients in IE6-9
-  # returns an IE hex string for a color with an alpha channel
-  # suitable for passing to IE filters.
-  def ie_hex_str(color)
-    assert_type color, :Color
-    alpha = (color.alpha * 255).round
-    alphastr = alpha.to_s(16).rjust(2, '0')
-    Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
-  end
-  declare :ie_hex_str, [:color]
-end