sass-rails-bootstrap 2.0.4 → 2.1.0

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

@@ -1,15 +1,13 @@
-// Headings, body text, lists, code, and more for a versatile and durable typography system
-// ----------------------------------------------------------------------------------------
+//
+// Typography
+// --------------------------------------------------
 
 
-// BODY TEXT
-// ---------
+// Body text
+// -------------------------
 
 p
   margin: 0 0 $baseLineHeight / 2
-  small
-    font-size: $baseFontSize - 2
-    color: $grayLight
     
 .lead
   margin-bottom: $baseLineHeight
@@ -18,66 +16,88 @@ p
   line-height: $baseLineHeight * 1.5
 
 
-// HEADINGS
-// --------
+// Emphasis & misc
+// -------------------------
+
+small
+  font-size: 85%  // Ex: 14px base font * 85% = about 12px
+
+strong
+  font-weight: bold
+
+em
+  font-style: italic
+
+cite
+  font-style: normal
+
+.muted
+  color: $grayLight
+
+
+// Headings
+// -------------------------
 
 h1, h2, h3, h4, h5, h6
-  margin: 0
+  margin: ($baseLineHeight / 2) 0
   font-family: $headingsFontFamily
   font-weight: $headingsFontWeight
   color: $headingsColor
   text-rendering: optimizelegibility  // Fix the character spacing for headings
   small
     font-weight: normal
+    line-height: 1
     color: $grayLight
     
 h1
-  font-size: 30px
-  line-height: $baseLineHeight * 2
-  small
-    font-size: 18px
-    
+  font-size: 36px
+  line-height: 40px
+
 h2
-  font-size: 24px
-  line-height: $baseLineHeight * 2
-  small
-    font-size: 18px
-    
+  font-size: 30px
+  line-height: 40px
+
 h3
-  font-size: 18px
-  line-height: $baseLineHeight * 1.5
-  small
-    font-size: 14px
-    
-h4, h5, h6
-  line-height: $baseLineHeight
-  
+  font-size: 24px
+  line-height: 40px
+
 h4
-  font-size: 14px
-  small
-    font-size: 12px
-    
+  font-size: 18px
+  line-height: 20px
+
 h5
-  font-size: 12px
-  
+  font-size: 14px
+  line-height: 20px
+
 h6
-  font-size: 11px
-  color: $grayLight
-  text-transform: uppercase
+  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
+
 
 // Page header
+// -------------------------
+
 .page-header
-  padding-bottom: $baseLineHeight - 1
-  margin: $baseLineHeight 0
+  padding-bottom: ($baseLineHeight / 2) - 1
+  margin: $baseLineHeight 0 ($baseLineHeight * 1.5)
   border-bottom: 1px solid $grayLighter
-  
-.page-header h1
-  line-height: 1
 
 
 
-// LISTS
-// -----
+// Lists
+// --------------------------------------------------
 
 // Unordered and Ordered lists
 ul, ol
@@ -90,12 +110,6 @@ ol ol,
 ol ul
   margin-bottom: 0
   
-ul
-  list-style: disc
-  
-ol
-  list-style: decimal
-  
 li
   line-height: $baseLineHeight
   
@@ -115,7 +129,6 @@ dd
   
 dt
   font-weight: bold
-  line-height: $baseLineHeight - 1  // fix jank Helvetica Neue font bug
   
 dd
   margin-left: $baseLineHeight / 2
@@ -142,16 +155,6 @@ hr
   border-top: 1px solid $hrBorder
   border-bottom: 1px solid $white
 
-// Emphasis
-strong
-  font-weight: bold
-  
-em
-  font-style: italic
-  
-.muted
-  color: $grayLight
-
 // Abbreviations and acronyms
 abbr[title]
   cursor: help
@@ -185,6 +188,11 @@ blockquote
     p,
     small
       text-align: right
+    small
+      &:before
+        content: ''
+      &:after
+        content: '\00A0 \2014'
 
 // Quotes
 q:before,
@@ -199,9 +207,3 @@ address
   margin-bottom: $baseLineHeight
   font-style: normal
   line-height: $baseLineHeight
-
-// Misc
-small
-  font-size: 100%
-cite
-  font-style: normal

data/vendor/assets/stylesheets/twitter/bootstrap/_utilities.sass

@@ -1,5 +1,7 @@
-// UTILITY CLASSES
-// ---------------
+//
+// Utility classes
+// --------------------------------------------------
+
 
 // Quick floats
 .pull-right
@@ -17,3 +19,7 @@
 // Visibility
 .invisible
   visibility: hidden
