compass_twitter_bootstrap 2.2.2.2 → 2.3.1

data/stylesheets/compass_twitter_bootstrap/_thumbnails.scss

@@ -33,8 +33,9 @@
   @include ctb-box-shadow(0 1px 3px rgba(0,0,0,.055));
   @include ctb-transition(all .2s ease-in-out);
 }
-// Add a hover state for linked versions only
-a.thumbnail:hover {
+// Add a hover/focus state for linked versions only
+a.thumbnail:hover,
+a.thumbnail:focus {
   border-color: $linkColor;
   @include ctb-box-shadow(0 1px 4px rgba(0,105,214,.25));
 }

data/stylesheets/compass_twitter_bootstrap/_tooltip.scss

@@ -9,20 +9,20 @@
   z-index: $zindexTooltip;
   display: block;
   visibility: visible;
-  padding: 5px;
   font-size: 11px;
+  line-height: 1.4;
   @include ctb-opacity(0);
   &.in     { @include ctb-opacity(80); }
-  &.top    { margin-top:  -3px; }
-  &.right  { margin-left:  3px; }
-  &.bottom { margin-top:   3px; }
-  &.left   { margin-left: -3px; }
+  &.top    { margin-top:  -3px; padding: 5px 0; }
+  &.right  { margin-left:  3px; padding: 0 5px; }
+  &.bottom { margin-top:   3px; padding: 5px 0; }
+  &.left   { margin-left: -3px; padding: 0 5px; }
 }
 
 // Wrapper for the tooltip content
 .tooltip-inner {
   max-width: 200px;
-  padding: 3px 8px;
+  padding: 8px;
   color: $tooltipColor;
   text-align: center;
   text-decoration: none;

data/stylesheets/compass_twitter_bootstrap/_type.scss

@@ -29,19 +29,28 @@ cite    { font-style: normal; }
 
 // Utility classes
 .muted               { color: $grayLight; }
-a.muted:hover        { color: darken($grayLight, 10%); }
+a.muted:hover,
+a.muted:focus        { color: darken($grayLight, 10%); }
 
 .text-warning        { color: $warningText; }
-a.text-warning:hover { color: darken($warningText, 10%); }
+a.text-warning:hover,
+a.text-warning:focus { color: darken($warningText, 10%); }
 
 .text-error          { color: $errorText; }
-a.text-error:hover   { color: darken($errorText, 10%); }
+a.text-error:hover,
+a.text-error:focus   { color: darken($errorText, 10%); }
 
 .text-info           { color: $infoText; }
-a.text-info:hover    { color: darken($infoText, 10%); }
+a.text-info:hover,
+a.text-info:focus    { color: darken($infoText, 10%); }
 
 .text-success        { color: $successText; }
-a.text-success:hover { color: darken($successText, 10%); }
+a.text-success:hover,
+a.text-success:focus { color: darken($successText, 10%); }
+
+.text-left           { text-align: left; }
+.text-right          { text-align: right; }
+.text-center         { text-align: center; }
 
 
 // Headings
@@ -119,8 +128,9 @@ ul.inline,
 ol.inline {
   margin-left: 0;
   list-style: none;
-  & > li {
+  > li {
     display: inline-block;
+    @include ctb-ie7-inline-block();
     padding-left: 5px;
     padding-right: 5px;
   }
@@ -185,7 +195,9 @@ blockquote {
   border-left: 5px solid $grayLighter;
   p {
     margin-bottom: 0;
-    @include ctb-font-shorthand(16px,300,$baseLineHeight * 1.25);
+    font-size: $baseFontSize * 1.25;
+    font-weight: 300;
+    line-height: 1.25;
   }
   small {
     display: block;

data/stylesheets/compass_twitter_bootstrap/_utilities.scss

@@ -10,9 +10,7 @@
 .pull-left {
   float: left;
 }
-.clearfix {
-  @include ctb-clearfix();
-}
+
 // Toggling content
 .hide {
   display: none;

data/stylesheets/compass_twitter_bootstrap/_variables.scss

@@ -53,9 +53,9 @@ $baseFontFamily:        $sansFontFamily !default;
 $baseLineHeight:        20px !default;
 $altFontFamily:         $serifFontFamily !default;
 
-$headingsFontFamily:    inherit; // empty to use BS default, $baseFontFamily
-$headingsFontWeight:    bold;    // instead of browser default, bold
-$headingsColor:         inherit; // empty to use BS default, $textColor
+$headingsFontFamily:    inherit !default; // empty to use BS default, $baseFontFamily
+$headingsFontWeight:    bold !default;    // instead of browser default, bold
+$headingsColor:         inherit !default; // empty to use BS default, $textColor
 
 
 // Component sizing
@@ -86,7 +86,7 @@ $tableBorder:                       #ddd; // table and cell border
 // -------------------------
 $btnBackground:                     $white !default;
 $btnBackgroundHighlight:            darken($white, 10%) !default;
-$btnBorder:                         #bbb !default;
+$btnBorder:                         #ccc !default;
 
 $btnPrimaryBackground:              $linkColor !default;
 $btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 20%) !default;

data/stylesheets_sass/_compass_twitter_bootstrap.sass

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.2
+ * Bootstrap v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -9,15 +9,23 @@
 
 @import compass
 
-@import compass_twitter_bootstrap/mixins
-
-// CSS Reset
-@import compass_twitter_bootstrap/reset
-
 // Core variables and mixins
 @import compass_twitter_bootstrap/variables
 
 // Modify this for custom colors, font-sizes, etc
+@import compass_twitter_bootstrap/mixins
+
+.clearfix
+  +ctb-clearfix
+
+.hide-text
+  +ctb-hide-text
+
+.input-block-level
+  +ctb-input-block-level
+
+// CSS Reset
+@import compass_twitter_bootstrap/reset
 
 // Grid system and page structure
 @import compass_twitter_bootstrap/scaffolding

data/stylesheets_sass/_compass_twitter_bootstrap_awesome.sass

@@ -1,5 +1,5 @@
-/*
- * Bootstrap v2.2.2
+/*!
+ * Bootstrap v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -9,15 +9,23 @@
 
 @import compass
 
-@import compass_twitter_bootstrap/mixins
-
-// CSS Reset
-@import compass_twitter_bootstrap/reset
-
 // Core variables and mixins
 @import compass_twitter_bootstrap/variables
 
 // Modify this for custom colors, font-sizes, etc
+@import compass_twitter_bootstrap/mixins
+
+.clearfix
+  +ctb-clearfix
+
+.hide-text
+  +ctb-hide-text
+
+.input-block-level
+  +ctb-input-block-level
+
+// CSS Reset
+@import compass_twitter_bootstrap/reset
 
 // Grid system and page structure
 @import compass_twitter_bootstrap/scaffolding
@@ -58,6 +66,7 @@
 
 // Components: Misc
 @import compass_twitter_bootstrap/thumbnails
+@import compass_twitter_bootstrap/media
 @import compass_twitter_bootstrap/labels-badges
 @import compass_twitter_bootstrap/progress-bars
 @import compass_twitter_bootstrap/accordion

data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.1.0
+ * Bootstrap Responsive v2.3.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -20,6 +20,15 @@
 // Modify this for custom colors, font-sizes, etc
 @import compass_twitter_bootstrap/mixins
 
+.clearfix
+  +ctb-clearfix
+
+.hide-text
+  +ctb-hide-text
+
+.input-block-level
+  +ctb-input-block-level
+
 // RESPONSIVE CLASSES
 // ------------------
 
@@ -28,14 +37,14 @@
 // MEDIA QUERIES
 // ------------------
 
-// Phones to portrait tablets and narrow desktops
-@import compass_twitter_bootstrap/responsive-767px-max
+// Large desktops
+@import compass_twitter_bootstrap/responsive-1200px-min
 
 // Tablets to regular desktops
 @import compass_twitter_bootstrap/responsive-768px-979px
 
-// Large desktops
-@import compass_twitter_bootstrap/responsive-1200px-min
+// Phones to portrait tablets and narrow desktops
+@import compass_twitter_bootstrap/responsive-767px-max
 
 // RESPONSIVE NAVBAR
 // ------------------

data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass

@@ -147,9 +147,6 @@
   margin-left: 0
 
 // Carets in other button sizes
-
-.btn-mini .caret,
-.btn-small .caret,
 .btn-large .caret
   margin-top: 6px
 
@@ -158,6 +155,10 @@
   border-right-width: 5px
   border-top-width: 5px
 
+.btn-mini .caret,
+.btn-small .caret
+  margin-top: 8px
+
 // Upside down carets for .dropup
 .dropup .btn-large .caret
   border-bottom-width: 5px

data/stylesheets_sass/compass_twitter_bootstrap/_buttons.sass

@@ -1,5 +1,5 @@
-@import compass_twitter_bootstrap/mixins
 @import compass_twitter_bootstrap/variables
+@import compass_twitter_bootstrap/mixins
 
 //
 // Buttons
@@ -29,12 +29,13 @@
   +ctb-ie7-restore-left-whitespace
   // Give IE7 some love
   +ctb-box-shadow(#{inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)})
-  // Hover state
-  &:hover
+  // Hover/focus state
+  &:hover,
+  &:focus
     color: $grayDark
     text-decoration: none
     background-position: 0 -15px
-    // transition is only when going to hover, otherwise the background
+    // transition is only when going to hover/focus, otherwise the background
     // behind the gradient (there for IE<=9 fallback) gets mismatched
     +ctb-transition(background-position 0.1s linear)
   // Focus state for keyboard and accessibility
@@ -124,11 +125,6 @@ input[type="button"]
 
 // Set the backgrounds
 // -------------------------
-.btn
-  // reset here as of 2.0.3 due to Recess property order
-  border-color: #c5c5c5
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25)
-
 .btn-primary
   +ctb-buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight)
 
@@ -192,11 +188,13 @@ input[type="submit"].btn
   color: $linkColor
   +ctb-border-radius(0)
 
-.btn-link:hover
+.btn-link:hover,
+.btn-link:focus
   color: $linkColorHover
   text-decoration: underline
   background-color: transparent
 
-.btn-link[disabled]:hover
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus
   color: $grayDark
   text-decoration: none

data/stylesheets_sass/compass_twitter_bootstrap/_carousel.sass

@@ -17,10 +17,11 @@
     display: none
     position: relative
     +ctb-transition(0.6s ease-in-out left)
-  // Account for jankitude on images
-  > .item > img
-    display: block
-    line-height: 1
+    // Account for jankitude on images
+    > img,
+    > a > img
+      display: block
+      line-height: 1
   > .active,
   > .next,
   > .prev
@@ -73,12 +74,35 @@
   &.right
     left: auto
     right: 15px
-  // Hover state
-  &:hover
+  // Hover/focus state
+  &:hover,
+  &:focus
     color: $white
     text-decoration: none
     +ctb-opacity(90)
 
+// Carousel indicator pips
+// -----------------------------
+.carousel-indicators
+  position: absolute
+  top: 15px
+  right: 15px
+  z-index: 5
+  margin: 0
+  list-style: none
+  li
+    display: block
+    float: left
+    width: 10px
+    height: 10px
+    margin-left: 5px
+    text-indent: -999px
+    background-color: #ccc
+    background-color: rgba(255, 255, 255, 0.25)
+    border-radius: 5px
+  .active
+    background-color: #fff
+
 // Caption for text below images
 // -----------------------------
 

data/stylesheets_sass/compass_twitter_bootstrap/_close.sass

@@ -10,7 +10,8 @@
   color: $black
   text-shadow: 0 1px 0 rgba(255, 255, 255, 1)
   +ctb-opacity(20)
-  &:hover
+  &:hover,
+  &:focus
     color: $black
     text-decoration: none
     cursor: pointer

data/stylesheets_sass/compass_twitter_bootstrap/_code.sass

@@ -33,7 +33,7 @@ pre
   white-space: pre
   white-space: pre-wrap
   background-color: #f5f5f5
-  border: 1px solid #ccc
+  border: 1px solid #cccccc
   // fallback for IE7-8
   border: 1px solid rgba(0, 0, 0, 0.15)
   +ctb-border-radius($baseBorderRadius)

data/stylesheets_sass/compass_twitter_bootstrap/_dropdowns.sass

@@ -49,7 +49,7 @@
   // override default ul
   list-style: none
   background-color: $dropdownBackground
-  border: 1px solid #ccc
+  border: 1px solid #cccccc
   // Fallback for IE7-8
   border: 1px solid $dropdownBorder
   *border-right-width: 2px
@@ -67,7 +67,7 @@
   .divider
     +ctb-nav-divider($dropdownDividerTop, $dropdownDividerBottom)
   // Links within the dropdown menu
-  li > a
+  > li > a
     display: block
     padding: 3px 20px
     clear: both
@@ -76,12 +76,13 @@
     color: $dropdownLinkColor
     white-space: nowrap
 
-// Hover state
+// Hover/Focus state
 // -----------
 
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
-.dropdown-submenu:hover > a
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a
   text-decoration: none
   color: $dropdownLinkColorHover
   +ctb-gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%))
@@ -89,8 +90,9 @@
 // Active state
 // ------------
 
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus
   color: $dropdownLinkColorActive
   text-decoration: none
   outline: 0
@@ -98,14 +100,17 @@
 
 // Disabled state
 // --------------
-// Gray out text and ensure the hover state remains gray
+// Gray out text and ensure the hover/focus state remains gray
 
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus
   color: $grayLight
 
-// Nuke hover effects
-.dropdown-menu .disabled > a:hover
+// Nuke hover/focus effects
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus
   text-decoration: none
   background-color: transparent
   background-image: none