bootstrap-sass-rails 2.3.2.1 → 3.0.0.0.rc1

data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss

@@ -1,4 +1,3 @@
-/* Partial: twitter/bootstrap/_tooltip.scss */
 //
 // Tooltips
 // --------------------------------------------------
@@ -7,13 +6,14 @@
 // Base class
 .tooltip {
   position: absolute;
-  z-index: $zindexTooltip;
+  z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: 11px;
+  font-size: $font-size-small;
   line-height: 1.4;
   @include opacity(0);
-  &.in     { @include opacity(80); }
+
+  &.in     { @include opacity(1); }
   &.top    { margin-top:  -3px; padding: 5px 0; }
   &.right  { margin-left:  3px; padding: 0 5px; }
   &.bottom { margin-top:   3px; padding: 5px 0; }
@@ -22,13 +22,13 @@
 
 // Wrapper for the tooltip content
 .tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: $tooltipColor;
+  max-width: $tooltip-max-width;
+  padding: 3px 8px;
+  color: $tooltip-color;
   text-align: center;
   text-decoration: none;
-  background-color: $tooltipBackground;
-  @include border-radius($baseBorderRadius);
+  background-color: $tooltip-bg;
+  border-radius: $border-radius-base;
 }
 
 // Arrows
@@ -43,29 +43,53 @@
   &.top .tooltip-arrow {
     bottom: 0;
     left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-top-color: $tooltipArrowColor;
+    margin-left: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
+  &.top-left .tooltip-arrow {
+    bottom: 0;
+    left: 5px;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
+  &.top-right .tooltip-arrow {
+    bottom: 0;
+    right: 5px;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
   }
   &.right .tooltip-arrow {
     top: 50%;
     left: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-right-color: $tooltipArrowColor;
+    margin-top: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-right-color: $tooltip-arrow-color;
   }
   &.left .tooltip-arrow {
     top: 50%;
     right: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-left-color: $tooltipArrowColor;
+    margin-top: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-left-color: $tooltip-arrow-color;
   }
   &.bottom .tooltip-arrow {
     top: 0;
     left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-bottom-color: $tooltipArrowColor;
+    margin-left: -$tooltip-arrow-width;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
+  &.bottom-left .tooltip-arrow {
+    top: 0;
+    left: 5px;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
+  &.bottom-right .tooltip-arrow {
+    top: 0;
+    right: 5px;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
   }
 }

data/app/assets/stylesheets/twitter/bootstrap/_type.scss

@@ -1,4 +1,3 @@
-/* Partial: twitter/bootstrap/_type.scss */
 //
 // Typography
 // --------------------------------------------------
@@ -8,13 +7,17 @@
 // -------------------------
 
 p {
-  margin: 0 0 $baseLineHeight / 2;
+  margin: 0 0 ($line-height-computed / 2);
 }
 .lead {
-  margin-bottom: $baseLineHeight;
-  font-size: $baseFontSize * 1.5;
+  margin-bottom: $line-height-computed;
+  font-size: ($font-size-base * 1.15);
   font-weight: 200;
-  line-height: $baseLineHeight * 1.5;
+  line-height: 1.4;
+
+  @media (min-width: 768px) {
+    font-size: ($font-size-base * 1.5);
+  }
 }
 
 
@@ -24,31 +27,18 @@ p {
 // Ex: 14px base font * 85% = about 12px
 small   { font-size: 85%; }
 
-strong  { font-weight: bold; }
-em      { font-style: italic; }
+// Undo browser default styling
 cite    { font-style: normal; }
 
-// Utility classes
-.muted               { color: $grayLight; }
-a.muted:hover,
-a.muted:focus        { color: darken($grayLight, 10%); }
-
-.text-warning        { color: $warningText; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken($warningText, 10%); }
-
-.text-error          { color: $errorText; }
-a.text-error:hover,
-a.text-error:focus   { color: darken($errorText, 10%); }
-
-.text-info           { color: $infoText; }
-a.text-info:hover,
-a.text-info:focus    { color: darken($infoText, 10%); }
-
-.text-success        { color: $successText; }
-a.text-success:hover,
-a.text-success:focus { color: darken($successText, 10%); }
+// Contextual emphasis
+.text-muted          { color: $text-muted; }
+.text-primary        { color: $brand-primary; }
+.text-warning        { color: $state-warning-text; }
+.text-danger         { color: $state-danger-text; }
+.text-success        { color: $state-success-text; }
+.text-info           { color: $state-info-text; }
 
+// Alignment
 .text-left           { text-align: left; }
 .text-right          { text-align: right; }
 .text-center         { text-align: center; }
@@ -57,79 +47,81 @@ a.text-success:focus { color: darken($successText, 10%); }
 // Headings
 // -------------------------
 
-h1, h2, h3, h4, h5, h6 {
-  margin: ($baseLineHeight / 2) 0;
-  font-family: $headingsFontFamily;
-  font-weight: $headingsFontWeight;
-  line-height: $baseLineHeight;
-  color: $headingsColor;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: $headings-font-family;
+  font-weight: $headings-font-weight;
+  line-height: $headings-line-height;
   small {
     font-weight: normal;
-    color: $grayLight;
     line-height: 1;
+    color: $headings-small-color;
   }
 }
+
 h1,
 h2,
-h3 { line-height: $baseLineHeight * 2; }
+h3 {
+  margin-top: $line-height-computed;
+  margin-bottom: ($line-height-computed / 2);
+}
+h4,
+h5,
+h6 {
+  margin-top: ($line-height-computed / 2);
+  margin-bottom: ($line-height-computed / 2);
+}
 
-h1 { font-size: $baseFontSize * 2.75; } // ~38px
-h2 { font-size: $baseFontSize * 2.25; } // ~32px
-h3 { font-size: $baseFontSize * 1.75; } // ~24px
-h4 { font-size: $baseFontSize * 1.25; } // ~18px
-h5 { font-size: $baseFontSize; }
-h6 { font-size: $baseFontSize * 0.85; } // ~12px
+h1, .h1 { font-size: ceil($font-size-base * 2.70); } // ~38px
+h2, .h2 { font-size: ceil($font-size-base * 2.25); } // ~32px
+h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px
+h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px
+h5, .h5 { font-size:  $font-size-base; }
+h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
 
-h1 small { font-size: $baseFontSize * 1.75; } // ~24px
-h2 small { font-size: $baseFontSize * 1.25; } // ~18px
-h3 small { font-size: $baseFontSize; }
-h4 small { font-size: $baseFontSize; }
+h1 small, .h1 small { font-size: ceil($font-size-base * 1.70); } // ~24px
+h2 small, .h2 small { font-size: ceil($font-size-base * 1.25); } // ~18px
+h3 small, .h3 small,
+h4 small, .h4 small { font-size: $font-size-base; }
 
 
 // Page header
 // -------------------------
 
 .page-header {
-  padding-bottom: ($baseLineHeight / 2) - 1;
-  margin: $baseLineHeight 0 ($baseLineHeight * 1.5);
-  border-bottom: 1px solid $grayLighter;
+  padding-bottom: (($line-height-computed / 2) - 1);
+  margin: ($line-height-computed * 2) 0 $line-height-computed;
+  border-bottom: 1px solid $page-header-border-color;
 }
 
 
+
 // Lists
 // --------------------------------------------------
 
 // Unordered and Ordered lists
-ul, ol {
-  padding: 0;
-  margin: 0 0 $baseLineHeight / 2 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: $baseLineHeight;
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: ($line-height-computed / 2);
+  ul,
+  ol{
+    margin-bottom: 0;
+  }
 }
 
-// Remove default list styles
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
+// List options
 
-// Single-line list items
-ul.inline,
-ol.inline {
-  margin-left: 0;
+// Unstyled keeps list items block level, just removes default browser padding and list-style
+.list-unstyled {
+  padding-left: 0;
   list-style: none;
+}
+// Inline turns list items into inline-block
+.list-inline {
+  @extend .list-unstyled;
   > li {
     display: inline-block;
-    @include ie7-inline-block();
     padding-left: 5px;
     padding-right: 5px;
   }
@@ -137,50 +129,42 @@ ol.inline {
 
 // Description Lists
 dl {
-  margin-bottom: $baseLineHeight;
+  margin-bottom: $line-height-computed;
 }
 dt,
 dd {
-  line-height: $baseLineHeight;
+  line-height: $line-height-base;
 }
 dt {
   font-weight: bold;
 }
 dd {
-  margin-left: $baseLineHeight / 2;
+  margin-left: 0; // Undo browser default
 }
 // Horizontal layout (like forms)
 .dl-horizontal {
-  @include clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
-    width: $horizontalComponentOffset - 20;
+    width: ($component-offset-horizontal - 20);
     clear: left;
     text-align: right;
     @include text-overflow();
   }
   dd {
-    margin-left: $horizontalComponentOffset;
+    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
+    margin-left: $component-offset-horizontal;
   }
 }
 
 // MISC
 // ----
 
-// Horizontal rules
-hr {
-  margin: $baseLineHeight 0;
-  border: 0;
-  border-top: 1px solid $hrBorder;
-  border-bottom: 1px solid $white;
-}
-
 // Abbreviations and acronyms
 abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted $grayLight;
+  border-bottom: 1px dotted $abbr-border-color;
 }
 abbr.initialism {
   font-size: 90%;
@@ -189,21 +173,23 @@ abbr.initialism {
 
 // Blockquotes
 blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 $baseLineHeight;
-  border-left: 5px solid $grayLighter;
+  padding: ($line-height-computed / 2) $line-height-computed;
+  margin: 0 0 $line-height-computed;
+  border-left: 5px solid $blockquote-border-color;
   p {
-    margin-bottom: 0;
-    font-size: $baseFontSize * 1.25;
+    font-size: ($font-size-base * 1.25);
     font-weight: 300;
     line-height: 1.25;
   }
+  p:last-child {
+    margin-bottom: 0;
+  }
   small {
     display: block;
-    line-height: $baseLineHeight;
-    color: $grayLight;
+    line-height: $line-height-base;
+    color: $blockquote-small-color;
     &:before {
-      content: '\2014 \00A0';
+      content: '\2014 \00A0';// EM DASH, NBSP
     }
   }
 
@@ -212,7 +198,7 @@ blockquote {
     float: right;
     padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid $grayLighter;
+    border-right: 5px solid $blockquote-border-color;
     border-left: 0;
     p,
     small {
@@ -223,7 +209,7 @@ blockquote {
         content: '';
       }
       &:after {
-        content: '\00A0 \2014';
+        content: '\00A0 \2014';// NBSP, EM DASH
       }
     }
   }
@@ -232,7 +218,7 @@ blockquote {
 // Quotes
 q:before,
 q:after,
-blockquote:before, 
+blockquote:before,
 blockquote:after {
   content: "";
 }
@@ -240,7 +226,7 @@ blockquote:after {
 // Addresses
 address {
   display: block;
-  margin-bottom: $baseLineHeight;
+  margin-bottom: $line-height-computed;
   font-style: normal;
-  line-height: $baseLineHeight;
+  line-height: $line-height-base;
 }

data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss

@@ -1,10 +1,14 @@
-/* Partial: twitter/bootstrap/_utilities.scss */
 //
 // Utility classes
 // --------------------------------------------------
 
 
-// Quick floats
+// Floats
+// -------------------------
+
+.clearfix {
+  @include clearfix();
+}
 .pull-right {
   float: right;
 }
@@ -12,20 +16,27 @@
   float: left;
 }
 
+
 // Toggling content
+// -------------------------
+
 .hide {
-  display: none;
+  display: none !important;
 }
 .show {
-  display: block;
+  display: block !important;
 }
-
-// Visibility
 .invisible {
   visibility: hidden;
 }
+.text-hide {
+  @include hide-text();
+}
+
 
 // For Affix plugin
+// -------------------------
+
 .affix {
   position: fixed;
 }