+
+// For Affix plugin
+.affix
+  position: fixed

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

@@ -1,9 +1,9 @@
-// Variables to customize the look and feel of Bootstrap
-// -----------------------------------------------------
-
+//
+// Variables
+// --------------------------------------------------
 
 
-// GLOBAL VALUES
+// Global values
 // --------------------------------------------------
 
 
@@ -46,11 +46,11 @@ $linkColorHover:        darken($linkColor, 15%)
 // -------------------------
 $sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif
 $serifFontFamily:       Georgia, "Times New Roman", Times, serif
-$monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace
+$monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace
 
-$baseFontSize:          13px
+$baseFontSize:          14px
 $baseFontFamily:        $sansFontFamily
-$baseLineHeight:        18px
+$baseLineHeight:        20px
 $altFontFamily:         $serifFontFamily
 
 $headingsFontFamily:    inherit  // empty to use BS default, $baseFontFamily
@@ -73,7 +73,7 @@ $btnBackgroundHighlight:            darken($white, 10%)
 $btnBorder:                         #ccc
 
 $btnPrimaryBackground:              $linkColor
-$btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 15deg)
+$btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 20deg)
 
 $btnInfoBackground:                 #5bc0de
 $btnInfoBackgroundHighlight:        #2f96b4
@@ -87,7 +87,7 @@ $btnWarningBackgroundHighlight:     $orange
 $btnDangerBackground:               #ee5f5b
 $btnDangerBackgroundHighlight:      #bd362f
 
-$btnInverseBackground:              $gray
+$btnInverseBackground:              #444
 $btnInverseBackgroundHighlight:     $grayDarker
 
 
@@ -104,12 +104,16 @@ $formActionsBackground:         #f5f5f5
 // -------------------------
 $dropdownBackground:            $white
 $dropdownBorder:                rgba(0, 0, 0, 0.2)
-$dropdownLinkColor:             $grayDark
-$dropdownLinkColorHover:        $white
-$dropdownLinkBackgroundHover:   $linkColor
 $dropdownDividerTop:            #e5e5e5
 $dropdownDividerBottom:         $white
 
+$dropdownLinkColor:             $grayDark
+
+$dropdownLinkColorActive:       $dropdownLinkColor
+$dropdownLinkBackgroundActive:  $linkColor
+
+$dropdownLinkColorHover:        $white
+$dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive
 
 
 // COMPONENT VARIABLES
@@ -121,7 +125,7 @@ $dropdownDividerBottom:         $white
 // Try to avoid customizing these :)
 $zindexDropdown:        1000
 $zindexPopover:         1010
-$zindexTooltip:         1020
+$zindexTooltip:         1030
 $zindexFixedNavbar:     1030
 $zindexModalBackdrop:   1040
 $zindexModal:           1050
@@ -143,24 +147,55 @@ $placeholderText:       $grayLight
 $hrBorder:              $grayLighter
 
 
+// Wells
+// -------------------------
+$wellBackground:                  #f5f5f5
+
+
 // Navbar
 // -------------------------
+$navbarCollapseWidth:             979px
+
 $navbarHeight:                    40px
-$navbarBackground:                $grayDarker
-$navbarBackgroundHighlight:       $grayDark
+$navbarBackgroundHighlight:       #ffffff
+$navbarBackground:                darken($navbarBackgroundHighlight, 5%)
+$navbarBorder:                    darken($navbarBackground, 12%)
+
+$navbarText:                      $gray
+$navbarLinkColor:                 $gray
+$navbarLinkColorHover:            $grayDark
+$navbarLinkColorActive:           $gray
 
-$navbarText:                      $grayLight
-$navbarLinkColor:                 $grayLight
-$navbarLinkColorHover:            $white
-$navbarLinkColorActive:           $navbarLinkColorHover
 $navbarLinkBackgroundHover:       transparent
-$navbarLinkBackgroundActive:      $navbarBackground
+$navbarLinkBackgroundActive:      darken($navbarBackground, 5%)
+
 $navbarBrandColor:                $navbarLinkColor
 
