bootstrap-sass 1.2.1 → 1.3.0

data/vendor/assets/javascripts/bootstrap.js

@@ -0,0 +1,8 @@
+//= require bootstrap-modal
+//= require bootstrap-dropdown
+//= require bootstrap-scrollspy
+//= require bootstrap-tabs
+//= require bootstrap-twipsy
+//= require bootstrap-popover
+//= require bootstrap-alerts
+

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

@@ -1,22 +1,23 @@
 /*!
- * Bootstrap 1.2.0 
+ * Bootstrap v1.3.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Designed and built with all the love in the world @twitter by @mdo and @fat, and crafted into SASS by the fine typing of Thomas McDonald
- * Date: 6th September, 2011
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Converted to SASS by Thomas McDonald
+ *
+ * Date: Fri Sep 16 11:24:41 PDT 2011
  */
 
-// CSS Reset
 @import "bootstrap/reset";
 
-// Core
-@import "bootstrap/preboot";
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
 @import "bootstrap/scaffolding";
 
-// Styled patterns and elements
 @import "bootstrap/type";
 @import "bootstrap/forms";
 @import "bootstrap/tables";

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

@@ -15,18 +15,19 @@ fieldset {
   padding-top: $baseline;
   legend {
     display: block;
-    margin-left: 150px;
-    font-size: 20px;
+    padding-left: 150px;
+    font-size: $basefont * 1.5;
     line-height: 1;
-    *margin: 0 0 5px 145px; /* IE6-7 */
-    *line-height: 1.5; /* IE6-7 */
     color: $grayDark;
+    *padding: 0 0 5px 145px; /* IE6-7 */
+    *line-height: 1.5; /* IE6-7 */
   }
 }
 
 // Parent element that clears floats and wraps labels and fields together
