compass_twitter_bootstrap 2.0.0 → 2.0.1

data/stylesheets_sass/compass_twitter_bootstrap/_modals.sass

@@ -1,6 +1,7 @@
 // MODALS
 // ------
 
+// Recalculate z-index where appropriate
 .modal-open
   .dropdown-menu
     z-index: $zindexDropdown + $zindexModal
@@ -11,6 +12,7 @@
   .tooltip
     z-index: $zindexTooltip + $zindexModal
 
+// Background
 .modal-backdrop
   position: fixed
   top: 0
@@ -27,6 +29,7 @@
 .modal-backdrop.fade.in
   +opacity(0.8)
 
+// Base modal
 .modal
   position: fixed
   top: 50%
@@ -57,9 +60,15 @@
   .close
     margin-top: 2px
 
+// Body (where all modal content resises)
 .modal-body
   padding: 15px
 
+// Remove bottom margin if need be
+.modal-body .modal-form
+  margin-bottom: 0
+
+// Footer (for actions)
 .modal-footer
   padding: 14px 15px 15px
   margin-bottom: 0

data/stylesheets_sass/compass_twitter_bootstrap/_navbar.sass

@@ -74,6 +74,7 @@
     // make buttons vertically centered in navbar
   .btn-group .btn
     margin-top: 0
+    // then undo the margin here so we don't accidentally double it
 
 // Navbar forms
 .navbar-form
@@ -92,6 +93,14 @@
   input[type="checkbox"],
   input[type="radio"]
     margin-top: 3px
+  .input-append,
+  .input-prepend
+    margin-top: 6px
+    white-space: nowrap
+    // preven two  items from separating within a .navbar-form that has .pull-left
+    input
+      margin-top: 0
+      // remove the margin on top since it's on the parent
 
 // Navbar search
 .navbar-search
@@ -117,7 +126,7 @@
       color: $white
       background-color: $grayLight
       background-color: rgba(255, 255, 255, 0.5)
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,
     &.focused
       padding: 5px 10px
@@ -172,7 +181,8 @@
 
 // Hover
 .navbar .nav > li > a:hover
-  background-color: transparent
+  background-color: $navbarLinkBackgroundHover
+  // "transparent" is default to differentiate :hover from .active
   color: $navbarLinkColorHover
   text-decoration: none
 
@@ -183,7 +193,6 @@
   color: $navbarLinkColorHover
   text-decoration: none
   background-color: $navbarBackground
-  background-color: rgba(0, 0, 0, 0.5)
 
 // Dividers (basically a vertical hr)
 .navbar .divider-vertical

data/stylesheets_sass/compass_twitter_bootstrap/_navs.sass

@@ -17,6 +17,21 @@
   text-decoration: none
   background-color: $grayLighter
 
+// Nav headers (for dropdowns and lists)
+.nav .nav-header
+  display: block
+  padding: 3px 15px
+  font-size: 11px
+  font-weight: bold
+  line-height: $baseLineHeight
+  color: $grayLight
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
+  text-transform: uppercase
+
+// Space them out when they follow another list item (link)
+.nav li + .nav-header
+  margin-top: 9px
+
 // NAV LIST
 // --------
 
@@ -27,21 +42,12 @@
 
 .nav-list > li > a,
 .nav-list .nav-header
-  display: block
-  padding: 3px 15px
   margin-left: -15px
   margin-right: -15px
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
 
-.nav-list .nav-header
-  font-size: 11px
-  font-weight: bold
-  line-height: $baseLineHeight
-  color: $grayLight
-  text-transform: uppercase
-
-.nav-list > li + .nav-header
-  margin-top: 9px
+.nav-list > li > a
+  padding: 3px 15px
 
 .nav-list .active > a,
 .nav-list .active > a:hover
@@ -227,6 +233,10 @@
 .tabbable
   +clearfix
 
+.tab-content
+  overflow: hidden
+  // prevent content from running below tabs
+
 // Remove border on bottom, left, right
 
 .tabs-below .nav-tabs,

data/stylesheets_sass/compass_twitter_bootstrap/_reset.sass

@@ -109,7 +109,7 @@ input[type="submit"]
   cursor: pointer
   // Cursors on all buttons applied consistently
   -webkit-appearance: button
-  // Style clicable inputs in iOS
+  // Style clickable inputs in iOS
 
 input[type="search"]
   // Appearance in Safari/Chrome

data/stylesheets_sass/compass_twitter_bootstrap/_sprites.sass

@@ -8,23 +8,25 @@
 // 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>
+// <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: url(../img/glyphicons-halflings.png)
+  background-image: image-url("$iconSpritePath")
   background-position: 14px 14px
   background-repeat: no-repeat
   +ie7-restore-right-whitespace
 
 .icon-white
-  background-image: url(../img/glyphicons-halflings-white.png)
+  background-image: image-url("$iconWhiteSpritePath")
 
 .icon-glass
   background-position: 0      0

data/stylesheets_sass/compass_twitter_bootstrap/_tables.sass

@@ -23,12 +23,13 @@ table
     padding: 8px
     line-height: $baseLineHeight
     text-align: left
+    vertical-align: top
     border-top: 1px solid #ddd
   th
     font-weight: bold
+  // Bottom align for column headings
+  thead th
     vertical-align: bottom
-  td
-    vertical-align: top
   // Remove top border from thead by default
   thead:first-child tr th,
   thead:first-child tr td
@@ -90,6 +91,14 @@ table
     tr:nth-child(odd) th
       background-color: #f9f9f9
 
+// 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: #f5f5f5
+
 // TABLE CELL SIZING
 // -----------------
 