-$navbarSearchBackground:          lighten($navbarBackground, 25%)
-$navbarSearchBackgroundFocus:     $white
-$navbarSearchBorder:              darken($navbarSearchBackground, 30%)
-$navbarSearchPlaceholderColor:    #ccc
+// Inverted navbar
+$navbarInverseBackground:                #111111
+$navbarInverseBackgroundHighlight:       #222222
+$navbarInverseBorder:                    #252525
+
+$navbarInverseText:                      $grayLight
+$navbarInverseLinkColor:                 $grayLight
+$navbarInverseLinkColorHover:            $white
+$navbarInverseLinkColorActive:           $navbarInverseLinkColorHover
+$navbarInverseLinkBackgroundHover:       transparent
+$navbarInverseLinkBackgroundActive:      $navbarInverseBackground
+
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%)
+$navbarInverseSearchBackgroundFocus:     $white
+$navbarInverseSearchBorder:              $navbarInverseBackground
+$navbarInverseSearchPlaceholderColor:    #ccc
+
+$navbarInverseBrandColor:                $navbarInverseLinkColor
+
+
+// Pagination
+// -------------------------
+$paginationBackground:                #fff
+$paginationBorder:                    #ddd
+$paginationActiveBackground:          #f5f5f5
 
 
 // Hero unit
@@ -189,6 +224,23 @@ $infoBackground:          #d9edf7
 $infoBorder:              darken(adjust-hue($infoBackground, -10), 7%)
 
 
+// Tooltips and popovers
+// -------------------------
+$tooltipColor:            #fff
+$tooltipBackground:       #000
+$tooltipArrowWidth:       5px
+$tooltipArrowColor:       $tooltipBackground
+
+$popoverBackground:       #fff
+$popoverArrowWidth:       10px
+$popoverArrowColor:       #fff
+$popoverTitleBackground:  darken($popoverBackground, 3%)
+
+// Special enhancement for popovers
+$popoverArrowOuterWidth:  $popoverArrowWidth + 1
+$popoverArrowOuterColor:  rgba(0,0,0,.25)
+
+
 
 // GRID
 // --------------------------------------------------
@@ -200,9 +252,26 @@ $gridColumnWidth:         60px
 $gridGutterWidth:         20px
 $gridRowWidth:            $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1)
 
+// 1200px min
+$gridColumnWidth1200:     70px
+$gridGutterWidth1200:     30px
+$gridRowWidth1200:        $gridColumns * $gridColumnWidth1200 + $gridGutterWidth1200 * ($gridColumns - 1)
+
+// 768px-979px
+$gridColumnWidth768:      42px
+$gridGutterWidth768:      20px
+$gridRowWidth768:         $gridColumns * $gridColumnWidth768 + $gridGutterWidth768 * ($gridColumns - 1)
+
 
 // Fluid grid
 // -------------------------
-$fluidGridColumnWidth:    6.382978723%
-$fluidGridGutterWidth:    2.127659574%
+$fluidGridColumnWidth:    percentage($gridColumnWidth / $gridRowWidth)
+$fluidGridGutterWidth:    percentage($gridGutterWidth / $gridRowWidth)
+
+// 1200px min
+$fluidGridColumnWidth1200:     percentage($gridColumnWidth1200 / $gridRowWidth1200)
+$fluidGridGutterWidth1200:     percentage($gridGutterWidth1200 / $gridRowWidth1200)
 
+// 768px-979px
+$fluidGridColumnWidth768:      percentage($gridColumnWidth768 / $gridRowWidth768)
+$fluidGridGutterWidth768:      percentage($gridGutterWidth768 / $gridRowWidth768)

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

@@ -1,13 +1,14 @@
-// WELLS
-// -----
+//
+// Wells
+// --------------------------------------------------
+
 
 .well
   min-height: 20px
   padding: 19px
   margin-bottom: 20px
-  background-color: #f5f5f5
-  border: 1px solid #eee
-  border: 1px solid rgba(0,0,0,.05)
+  background-color: $wellBackground
+  border: 1px solid darken($wellBackground, 7%)
   +border-radius(4px)
   +box-shadow(inset 0 1px 1px rgba(0,0,0,.05))
   blockquote

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,6 +36,7 @@ extra_rdoc_files: []
 files:
 - lib/sass-rails-bootstrap/engine.rb
 - lib/sass-rails-bootstrap/version.rb
+- lib/sass-rails-bootstrap/sass_functions.rb
 - lib/sass-rails-bootstrap.rb
 - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
 - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
@@ -83,6 +84,7 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap/dropdown.js
 - vendor/assets/javascripts/twitter/bootstrap/typeahead.js
 - vendor/assets/javascripts/twitter/bootstrap/carousel.js
+- vendor/assets/javascripts/twitter/bootstrap/affix.js
 - vendor/assets/javascripts/twitter/bootstrap/tab.js
 - vendor/assets/javascripts/twitter/bootstrap/popover.js
 - vendor/assets/javascripts/twitter/bootstrap/scrollspy.js