compass-bootstrap-rails 0.1.3.3 → 0.1.4.0

data/vendor/assets/stylesheets/compass-bootstrap/_scaffolding.scss

@@ -7,10 +7,8 @@
 // STRUCTURAL LAYOUT
 // -----------------
 
-html, body {
-  background-color: $white;
-}
 body {
+  background-color: $white;
   margin: 0;
   @include font-sans-serif(normal,$basefont,$baseline);
   color: $grayDark;
@@ -28,26 +26,17 @@ body {
   padding-right: 20px;
   @include clearfix();
   > .sidebar {
-    float: left;
+    position: absolute;
+    top: 0;
+    left: 20px;
     width: 220px;
   }
   // TODO in v2: rename this and .popover .content to be more specific
   > .content {
-    float: left;
-    min-width: 700px;
-    max-width: 1180px;
-    margin-left: 20px;
+    margin-left: 240px;
   }
 }
 
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
 
 // BASE STYLES
 // -----------
@@ -72,6 +61,14 @@ a {
   float: left;
 }
 
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
 
 // GRID SYSTEM
 // -----------
@@ -79,12 +76,12 @@ a {
 
 .row {
   @include clearfix();
-  margin-left: -1 * $gridGutterWidth;
+  margin-left: -$gridGutterWidth;
 }
 
 // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
 // Credit to $dhg for the idea
-[class*="span"] {
+.row > [class*="span"] {
   @include gridColumn();
 }
 
@@ -117,18 +114,20 @@ a {
 .span24    { @include columns(24); }
 
 // Offset column options
-.offset1   { @include offset(1); }
-.offset2   { @include offset(2); }
-.offset3   { @include offset(3); }
-.offset4   { @include offset(4); }
-.offset5   { @include offset(5); }
-.offset6   { @include offset(6); }
-.offset7   { @include offset(7); }
-.offset8   { @include offset(8); }
-.offset9   { @include offset(9); }
-.offset10  { @include offset(10); }
-.offset11  { @include offset(11); }
-.offset12  { @include offset(12); }
+.row {
+  & > .offset1   { @include offset(1); }
+  & > .offset2   { @include offset(2); }
+  & > .offset3   { @include offset(3); }
+  & > .offset4   { @include offset(4); }
+  & > .offset5   { @include offset(5); }
+  & > .offset6   { @include offset(6); }
+  & > .offset7   { @include offset(7); }
+  & > .offset8   { @include offset(8); }
+  & > .offset9   { @include offset(9); }
+  & > .offset10  { @include offset(10); }
+  & > .offset11  { @include offset(11); }
+  & > .offset12  { @include offset(12); }
+}
 
 // Unique column sizes for 16-column grid
 .span-one-third     { width: 300px; }

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

@@ -11,12 +11,10 @@ table {
   width: 100%;
   margin-bottom: $baseline;
   padding: 0;
-  border-collapse: separate; // Done so we can round those corners!
-  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
   font-size: $basefont;
-  border: 1px solid #ddd;
-  @include border-radius(4px);
-  th, td {
+  border-collapse: collapse;
+  th,
+  td {
     padding: 10px 10px 9px;
     line-height: $baseline;
     text-align: left;
@@ -25,47 +23,104 @@ table {
     padding-top: 9px;
     font-weight: bold;
     vertical-align: middle;
-    border-bottom: 1px solid #ddd;
   }
   td {
     vertical-align: top;
+    border-bottom: 1px solid #ddd;
+  }
+  // When scoped to row, fix th in tbody
+  tbody th {
+    border-top: 1px solid #ddd;
+    vertical-align: top;
   }
+}
+
+
+// CONDENSED VERSION
+// -----------------
+.condensed-table {
+  th,
+  td {
+    padding: 5px 5px 4px;
+  }
+}
+
+
+// BORDERED VERSION
+// ----------------
+
+.bordered-table {
+  border: 1px solid #ddd;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
+  @import border-radius(4px);
   th + th,
-  td + td {
+  td + td,
+  th + td {
     border-left: 1px solid #ddd;
   }
-  tr + tr td {
-    border-top: 1px solid #ddd;
-  }
+  thead tr:first-child th:first-child,
   tbody tr:first-child td:first-child {
-    @include border-radius(4px 0 0 0);
+    @import border-radius(4px 0 0 0);
   }
+  thead tr:first-child th:last-child,
   tbody tr:first-child td:last-child {
-    @include border-radius(0 4px 0 0);
+    @import border-radius(0 4px 0 0);
   }
   tbody tr:last-child td:first-child {
-    @include border-radius(0 0 0 4px);
+    @import border-radius(0 0 0 4px);
   }
   tbody tr:last-child td:last-child {
-    @include border-radius(0 0 4px 0);
+    @import border-radius(0 0 4px 0);
   }
 }
 
 
+// TABLE CELL SIZES
+// ----------------
+
+// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border
+@mixin tableColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1));
+}
+table {
+  // Default columns
+  .span1     { @import tableColumns(1); }
+  .span2     { @import tableColumns(2); }
+  .span3     { @import tableColumns(3); }
+  .span4     { @import tableColumns(4); }
+  .span5     { @import tableColumns(5); }
+  .span6     { @import tableColumns(6); }
+  .span7     { @import tableColumns(7); }
+  .span8     { @import tableColumns(8); }
+  .span9     { @import tableColumns(9); }
+  .span10    { @import tableColumns(10); }
+  .span11    { @import tableColumns(11); }
+  .span12    { @import tableColumns(12); }
+  .span13    { @import tableColumns(13); }
+  .span14    { @import tableColumns(14); }
+  .span15    { @import tableColumns(15); }
+  .span16    { @import tableColumns(16); }
+}
+
+
 // ZEBRA-STRIPING
 // --------------
 
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 .zebra-striped {
   tbody {
-    tr:nth-child(odd) td {
+    tr:nth-child(odd) td,
+    tr:nth-child(odd) th {
       background-color: #f9f9f9;
     }
-    tr:hover td {
+    tr:hover td,
+    tr:hover th {
       background-color: #f5f5f5;
     }
   }
 
+table {
   // Tablesorting styles w/ jQuery plugin
   .header {
     cursor: pointer;
@@ -111,9 +166,6 @@ table {
       @include opacity(60);
     }
   }
-}
-
-table {
   // Blue Table Headings
   .blue {
     color: $blue;

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

@@ -7,7 +7,7 @@
 // ---------
 
 p {
-  @include font-shorthand(normal,$basefont,$baseline);
+  @include shorthand(normal,$basefont,$baseline);
   margin-bottom: $baseline / 2;
   small {
     font-size: $basefont - 2;
@@ -138,12 +138,12 @@ blockquote {
   border-left: 5px solid #eee;
   padding-left: 15px;
   p {
-    @include font-shorthand(300,14px,$baseline);
+    @include shorthand(300,14px,$baseline);
     margin-bottom: 0;
   }
   small {
     display: block;
-    @include font-shorthand(300,12px,$baseline);
+    @include shorthand(300,12px,$baseline);
     color: $grayLight;
     &:before {
       content: '\2014 \00A0';

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

@@ -4,51 +4,51 @@
 
 
 // Links
-$linkColor:         #0069d6 !default;
-$linkColorHover:    darken($linkColor, 15) !default;
+$linkColor:         #0069d6;
+$linkColorHover:    darken($linkColor, 15);
 
 // Grays
-$black:             #000 !default;
-$grayDark:          lighten($black, 25%) !default;
-$gray:              lighten($black, 50%) !default;
-$grayLight:         lighten($black, 75%) !default;
-$grayLighter:       lighten($black, 90%) !default;
-$white:             #fff !default;
+$black:             #000;
+$grayDark:          lighten($black, 25%);
+$gray:              lighten($black, 50%);
+$grayLight:         lighten($black, 75%);
+$grayLighter:       lighten($black, 90%);
+$white:             #fff;
 
 // Accent Colors
-$blue:              #049CDB !default;
-$blueDark:          #0064CD !default;
-$green:             #46a546 !default;
-$red:               #9d261d !default;
-$yellow:            #ffc40d !default;
-$orange:            #f89406 !default;
-$pink:              #c3325f !default;
-$purple:            #7a43b6 !default;
+$blue:              #049CDB;
+$blueDark:          #0064CD;
+$green:             #46a546;
+$red:               #9d261d;
+$yellow:            #ffc40d;
+$orange:            #f89406;
+$pink:              #c3325f;
+$purple:            #7a43b6;
 
 // Baseline grid
-$basefont:          13px !default;
-$baseline:          18px !default;
+$basefont:          13px;
+$baseline:          18px;
 
 // Griditude
 // Modify the grid styles in mixins.less
-$gridColumns:       16 !default;
-$gridColumnWidth:   40px !default;
-$gridGutterWidth:   20px !default;
-$extraSpace:        ($gridGutterWidth * 2) !default; // For our grid calculations
-$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
+$gridColumns:       16;
+$gridColumnWidth:   40px;
+$gridGutterWidth:   20px;
+$extraSpace:        ($gridGutterWidth * 2); // For our grid calculations
+$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
 
 // Color Scheme
 // Use this to roll your own color schemes if you like (unused by Bootstrap by default)
-$baseColor:         $blue !default;                  // Set a base color
-$complement:        spin($baseColor, 180) !default;  // Determine a complementary color
-$split1:            spin($baseColor, 158) !default;  // Split complements
-$split2:            spin($baseColor, -158) !default;
-$triad1:            spin($baseColor, 135) !default;  // Triads colors
-$triad2:            spin($baseColor, -135) !default;
-$tetra1:            spin($baseColor, 90) !default;   // Tetra colors
-$tetra2:            spin($baseColor, -90) !default;
-$analog1:           spin($baseColor, 22) !default;   // Analogs colors
-$analog2:           spin($baseColor, -22) !default;
+$baseColor:         $blue;                  // Set a base color
+$complement:        spin($baseColor, 180);  // Determine a complementary color
+$split1:            spin($baseColor, 158);  // Split complements
+$split2:            spin($baseColor, -158);
+$triad1:            spin($baseColor, 135);  // Triads colors
+$triad2:            spin($baseColor, -135);
+$tetra1:            spin($baseColor, 90);   // Tetra colors
+$tetra2:            spin($baseColor, -90);
+$analog1:           spin($baseColor, 22);   // Analogs colors
+$analog2:           spin($baseColor, -22);
 
 
 
@@ -56,5 +56,5 @@ $analog2:           spin($baseColor, -22) !default;
 // - $basefont to $baseFontSize
 // - $baseline to $baseLineHeight
 // - $baseFontFamily
-// - $primaryButtonColor
+@include // - $primaryButtonColor
 // - anything else? File an issue on GitHub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3.3
+  version: 0.1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70308770594160 !ruby/object:Gem::Requirement
+  requirement: &70119121834740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308770594160
+  version_requirements: *70119121834740
 description: Bootstrap is a toolkit from Twitter designed to kickstart development
   of webapps and sites.
 email:
@@ -79,15 +79,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2663712755064933420
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2663712755064933420
 requirements: []
 rubyforge_project: compass-bootstrap
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Compass compatible Sass port of twitter bootstrap.