compass_twitter_bootstrap 2.0.3 → 2.2.2

data/stylesheets/compass_twitter_bootstrap/_grid.scss

@@ -1,5 +1,21 @@
+//
+// Grid system
+// --------------------------------------------------
+
+
 // Fixed (940px)
-@include bootstrap-grid-core($gridColumnWidth, $gridGutterWidth);
+@include ctb-grid-core($gridColumnWidth, $gridGutterWidth);
 
 // Fluid (940px)
-@include bootstrap-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);
+@include ctb-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);
+
+// Reset utility classes due to specificity
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}

data/stylesheets/compass_twitter_bootstrap/_hero-unit.scss

@@ -1,11 +1,17 @@
-// HERO UNIT
-// ---------
+//
+// Hero unit
+// --------------------------------------------------
+
 
 .hero-unit {
   padding: 60px;
   margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: $baseLineHeight * 1.5;
+  color: $heroUnitLeadColor;
   background-color: $heroUnitBackground;
-  @include bootstrap-border-radius(6px);
+  @include ctb-border-radius(6px);
   h1 {
     margin-bottom: 0;
     font-size: 60px;
@@ -13,10 +19,7 @@
     color: $heroUnitHeadingColor;
     letter-spacing: -1px;
   }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: $baseLineHeight * 1.5;
-    color: $heroUnitLeadColor;
+  li {
+    line-height: $baseLineHeight * 1.5; // Reset since we specify in type.less
   }
 }

data/stylesheets/compass_twitter_bootstrap/_labels-badges.scss

@@ -1,9 +1,13 @@
-// LABELS & BADGES
-// ---------------
+//
+// Labels and badges
+// --------------------------------------------------
+
 
 // Base classes
 .label,
 .badge {
+  display: inline-block;
+  padding: 2px 4px;
   font-size: $baseFontSize * .846;
   font-weight: bold;
   line-height: 14px; // ensure proper line-height if floated
@@ -15,12 +19,20 @@
 }
 // Set unique padding and border-radii
 .label {
-  padding: 1px 4px 2px;
-  @include bootstrap-border-radius(3px);
+  @include ctb-border-radius(3px);
+}
+.badge {
+  padding-left: 9px;
+  padding-right: 9px;
+  @include ctb-border-radius(9px);
 }
+
+// Empty labels/badges collapse
+.label,
 .badge {
-  padding: 1px 9px 2px;
-  @include bootstrap-border-radius(9px);
+  &:empty {
+    display: none;
+  }
 }
 
 // Hover state, but only for links