data/stylesheets_sass/compass_twitter_bootstrap/_thumbnails.sass

@@ -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/stylesheets_sass/compass_twitter_bootstrap/_type.sass

@@ -99,7 +99,8 @@ ol
 li
   line-height: $baseLineHeight
 
-ul.unstyled
+ul.unstyled,
+ol.unstyled
   margin-left: 0
   list-style: none
 
@@ -124,7 +125,7 @@ dd
 hr
   margin: $baseLineHeight 0
   border: 0
-  border-top: 1px solid #e5e5e5
+  border-top: 1px solid $hrBorder
   border-bottom: 1px solid $white
 
 // Emphasis

data/stylesheets_sass/compass_twitter_bootstrap/_variables.sass

@@ -6,36 +6,36 @@
 // --------------------------------------------------
 
 // Links
-$linkColor: #0088cc
-$linkColorHover: darken($linkColor, 15%)
+$linkColor: #0088cc !default
+$linkColorHover: darken($linkColor, 15%) !default
 
 // Grays
-$black: black
-$grayDarker: #222222
-$grayDark: #333333
-$gray: #555555
-$grayLight: #999999
-$grayLighter: #eeeeee
-$white: white
+$black: black !default
+$grayDarker: #222222 !default
+$grayDark: #333333 !default
+$gray: #555555 !default
+$grayLight: #999999 !default
+$grayLighter: #eeeeee !default
+$white: white !default
 
 // Accent colors
-$blue: #049cdb
-$blueDark: #0064cd
-$green: #46a546
-$red: #9d261d
-$yellow: #ffc40d
-$orange: #f89406
-$pink: #c3325f
-$purple: #7a43b6
+$blue: #049cdb !default
+$blueDark: #0064cd !default
+$green: #46a546 !default
+$red: #9d261d !default
+$yellow: #ffc40d !default
+$orange: #f89406 !default
+$pink: #c3325f !default
+$purple: #7a43b6 !default
 
 // Typography
-$baseFontSize: 13px
-$baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif
-$baseLineHeight: 18px
-$textColor: $grayDark
+$baseFontSize: 13px !default
+$baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default
+$baseLineHeight: 18px !default
+$textColor: $grayDark !default
 
 // Buttons
-$primaryButtonBackground: $linkColor
+$primaryButtonBackground: $linkColor !default
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -43,51 +43,59 @@ $primaryButtonBackground: $linkColor
 // 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 !default
+$zindexPopover: 1010 !default
+$zindexTooltip: 1020 !default
+$zindexFixedNavbar: 1030 !default
+$zindexModalBackdrop: 1040 !default
+$zindexModal: 1050 !default
+
+// Sprite icons path
+$iconSpritePath: "../img/glyphicons-halflings.png" !default
+$iconWhiteSpritePath: "../img/glyphicons-halflings-white.png" !default
 
 // Input placeholder text color
-$placeholderText: $grayLight
+$placeholderText: $grayLight !default
+
+// Hr border color
+$hrBorder: $grayLighter !default
 
 // Navbar
-$navbarHeight: 40px
-$navbarBackground: $grayDarker
-$navbarBackgroundHighlight: $grayDark
+$navbarHeight: 40px !default
+$navbarBackground: $grayDarker !default
+$navbarBackgroundHighlight: $grayDark !default
+$navbarLinkBackgroundHover: transparent !default
 
-$navbarText: $grayLight
-$navbarLinkColor: $grayLight
-$navbarLinkColorHover: $white
+$navbarText: $grayLight !default
+$navbarLinkColor: $grayLight !default
+$navbarLinkColorHover: $white !default
 
 // Form states and alerts
-$warningText: #c09853
-$warningBackground: #fcf8e3
-$warningBorder: darken(adjust-hue($warningBackground, -10), 3%)
+$warningText: #c09853 !default
+$warningBackground: #fcf8e3 !default
+$warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default
 
-$errorText: #b94a48
-$errorBackground: #f2dede
-$errorBorder: darken(adjust-hue($errorBackground, -10), 3%)
+$errorText: #b94a48 !default
+$errorBackground: #f2dede !default
+$errorBorder: darken(adjust-hue($errorBackground, -10), 3%) !default
 
-$successText: #468847
-$successBackground: #dff0d8
-$successBorder: darken(adjust-hue($successBackground, -10), 5%)
+$successText: #468847 !default
+$successBackground: #dff0d8 !default
+$successBorder: darken(adjust-hue($successBackground, -10), 5%) !default
 
-$infoText: #3a87ad
-$infoBackground: #d9edf7
-$infoBorder: darken(adjust-hue($infoBackground, -10), 7%)
+$infoText: #3a87ad !default
+$infoBackground: #d9edf7 !default
+$infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default
 
 // GRID
 // --------------------------------------------------
 
 // Default 940px grid
-$gridColumns: 12
-$gridColumnWidth: 60px
-$gridGutterWidth: 20px
-$gridRowWidth: $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1)
+$gridColumns: 12 !default
+$gridColumnWidth: 60px !default
+$gridGutterWidth: 20px !default
+$gridRowWidth: $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1) !default
 
 // Fluid grid
-$fluidGridColumnWidth: 6.383%
-$fluidGridGutterWidth: 2.128%
+$fluidGridColumnWidth: 6.383% !default
+$fluidGridGutterWidth: 2.128% !default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass_twitter_bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70246547532360 !ruby/object:Gem::Requirement
+  requirement: &70327296649540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246547532360
+  version_requirements: *70327296649540
 description: Compass/SCSS version of the twitter bootstrap
 email:
 - vrwaller@gmail.com
@@ -136,12 +136,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -64765018268233274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -64765018268233274
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15