bootstrap-sass 1.2.1 → 1.3.0

data/vendor/assets/stylesheets/bootstrap/reset.css.scss

@@ -1,5 +1,5 @@
 /* reset.css.scss
- * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
+ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
  * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
 
 
@@ -30,6 +30,11 @@ html {
 a:focus {
   outline: thin dotted;
 }
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
 
 // Display in IE6-9 and FF3
 // -------------------------

data/vendor/assets/stylesheets/bootstrap/scaffolding.css.scss

@@ -4,82 +4,28 @@
  * ------------------------------------------------------------------------------------------- */
 
 
-// GRID SYSTEM
-// -----------
-
-.row {
-  @include clearfix();
-  margin-left: -1 * $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"] {
-    display: inline;
-    float: left;
-    margin-left: $gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { @include columns(1); }
-  .span2     { @include columns(2); }
-  .span3     { @include columns(3); }
-  .span4     { @include columns(4); }
-  .span5     { @include columns(5); }
-  .span6     { @include columns(6); }
-  .span7     { @include columns(7); }
-  .span8     { @include columns(8); }
-  .span9     { @include columns(9); }
-  .span10    { @include columns(10); }
-  .span11    { @include columns(11); }
-  .span12    { @include columns(12); }
-  .span13    { @include columns(13); }
-  .span14    { @include columns(14); }
-  .span15    { @include columns(15); }
-  .span16    { @include columns(16); }
-
-  // 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); }
-
-  // Unique column sizes for 16-column grid
-  .span-one-third     { width: 300px; }
-  .span-two-thirds    { width: 620px; }
-  .offset-one-third   { margin-left: 340px; }
-  .offset-two-thirds  { margin-left: 660px; }
-}
-
-
 // STRUCTURAL LAYOUT
 // -----------------
 
 html, body {
-  background-color: #fff;
+  background-color: $white;
 }
 body {
   margin: 0;
   @include sans-serif-font(normal,$basefont,$baseline);
-  color: $gray;
+  color: $grayDark;
 }
 
 // Container (centered, fixed-width layouts)
 .container {
-  width: 940px;
-  margin: 0 auto;
+  @include fixed-container();
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .container-fluid {
-  padding: 0 20px;
+  position: relative;
+  padding-left: 20px;
+  padding-right: 20px;
   @include clearfix();
   > .sidebar {
     float: left;
@@ -87,12 +33,21 @@ body {
   }
   // TODO in v2: rename this and .popover .content to be more specific
   > .content {
+    float: left;
     min-width: 700px;
     max-width: 1180px;
-    margin-left: 240px;
+    margin-left: 20px;
   }
 }
 
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
 
 // BASE STYLES
 // -----------
@@ -108,3 +63,76 @@ a {
     text-decoration: underline;
   }
 }
+
+// Quick floats
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+
+
+// GRID SYSTEM
+// -----------
+// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
+
+.row {
+  @include clearfix();
+  margin-left: -1 * $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"] {
+  @include gridColumn();
+}
+
+// Default columns
+.span1     { @include columns(1); }
+.span2     { @include columns(2); }
+.span3     { @include columns(3); }
+.span4     { @include columns(4); }
+.span5     { @include columns(5); }
+.span6     { @include columns(6); }
+.span7     { @include columns(7); }
+.span8     { @include columns(8); }
+.span9     { @include columns(9); }
+.span10    { @include columns(10); }
+.span11    { @include columns(11); }
+.span12    { @include columns(12); }
+.span13    { @include columns(13); }
+.span14    { @include columns(14); }
+.span15    { @include columns(15); }
+.span16    { @include columns(16); }
+
+// For optional 24-column grid
+.span17    { @include columns(17); }
+.span18    { @include columns(18); }
+.span19    { @include columns(19); }
+.span20    { @include columns(20); }
+.span21    { @include columns(21); }
+.span22    { @include columns(22); }
+.span23    { @include columns(23); }
+.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); }
+
+// Unique column sizes for 16-column grid
+.span-one-third     { width: 300px; }
+.span-two-thirds    { width: 620px; }
+.offset-one-third   { margin-left: 340px; }
+.offset-two-thirds  { margin-left: 660px; }
+

data/vendor/assets/stylesheets/bootstrap/tables.css.scss

@@ -3,6 +3,7 @@
  * Tables for, you guessed it, tabular data
  * ---------------------------------------- */
 
+
 // BASELINE STYLES
 // ---------------
 