-.clearfix {
+form .clearfix {
   margin-bottom: $baseline;
+  @include clearfix()
 }
 
 // Set font for forms
@@ -37,8 +38,8 @@ label, input, select, textarea {
 // Float labels left
 label {
   padding-top: 6px;
-  font-size: 13px;
-  line-height: 18px;
+  font-size: $basefont;
+  line-height: $baseline;
   float: left;
   width: 130px;
   text-align: right;
@@ -46,7 +47,7 @@ label {
 }
 
 // Shift over the inside div to align all label's relevant content
-div.input {
+form .input {
   margin-left: 150px;
 }
 
@@ -61,7 +62,7 @@ input, textarea, select, .uneditable-input {
   width: 210px;
   height: $baseline;
   padding: 4px;
-  font-size: 13px;
+  font-size: $basefont;
   line-height: $baseline;
   color: $gray;
   border: 1px solid #ccc;
@@ -80,7 +81,7 @@ input[type=checkbox], input[type=radio] {
 }
 
 input[type=file] {
-  background-color: #fff;
+  background-color: $white;
   padding: initial;
   border: initial;
   line-height: initial;
@@ -93,19 +94,27 @@ input[type=button], input[type=reset], input[type=submit] {
 }
 
 select, input[type=file] {
-  height: $baseline * 1.5;
+  height: $baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
   line-height: $baseline * 1.5;
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
+}
+
+// Make multiple select elements height not fixed
+select[multiple] {
+  height: inherit;
 }
 
 textarea {
   height: auto;
 }
 
+// For text that needs to appear as an input but should not be an input
 .uneditable-input {
-  background-color: #eee;
+  background-color: $white;
   display: block;
-  border-color: #ccc;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
+  border-color: #eee;
+  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
@@ -117,20 +126,24 @@ textarea {
 }
 
 // Focus states
-input, select, textarea {
+input, textarea {
   $transition: border linear .2s, box-shadow linear .2s;
   @include transition($transition);
   @include box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
 input:focus, textarea:focus {
-  outline: none;
+  outline: 0;
   border-color: rgba(82,168,236,.8);
   $shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
   @include box-shadow($shadow);
 }
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  @include box-shadow(none); // override for file inputs
+  outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
+}
 
 // Error styles
-form div.error {
+form div.clearfix.error {
   background: lighten($red, 57%);
   padding: 10px 0;
   margin: -10px 0 10px;
@@ -157,6 +170,7 @@ form div.error {
 }
 
 // Form element sizes
+// TODO v2: remove duplication here and just stick to .input-[size] in light of adding .spanN sizes
 .input-mini, input.mini, textarea.mini, select.mini {
   width: 60px;
 }
@@ -176,14 +190,42 @@ form div.error {
   width: 530px;
 }
 textarea.xxlarge {
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
-// Turn off focus for disabled (read-only) form elements
-input[readonly]:focus, textarea[readonly]:focus, input.disabled {
-  background: #f5f5f5;
+// Grid style input sizes
+// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+@mixin formColumns($columnSpan: 1) {
+  display: inline-block;
+  float: none;
+  width: (($gridColumnWidth - 10) * $columnSpan) + (($gridColumnWidth - 10) * ($columnSpan - 1));
+  margin-left: 0;
+}
+input, textarea, select {
+  // Default columns
+  &.span1     { @include formColumns(1); }
+  &.span2     { @include formColumns(2); }
+  &.span3     { @include formColumns(3); }
+  &.span4     { @include formColumns(4); }
+  &.span5     { @include formColumns(5); }
+  &.span6     { @include formColumns(6); }
+  &.span7     { @include formColumns(7); }
+  &.span8     { @include formColumns(8); }
+  &.span9     { @include formColumns(9); }
+  &.span10    { @include formColumns(10); }
+  &.span11    { @include formColumns(11); }
+  &.span12    { @include formColumns(12); }
+  &.span13    { @include formColumns(13); }
+  &.span14    { @include formColumns(14); }
+  &.span15    { @include formColumns(15); }
+  &.span16    { @include formColumns(16); }
+}
+
+// Disabled and read-only inputs
+input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
+  background-color: #f5f5f5;
   border-color: #ddd;
-  @include box-shadow(none);
+  cursor: not-allowed;
 }
 
 // Actions (the buttons)
@@ -207,7 +249,7 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
 
 // Help Text
 .help-inline, .help-block {
-  font-size: 12px;
+  font-size: $basefont - 2;
   line-height: $baseline;
   color: $grayLight;
 }
@@ -246,20 +288,22 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
     @include border-radius(0 3px 3px 0);
   }
   .add-on {
+    position: relative;
     background: #f5f5f5;
+    border: 1px solid #ccc;
+    z-index: 2;
     float: left;
     display: block;
     width: auto;
     min-width: 16px;
+    height: 18px;
     padding: 4px 4px 4px 5px;
-    color: $grayLight;
+    margin-right: -1px;
     font-weight: normal;
     line-height: 18px;
-    height: 18px;
+    color: $grayLight;
     text-align: center;
-    text-shadow: 0 1px 0 #fff;
-    border: 1px solid #ccc;
-    border-right-width: 0;
+    text-shadow: 0 1px 0 $white;
     @include border-radius(3px 0 0 3px);
   }
   .active {
@@ -279,8 +323,8 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
   }
   .add-on {
     @include border-radius(0 3px 3px 0);
-    border-right-width: 1px;
-    border-left-width: 0;
+    margin-right: 0;
+    margin-left: -1px;
   }
 }
 
@@ -292,31 +336,34 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
     display: block;
     padding: 0;
     width: 100%;
-    label {
-      display: block;
-      float: none;
-      width: auto;
-      padding: 0;
-      line-height: $baseline;
-      text-align: left;
-      white-space: normal;
-      strong {
-        color: $gray;
-      }
-      small {
-        font-size: 12px;
-        font-weight: normal;
-      }
-    }
-    ul.inputs-list {
-      margin-left: 25px;
-      margin-bottom: 10px;
-      padding-top: 0;
+  }
+  label {
+    display: block;
+    float: none;
+    width: auto;
+    padding: 0;
+    line-height: $baseline;
+    text-align: left;
+    white-space: normal;
+    strong {
+      color: $gray;
     }
-    &:first-child {
-      padding-top: 5px;
+    small {
+      font-size: $basefont - 2;
+      font-weight: normal;
     }
   }
+  .inputs-list {
+    margin-left: 25px;
+    margin-bottom: 10px;
+    padding-top: 0;
+  }
+  &:first-child {
+    padding-top: 6px;
+  }
+  li + li {
+    padding-top: 2px;
+  }
   input[type=radio], input[type=checkbox] {
     margin-bottom: 0;
   }
@@ -329,7 +376,7 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
     padding-top: $baseline / 2;
   }
   legend {
-    margin-left: 0;
+    padding-left: 0;
   }
   label {
     display: block;
@@ -356,7 +403,7 @@ input[readonly]:focus, textarea[readonly]:focus, input.disabled {
       }
     }
   }
-  div.error {
+  div.clearfix.error {
     padding-top: 10px;
     padding-bottom: 10px;
     padding-left: 10px;

data/vendor/assets/stylesheets/bootstrap/{preboot.css.scss → mixins.css.scss}

@@ -1,65 +1,17 @@
-/* preboot.css.scss
- * Variables and mixins to pre-ignite any new web development project
- * ------------------------------------------------------------------ */
+/* mixins.css.scss
+ * Snippets of reusable CSS to develop faster and keep code readable
+ * ----------------------------------------------------------------- */
 
-// VARIABLES
-// ---------
-
-// Links
-$linkColor:         #0069d6;
-$linkColorHover:    darken($linkColor, 10);
-
-// 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
-$gridColumns:       16;
-$gridColumnWidth:   40px;
-$gridGutterWidth:   20px;
-$extraSpace:        ($gridGutterWidth * 2); // For our grid calculations
-$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
-
-// Color Scheme
-$baseColor:         $blue;                  // Set a base color
-$complement:        complement($baseColor);  // Determine a complementary color
-$split1:            adjust-hue($baseColor, 158);  // Split complements
-$split2:            adjust-hue($baseColor, -158);
-$triad1:            adjust-hue($baseColor, 135);  // Triads colors
-$triad2:            adjust-hue($baseColor, -135);
-$tetra1:            adjust-hue($baseColor, 90);   // Tetra colors
-$tetra2:            adjust-hue($baseColor, -90);
-$analog1:           adjust-hue($baseColor, 22);   // Analogs colors
-$analog2:           adjust-hue($baseColor, -22);
-
-
-// MIXINS
-// ------
 
 // Clearfix for clearing floats like a boss h5bp.com/q
-@mixin clearfix {
+@mixin clearfix() {
   zoom: 1;
-	&:before, &:after {
+	&:before,
+  &:after {
     display: table;
     content: "";
+    zoom: 1;
+    *display: inline;
 	}
 	&:after {
     clear: both;
@@ -67,9 +19,10 @@ $analog2:           adjust-hue($baseColor, -22);
 }
 
 // Center-align a block level element
-@mixin center-block {
-	display: block;
-  margin: 0 auto;
+@mixin center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 // Sizing shortcuts
@@ -117,9 +70,10 @@ $analog2:           adjust-hue($baseColor, -22);
 }
 
 // Grid System
-.container {
+@mixin fixed-container() {
   width: $siteWidth;
-  margin: 0 auto;
+  margin-left: auto;
+  margin-right: auto;
   @include clearfix();
 }
 @mixin columns($columnSpan: 1) {
@@ -128,6 +82,17 @@ $analog2:           adjust-hue($baseColor, -22);
 @mixin offset($columnOffset: 1) {
   margin-left: ($gridColumnWidth * $columnOffset) + ($gridGutterWidth * ($columnOffset - 1)) + $extraSpace;
 }
+// Necessary grid styles for every column to make them appear next to each other horizontally
+@mixin gridColumn() {
+  display: inline;
+  float: left;
+  margin-left: $gridGutterWidth;
+}
+// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
+@mixin makeColumn($columnSpan: 1) {
+  @include gridColumn();
+  @include columns($columnSpan);
+}
 
 // Border Radius
 @mixin border-radius($radius: 5px) {
@@ -147,6 +112,8 @@ $analog2:           adjust-hue($baseColor, -22);
 @mixin transition($transition) {
 	-webkit-transition: $transition;
 	   -moz-transition: $transition;
+ 	    -ms-transition: $transition;
+	     -o-transition: $transition;
 	        transition: $transition;
 }
 
@@ -176,6 +143,14 @@ $analog2:           adjust-hue($baseColor, -22);
 	background-clip: padding-box;
 }
 
+// Gradient Bar Colors for buttons and allerts
+@mixin gradientBar($primaryColor, $secondaryColor) {
+  @include vertical-gradient($primaryColor, $secondaryColor);
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+
 // Gradients
 @mixin horizontal-gradient($startColor: #555, $endColor: #333) {
   background-color: $endColor;
@@ -187,6 +162,7 @@ $analog2:           adjust-hue($baseColor, -22);
   background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
   background-image: linear-gradient(left, $startColor, $endColor); // Le standard
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=1); // IE9 and down
 }
 @mixin vertical-gradient($startColor: #555, $endColor: #333) {
   background-color: $endColor;
@@ -198,6 +174,7 @@ $analog2:           adjust-hue($baseColor, -22);
   background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
   background-image: linear-gradient(top, $startColor, $endColor); // The standard
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=0); // IE9 and down
 }
 @mixin directional-gradient($startColor: #555, $endColor: #333, $deg: 45deg) {
   background-color: $endColor;
@@ -217,49 +194,19 @@ $analog2:           adjust-hue($baseColor, -22);
   background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{$startColor}, endColorstr=#{$endColor}, GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
 }
 
-// Gradient Bar Colors for buttons and allerts
-@mixin gradientBar($primaryColor, $secondaryColor) {
-  @include vertical-gradient($primaryColor, $secondaryColor);
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-// Shared colors for buttons and alerts
-.btn,
-.alert-message {
-  // Set text color
-  &.danger,
-  &.danger:hover,
-  &.error,
-  &.error:hover,
-  &.success,
-  &.success:hover,
-  &.info,
-  &.info:hover {
-    color: $white
-  }
-  // Danger and error appear as red
-  &.danger,
-  &.error {
-    @include gradientBar(#ee5f5b, #c43c35);
-  }
-  // Success appears as green
-  &.success {
-    @include gradientBar(#62c462, #57a957);
-  }
-  // Info appears as a neutral blue
-  &.info {
-    @include gradientBar(#5bc0de, #339bb9);
-  }
+// Reset filters for IE
+@mixin reset-filter() {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false)
 }
 
 // Opacity
 @mixin opacity($opacity: 100) {
+	filter: alpha(opacity=#{$opacity});
 	-khtml-opacity: $opacity / 100;
 	  -moz-opacity: $opacity / 100;
 	       opacity: $opacity / 100;
 }
 
-