@@ -36,28 +48,32 @@ a {
 // Colors
 // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
 // Important (red)
-.label-important,
-.badge-important         { background-color: $errorText; }
-.label-important[href],
-.badge-important[href]   { background-color: darken($errorText, 10%); }
+.label-important, .badge-important        { background-color: $errorText; }
+.label-important[href], .badge-important[href]  { background-color: darken($errorText, 10%); }
 // Warnings (orange)
-.label-warning,
-.badge-warning           { background-color: $orange; }
-.label-warning[href],
-.badge-warning[href]     { background-color: darken($orange, 10%); }
+.label-warning, .badge-warning        { background-color: $orange; }
+.label-warning[href], .badge-warning[href]  { background-color: darken($orange, 10%); }
 // Success (green)
-.label-success,
-.badge-success           { background-color: $successText; }
-.label-success[href],
-.badge-success[href]     { background-color: darken($successText, 10%); }
+.label-success, .badge-success        { background-color: $successText; }
+.label-success[href], .badge-success[href]  { background-color: darken($successText, 10%); }
 // Info (turquoise)
-.label-info,
-.badge-info,             { background-color: $infoText; }
-.label-info[href],
-.badge-info[href]        { background-color: darken($infoText, 10%); }
+.label-info, .badge-info        { background-color: $infoText; }
+.label-info[href], .badge-info[href]  { background-color: darken($infoText, 10%); }
 // Inverse (black)
-.label-inverse,
-.badge-inverse,          { background-color: $grayDark; }
-.label-inverse[href],
-.badge-inverse[href]     { background-color: darken($grayDark, 10%); }
+.label-inverse, .badge-inverse        { background-color: $grayDark; }
+.label-inverse[href], .badge-inverse[href]  { background-color: darken($grayDark, 10%); }
 
+// Quick fix for labels/badges in buttons
+.btn {
+  .label,
+  .badge {
+    position: relative;
+    top: -1px;
+  }
+}
+.btn-mini {
+  .label,
+  .badge {
+    top: 0;
+  }
+}

data/stylesheets/compass_twitter_bootstrap/_layouts.scss

@@ -1,17 +1,16 @@
 //
 // Layouts
-// Fixed-width and fluid (with sidebar) layouts
-// --------------------------------------------
+// --------------------------------------------------
 
 
 // Container (centered, fixed-width layouts)
 .container {
-  @include bootstrap-container-fixed();
+  @include ctb-container-fixed();
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .container-fluid {
   padding-right: $gridGutterWidth;
   padding-left: $gridGutterWidth;
-  @include bootstrap-clearfix();
+  @include ctb-clearfix();
 }

data/stylesheets/compass_twitter_bootstrap/_media.scss

@@ -0,0 +1,55 @@
+// Media objects
+// Source: http://stubbornella.org/content/?p=497
+// --------------------------------------------------
+
+
+// Common styles
+// -------------------------
+
+// Clear the floats
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+// Proper spacing between instances of .media
+.media,
+.media .media {
+  margin-top: 15px;
+}
+.media:first-child {
+  margin-top: 0;
+}
+
+// For images and videos, set to block
+.media-object {
+  display: block;
+}
+
+// Reset margins on headings for tighter default spacing
+.media-heading {
+  margin: 0 0 5px;
+}
+
+
+// Media image alignment
+// -------------------------
+
+.media .pull-left {
+  margin-right: 10px;
+}
+.media .pull-right {
+  margin-left: 10px;
+}
+
+
+// Media list variation
+// -------------------------
+
+// Undo default ul/ol styles
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}

data/stylesheets/compass_twitter_bootstrap/_mixins.scss

@@ -1,6 +1,6 @@
-// Mixins.less
-// Snippets of reusable CSS to develop faster and keep code readable
-// -----------------------------------------------------------------
+//
+// Mixins
+// --------------------------------------------------
 
 
 // UTILITY MIXINS
@@ -9,12 +9,15 @@
 // Clearfix
 // --------
 // For clearing floats like a boss h5bp.com/q
-@mixin bootstrap-clearfix {
+@mixin ctb-clearfix {
   *zoom: 1;
   &:before,
   &:after {
     display: table;
     content: "";
+    // Fixes Opera/contenteditable bug:
+    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
+    line-height: 0;
   }
   &:after {
     clear: both;
@@ -23,7 +26,7 @@
 
 // Webkit-style focus
 // ------------------
-@mixin bootstrap-tab-focus() {
+@mixin ctb-tab-focus() {
   // Default
   outline: thin dotted #333;
   // Webkit
@@ -33,7 +36,7 @@
 
 // Center-align a block level element
 // ----------------------------------
-@mixin bootstrap-center-block() {
+@mixin ctb-center-block() {
   display: block;
   margin-left: auto;
   margin-right: auto;
@@ -41,8 +44,8 @@
 
 // IE7 inline-block
 // ----------------
-@mixin bootstrap-ie7-inline-block() {
-  *display: inline; /* IE7 inline-block hack */
+@mixin ctb-ie7-inline-block() {
+  *display: inline; // IE7 inline-block hack
   *zoom: 1;
 }
 
@@ -52,7 +55,7 @@
 // right version is for icons, which come before. Applying both is ok, but it will
 // mean that space between those elements will be .6em (~2 space characters) in IE7,
 // instead of the 1 space in other browsers.
-@mixin bootstrap-ie7-restore-left-whitespace() {
+@mixin ctb-ie7-restore-left-whitespace() {
   *margin-left: .3em;
 
   &:first-child {
@@ -60,31 +63,30 @@
   }
 }
 
-@mixin bootstrap-ie7-restore-right-whitespace() {
+@mixin ctb-ie7-restore-right-whitespace() {
   *margin-right: .3em;
-
-  &:last-child {
-    *margin-left: 0;
-  }
 }
 
 // Sizing shortcuts
 // -------------------------
-@mixin bootstrap-size($height, $width) {
+@mixin ctb-size($height, $width) {
   width: $width;
   height: $height;
 }
-@mixin bootstrap-square($size) {
-  @include bootstrap-size($size, $size);
+@mixin ctb-square($size) {
+  @include ctb-size($size, $size);
 }
 
 // Placeholder text
 // -------------------------
-@mixin bootstrap-placeholder($color: $placeholderText) {
-  :-moz-placeholder {
+@mixin ctb-placeholder($color: $placeholderText) {
+  &:-moz-placeholder {
     color: $color;
   }
-  ::-webkit-input-placeholder {
+  &:-ms-input-placeholder {
+    color: $color;
+  }
+  &::-webkit-input-placeholder {
     color: $color;
   }
 }
@@ -92,7 +94,7 @@
 // Text overflow
 // -------------------------
 // Requires inline-block or block for proper styling
-@mixin bootstrap-text-overflow() {
+@mixin ctb-text-overflow() {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -101,7 +103,7 @@
 // CSS image replacement
 // -------------------------
 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-@mixin bootstrap-hide-text {
+@mixin ctb-hide-text {
   font: 0/0 a;
   color: transparent;
   text-shadow: none;
@@ -111,53 +113,50 @@
 
 // FONTS
 // --------------------------------------------------
-@mixin bootstrap-font-family-serif {
+
+@mixin ctb-font-family-serif() {
   font-family: $serifFontFamily;
 }
-
-@mixin bootstrap-font-family-sans-serif {
+@mixin ctb-font-family-sans-serif() {
   font-family: $sansFontFamily;
 }
-
-@mixin bootstrap-font-family-monospace {
+@mixin ctb-font-family-monospace() {
   font-family: $monoFontFamily;
 }
-
-@mixin bootstrap-font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+@mixin ctb-font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
   font-size: $size;
   font-weight: $weight;
   line-height: $lineHeight;
 }
-
-@mixin bootstrap-font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include bootstrap-font-family-serif();
-  @include bootstrap-font-shorthand($size, $weight, $lineHeight);
+@mixin ctb-font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+  @include ctb-font-family-serif();
+  @include ctb-font-shorthand($size, $weight, $lineHeight);
 }
-
-@mixin bootstrap-font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include bootstrap-font-family-sans-serif();
-  @include bootstrap-font-shorthand($size, $weight, $lineHeight);
+@mixin ctb-font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+  @include ctb-font-family-sans-serif();
+  @include ctb-font-shorthand($size, $weight, $lineHeight);
 }
-
-@mixin bootstrap-font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include bootstrap-font-family-monospace();
-  @include bootstrap-font-shorthand($size, $weight, $lineHeight);
+@mixin ctb-font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+  @include ctb-font-family-monospace();
+  @include ctb-font-shorthand($size, $weight, $lineHeight);
 }
 
+
 // FORMS
 // --------------------------------------------------
 
 // Block level inputs
-@mixin bootstrap-input-block-level {
+@mixin ctb-input-block-level {
   display: block;
   width: 100%;
-  min-height: 28px;        // Make inputs at least the height of their button counterpart
-  @include bootstrap-box-sizing(border-box); // Makes inputs behave like true block-level elements
+  min-height: 30px;                // Make inputs at least the height of their button counterpart
+  @include ctb-box-sizing(border-box); // Makes inputs behave like true block-level elements
 }
 
 
+
 // Mixin for form field states
-@mixin bootstrap-formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
+@mixin ctb-formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
   // Set the text color
   > label,
   .help-block,
@@ -165,14 +164,20 @@
     color: $textColor;
   }
   // Style inputs accordingly
+  .checkbox,
+  .radio,
   input,
   select,
   textarea {
     color: $textColor;
     border-color: $borderColor;
+    @include ctb-box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
     &:focus {
       border-color: darken($borderColor, 10%);
-      @include bootstrap-box-shadow(0 0 6px lighten($borderColor, 20%));
+      // Write out in full since the lighten() function isn't easily escaped
+      -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
+         -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
+              box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
     }
   }
   // Give a small background color for input-prepend/-append
@@ -185,90 +190,130 @@
 }
 
 
+
 // CSS3 PROPERTIES
 // --------------------------------------------------
 
 // Border Radius
-@mixin bootstrap-border-radius($radius) {
+@mixin ctb-border-radius($radius) {
   -webkit-border-radius: $radius;
      -moz-border-radius: $radius;
           border-radius: $radius;
 }
 
+// Single Corner Border Radius
+@mixin ctb-border-top-left-radius($radius) {
+  -webkit-border-top-left-radius: $radius;
+      -moz-border-radius-topleft: $radius;
+          border-top-left-radius: $radius;
+}
+@mixin ctb-border-top-right-radius($radius) {
+  -webkit-border-top-right-radius: $radius;
+      -moz-border-radius-topright: $radius;
+          border-top-right-radius: $radius;
+}
+@mixin ctb-border-bottom-right-radius($radius) {
+  -webkit-border-bottom-right-radius: $radius;
+      -moz-border-radius-bottomright: $radius;
+          border-bottom-right-radius: $radius;
+}
+@mixin ctb-border-bottom-left-radius($radius) {
+  -webkit-border-bottom-left-radius: $radius;
+      -moz-border-radius-bottomleft: $radius;
+          border-bottom-left-radius: $radius;
+}
+
+// Single Side Border Radius
+@mixin ctb-border-top-radius($radius) {
+  @include ctb-border-top-right-radius($radius);
+  @include ctb-border-top-left-radius($radius);
+}
+@mixin ctb-border-right-radius($radius) {
+  @include ctb-border-top-right-radius($radius);
+  @include ctb-border-bottom-right-radius($radius);
+}
+@mixin ctb-border-bottom-radius($radius) {
+  @include ctb-border-bottom-right-radius($radius);
+  @include ctb-border-bottom-left-radius($radius);
+}
+@mixin ctb-border-left-radius($radius) {
+  @include ctb-border-top-left-radius($radius);
+  @include ctb-border-bottom-left-radius($radius);
+}
+
 // Drop shadows
-@mixin bootstrap-box-shadow($shadow) {
+@mixin ctb-box-shadow($shadow) {
   -webkit-box-shadow: $shadow;
      -moz-box-shadow: $shadow;
           box-shadow: $shadow;
 }
 
 // Transitions
-@mixin bootstrap-transition($transition) {
+@mixin ctb-transition($transition) {
   -webkit-transition: $transition;
      -moz-transition: $transition;
-      -ms-transition: $transition;
        -o-transition: $transition;
           transition: $transition;
 }
 
 // Transformations
-@mixin bootstrap-rotate($degrees) {
+@mixin ctb-rotate($degrees) {
   -webkit-transform: rotate($degrees);
      -moz-transform: rotate($degrees);
       -ms-transform: rotate($degrees);
        -o-transform: rotate($degrees);
           transform: rotate($degrees);
 }
-@mixin bootstrap-scale($ratio) {
+@mixin ctb-scale($ratio) {
   -webkit-transform: scale($ratio);
      -moz-transform: scale($ratio);
       -ms-transform: scale($ratio);
        -o-transform: scale($ratio);
           transform: scale($ratio);
 }
-@mixin bootstrap-translate($x, $y) {
+@mixin ctb-translate($x, $y) {
   -webkit-transform: translate($x, $y);
      -moz-transform: translate($x, $y);
       -ms-transform: translate($x, $y);
        -o-transform: translate($x, $y);
           transform: translate($x, $y);
 }
-@mixin bootstrap-skew($x, $y) {
+
+@mixin ctb-skew($x, $y) {
   -webkit-transform: skew($x, $y);
      -moz-transform: skew($x, $y);
       -ms-transform: skew($x, $y);
        -o-transform: skew($x, $y);
           transform: skew($x, $y);
 }
-@mixin bootstrap-translate3d($x, $y, $z) {
-  -webkit-transform: translate($x, $y, $z);
-     -moz-transform: translate($x, $y, $z);
-      -ms-transform: translate($x, $y, $z);
-       -o-transform: translate($x, $y, $z);
-          transform: translate($x, $y, $z);
+
+@mixin ctb-translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+     -moz-transform: translate3d($x, $y, $z);
+       -o-transform: translate3d($x, $y, $z);
+          transform: translate3d($x, $y, $z);
 }
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden
 // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-@mixin bootstrap-backface-visibility($visibility){
-	-webkit-backface-visibility: $visibility;
-	   -moz-backface-visibility: $visibility;
-	    -ms-backface-visibility: $visibility;
-	        backface-visibility: $visibility;
+@mixin ctb-backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+          backface-visibility: $visibility;
 }
 
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-@mixin bootstrap-background-clip($clip) {
+@mixin ctb-background-clip($clip) {
   -webkit-background-clip: $clip;
      -moz-background-clip: $clip;
           background-clip: $clip;
 }
 
 // Background sizing
-@mixin bootstrap-background-size($size){
+@mixin ctb-background-size($size) {
   -webkit-background-size: $size;
      -moz-background-size: $size;
        -o-background-size: $size;
@@ -277,16 +322,15 @@
 
 
 // Box sizing
-@mixin bootstrap-box-sizing($boxmodel) {
+@mixin ctb-box-sizing($boxmodel) {
   -webkit-box-sizing: $boxmodel;
      -moz-box-sizing: $boxmodel;
-      -ms-box-sizing: $boxmodel;
           box-sizing: $boxmodel;
 }
 
 // User select
 // For selecting text on the page
-@mixin bootstrap-user-select($select) {
+@mixin ctb-user-select($select) {
   -webkit-user-select: $select;
      -moz-user-select: $select;
       -ms-user-select: $select;
@@ -295,13 +339,13 @@
 }
 
 // Resize anything
-@mixin bootstrap-resizable($direction) {
+@mixin ctb-resizable($direction) {
   resize: $direction; // Options: horizontal, vertical, both
   overflow: auto; // Safari fix
 }
 
 // CSS3 Content Columns
-@mixin bootstrap-content-columns($columnCount, $columnGap: $gridGutterWidth) {
+@mixin ctb-content-columns($columnCount, $columnGap: $gridGutterWidth) {
   -webkit-column-count: $columnCount;
      -moz-column-count: $columnCount;
           column-count: $columnCount;
@@ -310,10 +354,20 @@
           column-gap: $columnGap;
 }
 
+// Optional hyphenation
+@mixin ctb-hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode;
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
 // Opacity
-@mixin bootstrap-opacity($opacity) {
-  opacity: $opacity / 100;
-  filter: unquote("alpha(opacity=#{$opacity})");
+@mixin ctb-opacity($opacity) {
+  opacity: $opacity;
+  filter: alpha(opacity=($opacity * 100));
 }
 
 
@@ -322,87 +376,83 @@
 // --------------------------------------------------
 
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
-@mixin bootstrap-translucent-background($color: $white, $alpha: 1) {
+@mixin ctb-translucent-background($color: $white, $alpha: 1) {
   background-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
 }
 
-@mixin bootstrap-translucent-border($color: $white, $alpha: 1) {
+@mixin ctb-translucent-border($color: $white, $alpha: 1) {
   border-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
-  @include bootstrap-background-clip(padding-box);
+  @include ctb-background-clip(padding-box);
 }
 
 // Gradient Bar Colors for buttons and alerts
-@mixin bootstrap-gradientBar($primaryColor, $secondaryColor) {
-  @include bootstrap-gradient-vertical($primaryColor, $secondaryColor);
+@mixin ctb-gradientBar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+  color: $textColor;
+  text-shadow: $textShadow;
+  @include ctb-gradient-vertical($primaryColor, $secondaryColor);
   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%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 0.15);
 }
 
 // Gradients
-@mixin bootstrap-gradient-horizontal($startColor: #555, $endColor: #333) {
+@mixin ctb-gradient-horizontal($startColor: #555, $endColor: #333) {
   background-color: $endColor;
   background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
-  background-image: -ms-linear-gradient(left, $startColor, $endColor); // IE10
   background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
   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
+  background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=1); // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=1); // IE9 and down
 }
-@mixin bootstrap-gradient-vertical($startColor: #555, $endColor: #333) {
-  background-color: mix($startColor, $endColor, 60%);
+@mixin ctb-gradient-vertical($startColor: #555, $endColor: #333) {
+  background-color: mix($startColor, $endColor, 62.5%);
   background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
-  background-image: -ms-linear-gradient(top, $startColor, $endColor); // IE10
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
   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
+  background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0); // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down
 }
-@mixin bootstrap-gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) {
+@mixin ctb-gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) {
   background-color: $endColor;
   background-repeat: repeat-x;
   background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+
-  background-image: -ms-linear-gradient($deg, $startColor, $endColor); // IE10
   background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
-  background-image: linear-gradient($deg, $startColor, $endColor); // The standard
+  background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
 }
-@mixin bootstrap-gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
+@mixin ctb-gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
   background-color: mix($midColor, $endColor, 80%);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
   background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor);
-  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor);
-  background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor);
+  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop*100%, $endColor);
   background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
   background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{darken($startColor, 1%)}', endColorstr='#{darken($endColor, 1%)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
 }
-@mixin bootstrap-gradient-radial($innerColor: #555, $outerColor: #333)  {
+@mixin ctb-gradient-radial($innerColor: #555, $outerColor: #333)  {
   background-color: $outerColor;
   background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor));
   background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
   background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
-  background-image: -ms-radial-gradient(circle, $innerColor, $outerColor);
   background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
   background-repeat: no-repeat;
 }
-@mixin bootstrap-gradient-striped($color, $angle: -45deg) {
+@mixin ctb-gradient-striped($color, $angle: 45deg) {
   background-color: $color;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
   background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
 }
 
 // Reset filters for IE
-@mixin bootstrap-reset-filter() {
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+@mixin ctb-gradient-reset-filter() {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 
 
@@ -413,7 +463,7 @@
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-@mixin bootstrap-nav-divider() {
+@mixin ctb-nav-divider($top: #e5e5e5, $bottom: $white) {
   // IE7 needs a set width since we gave a height. Restricting just
   // to IE7 to keep the 1px left/right space in other browsers.
   // It is unclear where IE is getting the extra space that we need
@@ -423,20 +473,21 @@
   margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
   *margin: -5px 0 5px;
   overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid $white;
+  background-color: $top;
+  border-bottom: 1px solid $bottom;
 }
 
 // Button backgrounds
 // ------------------
-@mixin bootstrap-buttonBackground($startColor, $endColor) {
+@mixin ctb-buttonBackground($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  @include bootstrap-gradientBar($startColor, $endColor);
+  @include ctb-gradientBar($startColor, $endColor, $textColor, $textShadow);
   *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  @include bootstrap-reset-filter();
+  @include ctb-gradient-reset-filter();
 
   // in these cases the gradient won't cover the background, so we override
   &:hover, &:active, &.active, &.disabled, &[disabled] {
+    color: $textColor;
     background-color: $endColor;
     *background-color: darken($endColor, 5%);
   }
@@ -444,7 +495,7 @@
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
   &:active,
   &.active {
-    background-color: darken($endColor, 10%)\9;
+    background-color: darken($endColor, 10%) \9;
   }
 }
 
@@ -452,62 +503,25 @@
 // -------------------------
 // Vertically center elements in the navbar.
 // Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-@mixin bootstrap-navbarVerticalAlign($elementHeight) {
+@mixin ctb-navbarVerticalAlign($elementHeight) {
   margin-top: ($navbarHeight - $elementHeight) / 2;
 }
 
-// Popover arrows
-// -------------------------
-// For tipsies and popovers
-@mixin bootstrap-popoverArrow-top($arrowWidth: 5px, $color: $black) {
-  bottom: 0;
-  left: 50%;
-  margin-left: -$arrowWidth;
-  border-left: $arrowWidth solid transparent;
-  border-right: $arrowWidth solid transparent;
-  border-top: $arrowWidth solid $color;
-}
-
-@mixin bootstrap-popoverArrow-left($arrowWidth: 5px, $color: $black) {
-  top: 50%;
-  right: 0;
-  margin-top: -$arrowWidth;
-  border-top: $arrowWidth solid transparent;
-  border-bottom: $arrowWidth solid transparent;
-  border-left: $arrowWidth solid $color;
-}
-
-@mixin bootstrap-popoverArrow-bottom($arrowWidth: 5px, $color: $black) {
-  top: 0;
-  left: 50%;
-  margin-left: -$arrowWidth;
-  border-left: $arrowWidth solid transparent;
-  border-right: $arrowWidth solid transparent;
-  border-bottom: $arrowWidth solid $color;
-}
 
-@mixin bootstrap-popoverArrow-right($arrowWidth: 5px, $color: $black) {
-  top: 50%;
-  left: 0;
-  margin-top: -$arrowWidth;
-  border-top: $arrowWidth solid transparent;
-  border-bottom: $arrowWidth solid transparent;
-  border-right: $arrowWidth solid $color;
-}
 
 
 // Grid System
 // -----------
 
 // Centered container element
-@mixin bootstrap-container-fixed() {
+@mixin ctb-container-fixed() {
   margin-right: auto;
   margin-left: auto;
-  @include bootstrap-clearfix();
+  @include ctb-clearfix();
 }
 
 // Table columns
-@mixin bootstrap-tableColumns($columnSpan: 1) {
+@mixin ctb-tableColumns($columnSpan: 1) {
   float: none; // undo default grid column styles
   width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
   margin-left: 0; // undo default grid column styles
@@ -515,88 +529,128 @@
 
 // Make a Grid
 // Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-@mixin bootstrap-makeRow() {
+@mixin ctb-makeRow() {
   margin-left: $gridGutterWidth * -1;
-  @include bootstrap-clearfix();
+  @include ctb-clearfix();
 }
-@mixin bootstrap-makeColumn($columns: 1, $offset: 0) {
+@mixin ctb-makeColumn($columns: 1, $offset: 0) {
   float: left;
   margin-left: ($gridColumnWidth * $offset) + ($gridGutterWidth * ($offset - 1)) + ($gridGutterWidth * 2);
   width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
 }
 
 // The Grid
-@mixin bootstrap-grid-core-offset ($columns, $gridColumnWidth, $gridGutterWidth) {
-  margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns + 1));
+@mixin ctb-core-offset($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
+  margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1));
 }
-  
-@mixin bootstrap-grid-core-span ($columns, $gridColumnWidth, $gridGutterWidth) {
-  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
+
+@mixin ctb-core-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
+  width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
 }
 
-@mixin bootstrap-grid-core($gridColumnWidth, $gridGutterWidth) {
+@mixin ctb-grid-core($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
   .row {
-    margin-left: $gridGutterWidth * -1;
-    @include bootstrap-clearfix();
+    margin-left: $gutterWidth * -1;
+    @include ctb-clearfix();
   }
-  
+
   [class*="span"] {
     float: left;
-    margin-left: $gridGutterWidth;
+    margin-left: $gutterWidth;
   }
-  
+
   // Set the container width, and override it for fixed navbars in media queries
   .container,
+  .navbar-static-top .container,
   .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container { @include bootstrap-grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth); }
-  
+  .navbar-fixed-bottom .container {
+    @include ctb-core-span($gridColumns, $columnWidth, $gutterWidth);
+  }
+
   // generate .spanX and .offsetX
-  @for $i from 1 through $gridColumns {
-    .span#{$i} { @include bootstrap-grid-core-span($i, $gridColumnWidth, $gridGutterWidth); }
-    .offset#{$i} { @include bootstrap-grid-core-offset($i, $gridColumnWidth, $gridGutterWidth); }
+  $i: $gridColumns;
+  @while $i > 0 {
+    .span#{$i} { @include ctb-core-span($i, $columnWidth, $gutterWidth); }
+    $i: $i - 1;
   }
+
+  $i: $gridColumns;
+  @while $i > 0 {
+    .offset#{$i} { @include ctb-core-offset($i, $columnWidth, $gutterWidth); }
+    $i: $i - 1;
+  }
+}
+
+@mixin ctb-fluid-offset($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
+  margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) + ($gutterWidth * 2);
+  *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + ($gutterWidth * 2) - (.5 / $gridRowWidth * 100px * 1%);
 }
 
-@mixin bootstrap-grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
-  *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / ($gridRowWidth / 1px) * 100 * 1%);
+@mixin ctb-fluid-offset-first-child($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
+  margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) + $gutterWidth;
+  *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + $gutterWidth - (.5 / $gridRowWidth * 100px * 1%);
 }
 
-@mixin bootstrap-grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
+@mixin ctb-fluid-span($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
+  width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
+  *width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%);
+}
+
+@mixin ctb-grid-fluid($columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
   .row-fluid {
     width: 100%;
-    @include bootstrap-clearfix();
+    @include ctb-clearfix();
     [class*="span"] {
-      @include bootstrap-input-block-level();
+      @include ctb-input-block-level();
       float: left;
-      margin-left: $fluidGridGutterWidth;
-      *margin-left: $fluidGridGutterWidth - (.5 / ($gridRowWidth / 1px) * 100 * 1%);
+      margin-left: $gutterWidth;
+      *margin-left: $gutterWidth - (.5 / $gridRowWidth * 100px * 1%);
     }
     [class*="span"]:first-child {
       margin-left: 0;
     }
 
-    // generate .spanX
-    @for $i from 1 through $gridColumns {
-      .span#{$i} { @include bootstrap-grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
+    // generate .spanX and .offsetX
+    $i: $gridColumns;
+    @while $i > 0 {
+      .span#{$i} {
+        @include ctb-fluid-span($i, $columnWidth, $gutterWidth);
+      }
+      .offset#{$i} {
+        @include ctb-fluid-offset($i, $columnWidth, $gutterWidth);
+      }
+      .offset#{$i}:first-child {
+        @include ctb-fluid-offset-first-child($i, $columnWidth, $gutterWidth);
+      }
+      $i: $i - 1;
     }
   }
 }
 
-@mixin bootstrap-grid-input-span($columns, $gridColumnWidth, $gridGutterWidth) {
-  width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
+@mixin ctb-input-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
+  width: (($columnWidth) * $columns) + ($gutterWidth * ($columns - 1)) - 14;
 }
 
-@mixin bootstrap-grid-input($gridColumnWidth, $gridGutterWidth) {
+@mixin ctb-grid-input($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
   input,
   textarea,
   .uneditable-input {
     margin-left: 0; // override margin-left from core grid system
   }
-  
-  @for $i from 1 through $gridColumns {
-    input.span#{$i}, textarea.span#{$i}, .uneditable-input.span#{$i} {
-      @include bootstrap-grid-input-span($i, $gridColumnWidth, $gridGutterWidth);
+
+  // Space grid-sized controls properly if multiple per line
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: $gutterWidth;
+  }
+
+  // generate .spanX
+  $i: $gridColumns;
+  @while $i > 0 {
+    input.span#{$i},
+    textarea.span#{$i},
+    .uneditable-input.span#{$i} {
+      @include ctb-input-span($i, $columnWidth, $gutterWidth);
     }
-  } 
+    $i: $i - 1;
+  }
 }