@@ -10,19 +11,43 @@ table {
   width: 100%;
   margin-bottom: $baseline;
   padding: 0;
-  border-collapse: separate;
-  font-size: 13px;
+  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 {
     padding: 10px 10px 9px;
-    line-height: $baseline * .75;
+    line-height: $baseline;
     text-align: left;
-    vertical-align: middle;
-    border-bottom: 1px solid #ddd;
   }
   th {
     padding-top: 9px;
     font-weight: bold;
-    border-bottom-width: 2px;
+    vertical-align: middle;
+    border-bottom: 1px solid #ddd;
+  }
+  td {
+    vertical-align: top;
+  }
+  th + th,
+  td + td {
+    border-left: 1px solid #ddd;
+  }
+  tr + tr td {
+    border-top: 1px solid #ddd;
+  }
+  tbody tr:first-child td:first-child {
+    @include border-radius(4px 0 0 0);
+  }
+  tbody tr:first-child td:last-child {
+    @include border-radius(0 4px 0 0);
+  }
+  tbody tr:last-child td:first-child {
+    @include border-radius(0 0 0 4px);
+  }
+  tbody tr:last-child td:last-child {
+    @include border-radius(0 0 4px 0);
   }
 }
 
@@ -59,7 +84,6 @@ table {
   .headerSortDown {
     background-color: rgba(141,192,219,.25);
     text-shadow: 0 1px 1px rgba(255,255,255,.75);
-    @include border-radius(3px 3px 0 0);
   }
   // Style the ascending (reverse alphabetical) column header
   .header:hover {
@@ -146,3 +170,4 @@ table {
   }
 }
 
+

data/vendor/assets/stylesheets/bootstrap/type.css.scss

@@ -1,10 +1,10 @@
-/* typography.css.scss
+/* type.css.scss
  * Headings, body text, lists, code, and more for a versatile and durable typography system
  * ---------------------------------------------------------------------------------------- */
 
+
 // BODY TEXT
 // ---------
-
 p {
   @include shorthand-font(normal,$basefont,$baseline);
   margin-bottom: $baseline / 2;
@@ -112,7 +112,7 @@ dl {
 
 // Horizontal rules
 hr {
-  margin: 0 0 19px;
+  margin: 20px 0 19px;
   border: 0;
   border-bottom: 1px solid #eee;
 }
@@ -121,7 +121,6 @@ hr {
 strong {
   font-style: inherit;
   font-weight: bold;
-  line-height: inherit;
 }
 em {
   font-style: italic;
@@ -173,7 +172,7 @@ code {
 pre {
   background-color: #f5f5f5;
   display: block;
-  padding: $baseline - 1;
+  padding: ($baseline - 1) / 2;
   margin: 0 0 $baseline;
   line-height: $baseline;
   font-size: 12px;
@@ -183,6 +182,5 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-wrap: break-word;
-
 }
 

data/vendor/assets/stylesheets/bootstrap/variables.css.scss

@@ -0,0 +1,51 @@
+/* Variables.less
+ * Variables to customize the look and feel of Bootstrap
+ * ----------------------------------------------------- */
+
+// Links
+$linkColor:         #0069d6;
+$linkColorHover:    darken($linkColor, 15);
+
+// Grays
+$black:             #000;
+$grayDark:          lighten($black, 25%);
+$gray:              lighten($black, 50%);
+$grayLight:         lighten($black, 75%);
+$grayLighter:       lighten($black, 90%);
+$white:             #fff;
+
+// Accent Colors
+$blue:              #049CDB;
+$blueDark:          #0064CD;
+$green:             #46a546;
+$red:               #9d261d;
+$yellow:            #ffc40d;
+$orange:            #f89406;
+$pink:              #c3325f;
+$purple:            #7a43b6;
+
+// Baseline grid
+$basefont:          13px;
+$baseline:          18px;
+
+// Griditude
+// Modify the grid styles in mixins.less
+$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;                  // 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);
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2152537480 !ruby/object:Gem::Requirement
+  requirement: &70106575150160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152537480
+  version_requirements: *70106575150160
 description: 
 email: tom@conceptcoding.co.uk
 executables: []
@@ -29,13 +29,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - vendor/assets/stylesheets/bootstrap/forms.css.scss
+- vendor/assets/stylesheets/bootstrap/mixins.css.scss
 - vendor/assets/stylesheets/bootstrap/patterns.css.scss
-- vendor/assets/stylesheets/bootstrap/preboot.css.scss
 - vendor/assets/stylesheets/bootstrap/reset.css.scss
 - vendor/assets/stylesheets/bootstrap/scaffolding.css.scss
 - vendor/assets/stylesheets/bootstrap/tables.css.scss
 - vendor/assets/stylesheets/bootstrap/type.css.scss
+- vendor/assets/stylesheets/bootstrap/variables.css.scss
 - vendor/assets/stylesheets/bootstrap.css.scss
+- vendor/assets/javascripts/bootstrap-alerts.js
+- vendor/assets/javascripts/bootstrap-dropdown.js
+- vendor/assets/javascripts/bootstrap-modal.js
+- vendor/assets/javascripts/bootstrap-popover.js
+- vendor/assets/javascripts/bootstrap-scrollspy.js
+- vendor/assets/javascripts/bootstrap-tabs.js
+- vendor/assets/javascripts/bootstrap-twipsy.js
+- vendor/assets/javascripts/bootstrap.js
 - README.md
 - LICENSE
 - lib/bootstrap-sass.rb