bootstrap-sass 2.0.0 → 2.0.1

data/vendor/assets/stylesheets/bootstrap/_modals.scss

@@ -1,6 +1,7 @@
 // MODALS
 // ------
 
+// Recalculate z-index where appropriate
 .modal-open {
   .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
   .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
@@ -8,6 +9,7 @@
   .tooltip       {  z-index: $zindexTooltip  + $zindexModal; }
 }
 
+// Background
 .modal-backdrop {
   position: fixed;
   top: 0;
@@ -21,9 +23,10 @@
 }
 
 .modal-backdrop, .modal-backdrop.fade.in {
-  @include opacity(80);
+  @include opacity(0.8);
 }
 
+// Base modal
 .modal {
   position: fixed;
   top: 50%;
@@ -53,9 +56,17 @@
   // Close icon
   .close { margin-top: 2px; }
 }
+
+// Body (where all modal content resides)
 .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;
@@ -69,4 +80,4 @@
     margin-left: 5px;
     margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
   }
-}
+}

data/vendor/assets/stylesheets/bootstrap/_navbar.scss

@@ -80,7 +80,7 @@
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -99,6 +99,13 @@
   input[type="image"], input[type="checkbox"], input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append, .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // prevents 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 parent
+    }
+  }
 }
 
 // Navbar search
@@ -128,7 +135,7 @@
       background-color: $grayLight;
       background-color: rgba(255,255,255,.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;
       color: $grayDark;
@@ -188,7 +195,7 @@
 }
 // 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;
 }
@@ -198,7 +205,6 @@
   color: $navbarLinkColorHover;
   text-decoration: none;
   background-color: $navbarBackground;
-  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
@@ -254,7 +260,7 @@
   border-top-color: $white;
 }
 .navbar .nav .active .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Remove background color from open dropdown
@@ -279,4 +285,4 @@
     left: auto;
     right: 13px;
   }
-}
+}

data/vendor/assets/stylesheets/bootstrap/_navs.scss

@@ -21,6 +21,21 @@
   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,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
 
 
 // NAV LIST
@@ -32,28 +47,19 @@
   margin-bottom: 0;
 }
 .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,.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, .nav-list .active > a:hover {
   color: $white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: $linkColor;
 }
-.nav-list .icon {
+.nav-list [class^="icon-"] {
   margin-right: 2px;
 }
 
@@ -213,7 +219,7 @@
 }
 .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: $white;
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Dropdowns in stacked tabs
@@ -234,6 +240,9 @@
 .tabbable {
   @include clearfix();
 }
+.tab-content {
+  overflow: hidden; // prevent content from running below tabs
+}
 
 // Remove border on bottom, left, right
 .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
@@ -317,4 +326,4 @@
 .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: $white;
-}
+}

data/vendor/assets/stylesheets/bootstrap/_reset.scss

@@ -87,7 +87,7 @@ button::-moz-focus-inner, input::-moz-focus-inner { // Inner padding and border
 }
 button, input[type="button"], input[type="reset"], input[type="submit"] {
   cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clicable inputs in iOS
+  -webkit-appearance: button; // Style clickable inputs in iOS
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-appearance: textfield;

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

@@ -9,15 +9,16 @@
 // 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: asset-url("glyphicons-halflings.png", image);
   background-position: 14px 14px;

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

@@ -24,14 +24,15 @@ table {
     padding: 8px;
     line-height: $baseLineHeight;
     text-align: left;
+    vertical-align: top;
     border-top: 1px solid #ddd;
   }
   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 {
@@ -100,6 +101,14 @@ table {
 }
 
 
+// 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/vendor/assets/stylesheets/bootstrap/_thumbnails.scss

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

data/vendor/assets/stylesheets/bootstrap/_tooltip.scss

@@ -9,7 +9,7 @@
   padding: 5px;
   font-size: 11px;
   @include opacity(0);
-  &.in     { @include opacity(80); }
+  &.in     { @include opacity(0.8); }
   &.top    { margin-top:  -2px; }
   &.right  { margin-left:  2px; }
   &.bottom { margin-top:   2px; }
@@ -32,4 +32,4 @@
   position: absolute;
   width: 0;
   height: 0;
-}
+}

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

@@ -107,7 +107,7 @@ ol {
 li {
   line-height: $baseLineHeight;
 }
-ul.unstyled {
+ul.unstyled, ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -133,7 +133,7 @@ dd {
 hr {
   margin: $baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid $hrBorder;
   border-bottom: 1px solid $white;
 }
 

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

@@ -55,12 +55,16 @@ $zindexModalBackdrop:   1040;
 $zindexModal:           1050;
 
 // Input placeholder text color
-$placeholderText:       $grayLight !default;
+$placeholderText:         $grayLight !default;
+
+// 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;
@@ -92,7 +96,7 @@ $infoBorder:              darken(adjust-hue($infoBackground, -10), 7%) !default;
 $gridColumns:             12 !default;
 $gridColumnWidth:         60px !default;
 $gridGutterWidth:         20px !default;
-$gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
+$gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
 
 // Fluid grid
 $fluidGridColumnWidth:    6.382978723% !default;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 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-06 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70321730749300 !ruby/object:Gem::Requirement
+  requirement: &70123629250160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321730749300
+  version_requirements: *70123629250160
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70321730748560 !ruby/object:Gem::Requirement
+  requirement: &70123633347860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70321730748560
+  version_requirements: *70123633347860
 description: 
 email: tom@conceptcoding.co.uk
 executables: []
@@ -121,5 +121,5 @@ rubyforge_project:
 rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
-summary: Twitter's Bootstrap, converted to SASS and ready to drop into Rails
+summary: Twitter's Bootstrap, converted to SASS and ready to drop into Rails or Compass
 test_files: []