compass_twitter_bootstrap 2.0.3 → 2.2.2

data/stylesheets/compass_twitter_bootstrap/_buttons.scss

@@ -1,5 +1,9 @@
-// BUTTON STYLES
-// -------------
+@import "compass_twitter_bootstrap/mixins";
+@import "compass_twitter_bootstrap/variables";
+
+//
+// Buttons
+// --------------------------------------------------
 
 
 // Base styles
@@ -8,63 +12,57 @@
 // Core
 .btn {
   display: inline-block;
-  @include bootstrap-ie7-inline-block();
-  padding: 4px 10px 4px;
+  @include ctb-ie7-inline-block();
+  padding: 4px 12px;
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
-  *line-height: 20px;
-  color: $grayDark;
   text-align: center;
-  text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
   cursor: pointer;
-  @include bootstrap-buttonBackground($btnBackground, $btnBackgroundHighlight);
+  @include ctb-buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid $btnBorder;
   *border: 0; // Remove the border to prevent IE7's black border on input:focus
   border-bottom-color: darken($btnBorder, 10%);
-  @include bootstrap-border-radius(4px);
-  @include bootstrap-ie7-restore-left-whitespace(); // Give IE7 some love
-  @include bootstrap-box-shadow("inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-}
+  @include ctb-border-radius($baseBorderRadius);
+  @include ctb-ie7-restore-left-whitespace(); // Give IE7 some love
+  @include ctb-box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
+
+  // Hover state
+  &:hover {
+    color: $grayDark;
+    text-decoration: none;
+    background-position: 0 -15px;
+
+    // transition is only when going to hover, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    @include ctb-transition(background-position .1s linear);
+  }
 
-// Hover state
-.btn:hover {
-  color: $grayDark;
-  text-decoration: none;
-  background-color: darken($white, 10%);
-  *background-color: darken($white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
-  background-position: 0 -15px;
+  // Focus state for keyboard and accessibility
+  &:focus {
+    @include ctb-tab-focus();
+  }
 
-  // transition is only when going to hover, otherwise the background
-  // behind the gradient (there for IE<=9 fallback) gets mismatched
-  @include bootstrap-transition(background-position .1s linear);
-}
+  // Active state
+  &.active,
+  &:active {
+    background-image: none;
+    outline: 0;
+    @include ctb-box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
+  }
 
-// Focus state for keyboard and accessibility
-.btn:focus {
-  @include bootstrap-tab-focus();
-}
+  // Disabled state
+  &.disabled,
+  &[disabled] {
+    cursor: default;
+    background-image: none;
+    @include ctb-opacity(65);
+    @include ctb-box-shadow(none);
+  }
 
-// Active state
-.btn.active,
-.btn:active {
-  background-color: darken($white, 10%);
-  background-color: darken($white, 15%)\9;
-  background-image: none;
-  outline: 0;
-  @include bootstrap-box-shadow("inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
 }
 
-// Disabled state
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-color: darken($white, 10%);
-  background-image: none;
-  @include bootstrap-opacity(65);
-  @include bootstrap-box-shadow(none);
-}
 
 
 // Button Sizes
@@ -72,53 +70,68 @@
 
 // Large
 .btn-large {
-  padding: 9px 14px;
-  font-size: $baseFontSize + 2px;
-  line-height: normal;
-  @include bootstrap-border-radius(5px);
+  padding: $paddingLarge;
+  font-size: $fontSizeLarge;
+  @include ctb-border-radius($borderRadiusLarge);
 }
-.btn-large [class^="icon-"] {
-  margin-top: 1px;
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
 }
 
 // Small
 .btn-small {
-  padding: 5px 9px;
-  font-size: $baseFontSize - 2px;
-  line-height: $baseLineHeight - 2px;
+  padding: $paddingSmall;
+  font-size: $fontSizeSmall;
+  @include ctb-border-radius($borderRadiusSmall);
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
 }
-.btn-small [class^="icon-"] {
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
   margin-top: -1px;
 }
 
 // Mini
 .btn-mini {
-  padding: 2px 6px;
-  font-size: $baseFontSize - 2px;
-  line-height: $baseLineHeight - 4px;
+  padding: $paddingMini;
+  font-size: $fontSizeMini;
+  @include ctb-border-radius($borderRadiusSmall);
+}
+
+
+// Block button
+// -------------------------
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+  @include ctb-box-sizing(border-box);
 }
 
+// Vertically space out multiple block buttons
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  &.btn-block {
+    width: 100%;
+  }
+}
+
+
 
 // Alternate buttons
 // --------------------------------------------------
 
-// Set text color
-// -------------------------
-.btn-primary,
-.btn-primary:hover,
-.btn-warning,
-.btn-warning:hover,
-.btn-danger,
-.btn-danger:hover,
-.btn-success,
-.btn-success:hover,
-.btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover {
-  color: $white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-}
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,
 .btn-warning.active,
@@ -133,31 +146,31 @@
 // -------------------------
 .btn {
   // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc;
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
+  border-color: #c5c5c5;
+  border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
 }
 .btn-primary {
-  @include bootstrap-buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
+  @include ctb-buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
 }
 // Warning appears are orange
 .btn-warning {
-  @include bootstrap-buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
+  @include ctb-buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
 }
 // Danger and error appear as red
 .btn-danger {
-  @include bootstrap-buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
+  @include ctb-buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
 }
 // Success appears as green
 .btn-success {
-  @include bootstrap-buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
+  @include ctb-buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
 }
 // Info appears as a neutral blue
 .btn-info {
-  @include bootstrap-buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
+  @include ctb-buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
 }
 // Inverse appears as dark gray
 .btn-inverse {
-  @include bootstrap-buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
+  @include ctb-buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
 }
 
 
@@ -174,8 +187,9 @@ input[type="submit"].btn {
   }
 
   // IE7 has some default padding on button controls
-  *padding-top: 2px;
-  *padding-bottom: 2px;
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+
   &.btn-large {
     *padding-top: 7px;
     *padding-bottom: 7px;
@@ -189,3 +203,31 @@ input[type="submit"].btn {
     *padding-bottom: 1px;
   }
 }
+
+
+// Link buttons
+// --------------------------------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  @include ctb-box-shadow(none);
+}
+.btn-link {
+  border-color: transparent;
+  cursor: pointer;
+  color: $linkColor;
+  @include ctb-border-radius(0);
+}
+.btn-link:hover {
+  color: $linkColorHover;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover {
+  color: $grayDark;
+  text-decoration: none;
+}

data/stylesheets/compass_twitter_bootstrap/_carousel.scss

@@ -1,5 +1,7 @@
-// CAROUSEL
-// --------
+//
+// Carousel
+// --------------------------------------------------
+
 
 .carousel {
   position: relative;
@@ -13,50 +15,50 @@
   position: relative;
 }
 
-.carousel {
+.carousel-inner {
 
-  .item {
+  > .item {
     display: none;
     position: relative;
-    @include bootstrap-transition(.6s ease-in-out left);
+    @include ctb-transition(.6s ease-in-out left);
   }
 
   // Account for jankitude on images
-  .item > img {
+  > .item > img {
     display: block;
     line-height: 1;
   }
 
-  .active,
-  .next,
-  .prev { display: block; }
+  > .active,
+  > .next,
+  > .prev { display: block; }
 
-  .active {
+  > .active {
     left: 0;
   }
 
-  .next,
-  .prev {
+  > .next,
+  > .prev {
     position: absolute;
     top: 0;
     width: 100%;
   }
 
-  .next {
+  > .next {
     left: 100%;
   }
-  .prev {
+  > .prev {
     left: -100%;
   }
-  .next.left,
-  .prev.right {
+  > .next.left,
+  > .prev.right {
     left: 0;
   }
 
-  .active.left {
+  > .active.left {
     left: -100%;
   }
-  .active.right {
+  > .active.right {
     left: 100%;
   }
 
@@ -79,15 +81,15 @@
   text-align: center;
   background: $grayDarker;
   border: 3px solid $white;
-  @include bootstrap-border-radius(23px);
-  @include bootstrap-opacity(50);
+  @include ctb-border-radius(23px);
+  @include ctb-opacity(50);
 
   // we can't have this transition here
   // because webkit cancels the carousel
   // animation if you trip this while
   // in the middle of another animation
   // ;_;
-  // @include bootstrap-transition(opacity .2s linear);
+  // @include ctb-transition(opacity .2s linear);
 
   // Reposition the right one
   &.right {
@@ -99,10 +101,11 @@
   &:hover {
     color: $white;
     text-decoration: none;
-    @include bootstrap-opacity(90);
+    @include ctb-opacity(90);
   }
 }
 
+
 // Caption for text below images
 // -----------------------------
 
@@ -111,11 +114,18 @@
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 10px 15px 5px;
+  padding: 15px;
   background: $grayDark;
   background: rgba(0,0,0,.75);
 }
 .carousel-caption h4,
 .carousel-caption p {
   color: $white;
+  line-height: $baseLineHeight;
+}
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+.carousel-caption p {
+  margin-bottom: 0;
 }

data/stylesheets/compass_twitter_bootstrap/_close.scss

@@ -1,5 +1,7 @@
-// CLOSE ICONS
-// -----------
+//
+// Close icons
+// --------------------------------------------------
+
 
 .close {
   float: right;
@@ -8,12 +10,12 @@
   line-height: $baseLineHeight;
   color: $black;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
-  @include bootstrap-opacity(20);
+  @include ctb-opacity(20);
   &:hover {
     color: $black;
     text-decoration: none;
     cursor: pointer;
-    @include bootstrap-opacity(40);
+    @include ctb-opacity(40);
   }
 }
 
@@ -26,4 +28,4 @@ button.close {
   background: transparent;
   border: 0;
   -webkit-appearance: none;
-}
+}

data/stylesheets/compass_twitter_bootstrap/_code.scss

@@ -1,15 +1,16 @@
-// Code.less
-// Code typography styles for the <code> and <pre> elements
-// --------------------------------------------------------
+//
+// Code (inline and blocK)
+// --------------------------------------------------
+
 
 // Inline and block code styles
 code,
 pre {
   padding: 0 3px 2px;
-  @include bootstrap-font-family-monospace;
-  font-size: $baseFontSize - 1;
+  @include ctb-font-family-monospace;
+  font-size: $baseFontSize - 2;
   color: $grayDark;
-  @include bootstrap-border-radius(3px);
+  @include ctb-border-radius(3px);
 }
 
 // Inline code
@@ -18,6 +19,7 @@ code {
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
+  white-space: nowrap;
 }
 
 // Blocks of code
@@ -25,7 +27,7 @@ pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
   margin: 0 0 $baseLineHeight / 2;
-  font-size: $baseFontSize * .925; // 13px to 12px
+  font-size: $baseFontSize - 1; // 14px to 13px
   line-height: $baseLineHeight;
   word-break: break-all;
   word-wrap: break-word;
@@ -34,7 +36,7 @@ pre {
   background-color: #f5f5f5;
   border: 1px solid #ccc; // fallback for IE7-8
   border: 1px solid rgba(0,0,0,.15);
-  @include bootstrap-border-radius(4px);
+  @include ctb-border-radius($baseBorderRadius);
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
@@ -45,6 +47,8 @@ pre {
   code {
     padding: 0;
     color: inherit;
+    white-space: pre;
+    white-space: pre-wrap;
     background-color: transparent;
     border: 0;
   }