compass_twitter_bootstrap 2.0.0 → 2.0.1

data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.0.0
+ * Bootstrap Responsive v2.0.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -7,7 +7,7 @@
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
 
-// RESPONSIVE
+// Responsive
 // For phone and tablet devices
 // -------------------------------------------------------------
 
@@ -15,10 +15,10 @@
 // -------------------------
 // Required since we compile the responsive stuff separately
 
-@import variables
+@import compass_twitter_bootstrap/variables
 
 // Modify this for custom colors, font-sizes, etc
-@import mixins
+@import compass_twitter_bootstrap/mixins
 
 // RESPONSIVE CLASSES
 // ------------------
@@ -48,7 +48,7 @@
   .uneditable-input
     display: block
     width: 100%
-    height: 28px
+    min-height: 28px
     /* Make inputs at least the height of their button counterpart
     /* Makes inputs behave like true block-level elements
     -webkit-box-sizing: border-box
@@ -104,7 +104,7 @@
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
-@media (max-width: 768px)
+@media (max-width: 767px)
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -128,7 +128,7 @@
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
-@media (min-width: 768px) and (max-width: 980px)
+@media (min-width: 768px) and (max-width: 979px)
   // Fixed grid
   +gridSystem-generate(12, 42px, 20px)
   // Fluid grid
@@ -138,7 +138,7 @@
 
 // TABLETS AND BELOW
 // -----------------
-@media (max-width: 980px)
+@media (max-width: 979px)
   // UNFIX THE TOPBAR
   // ----------------
   // Remove any padding from the body
@@ -171,6 +171,9 @@
     margin-bottom: 2px
   .navbar .nav > .divider-vertical
     display: none
+  .navbar .nav .nav-header
+    color: $navbarText
+    text-shadow: none
   // Nav and dropdown links in navbar
   .navbar .nav > li > a,
   .navbar .dropdown-menu a

data/stylesheets_sass/compass_twitter_bootstrap/_breadcrumbs.sass

@@ -9,7 +9,7 @@
   +border-radius(3px)
   +box-shadow(inset 0 1px 0 $white)
   li
-    display: inline
+    display: inline-block
     text-shadow: 0 1px 0 $white
   .divider
     padding: 0 5px

data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass

@@ -119,7 +119,8 @@
 .btn-primary,
 .btn-danger,
 .btn-info,
-.btn-success
+.btn-success,
+.btn-inverse
   .caret
     border-top-color: $white
     +opacity(0.75)

data/stylesheets_sass/compass_twitter_bootstrap/_buttons.sass

@@ -8,13 +8,15 @@
 .btn
   display: inline-block
   padding: 4px 10px 4px
+  margin-bottom: 0
+  // For input.btn
   font-size: $baseFontSize
   line-height: $baseLineHeight
   color: $grayDark
   text-align: center
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75)
-  +gradient-vertical-three-colors($white, $white, 25%, darken($white, 10%))
-  // Don't use @include gradientbar(); here since it does a three-color gradient
+  vertical-align: middle
+  +buttonBackground($white, darken($white, 10%))
   border: 1px solid #ccc
   border-bottom-color: #bbb
   +border-radius(4px)
@@ -22,6 +24,7 @@
   +box-shadow($shadow)
   cursor: pointer
   // Give IE7 some love
+  +reset-filter
   +ie7-restore-left-whitespace
 
 // Hover state
@@ -47,7 +50,6 @@
   +box-shadow($shadow)
   background-color: darken($white, 10%)
   background-color: darken($white, 15%) e("\9")
-  color: rgba(0, 0, 0, 0.5)
   outline: 0
 
 // Disabled state
@@ -70,7 +72,7 @@
   line-height: normal
   +border-radius(5px)
 
-.btn-large .icon
+.btn-large [class^="icon-"]
   margin-top: 1px
 
 // Small
@@ -79,9 +81,15 @@
   font-size: $baseFontSize - 2px
   line-height: $baseLineHeight - 2px
 
-.btn-small .icon
+.btn-small [class^="icon-"]
   margin-top: -1px
 
+// Mini
+.btn-mini
+  padding: 2px 6px
+  font-size: $baseFontSize - 2px
+  line-height: $baseLineHeight - 4px
+
 // Alternate buttons
 // --------------------------------------------------
 
@@ -97,7 +105,9 @@
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)
   color: $white
 
@@ -107,7 +117,8 @@
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active
+.btn-info.active,
+.btn-dark.active
   color: rgba(255, 255, 255, 0.75)
 
 // Set the backgrounds
@@ -131,11 +142,16 @@
 .btn-info
   +buttonBackground(#5bc0de, #2f96b4)
 
+// Inverse appears as dark gray
+.btn-inverse
+  +buttonBackground(#454545, #262626)
+
 // Cross-browser Jank
 // --------------------------------------------------
 
 button.btn,
 input[type="submit"].btn
+  // Firefox 3.6 only I believe
   &::-moz-focus-inner
     padding: 0
     border: 0

data/stylesheets_sass/compass_twitter_bootstrap/_code.sass

@@ -12,12 +12,14 @@ pre
   color: $grayDark
   +border-radius(3px)
 
+// Inline code
 code
   padding: 3px 4px
   color: #d14
   background-color: #f7f7f9
   border: 1px solid #e1e1e8
 
+// Blocks of code
 pre
   display: block
   padding: ($baseLineHeight - 1) / 2
@@ -32,10 +34,18 @@ pre
   white-space: pre
   white-space: pre-wrap
   word-break: break-all
+  word-wrap: break-word
   // Make prettyprint styles more spaced out for readability
   &.prettyprint
     margin-bottom: $baseLineHeight
   // Account for some code outputs that place code tags in pre tags
   code
     padding: 0
+    color: inherit
     background-color: transparent
+    border: 0
+
+// Enable scrollable blocks of code
+.pre-scrollable
+  max-height: 340px
+  overflow-y: scroll

data/stylesheets_sass/compass_twitter_bootstrap/_dropdowns.sass

@@ -47,7 +47,6 @@
   display: none
   // none by default, but block on "open" of the menu
   min-width: 160px
-  max-width: 220px
   _width: 160px
   padding: 4px 0
   margin: 0
@@ -89,7 +88,7 @@
     padding: 3px 15px
     clear: both
     font-weight: normal
-    line-height: 18px
+    line-height: $baseLineHeight
     color: $gray
     white-space: nowrap
 

data/stylesheets_sass/compass_twitter_bootstrap/_forms.sass

@@ -25,6 +25,10 @@ legend
   color: $grayDark
   border: 0
   border-bottom: 1px solid #eee
+  // Small
+  small
+    font-size: $baseLineHeight * 0.75
+    color: $grayLight
 
 // Set font for forms
 
@@ -33,7 +37,15 @@ input,
 button,
 select,
 textarea
-  +font-sans-serif($baseFontSize, normal, $baseLineHeight)
+  +font-shorthand($baseFontSize, normal, $baseLineHeight)
+  // Set size, weight, line-height here
+
+input,
+button,
+select,
+textarea
+  +font-family-sans-serif
+  // And only set font-family here for those that need it (note the missing label element)
 
 // Identify controls by their labels
 label
@@ -81,12 +93,17 @@ input[type="radio"]
   *margin-top: 0
   /* IE7
   line-height: normal
-  border: 0
   cursor: pointer
   +border-radius(0)
+  border: 0 \9
+  /* IE9 and down
+
+input[type="image"]
+  border: 0
 
 // Reset the file input to browser defaults
 input[type="file"]
+  width: auto
   padding: initial
   line-height: initial
   border: initial
@@ -112,6 +129,10 @@ input[type="file"]
   /* For IE7, add top margin to align select with labels
   line-height: 28px
 
+// Reset line-height for IE
+input[type="file"]
+  line-height: 18px \9
+
 // Chrome on Linux and Mobile Safari need background-color
 select
   width: 220px
@@ -158,10 +179,12 @@ input[type="hidden"]
   // has to be padding because margin collaspes
 
 // Radios and checkboxes on same line
+// TODO v3: Convert .inline to .control-inline
 
 .radio.inline,
 .checkbox.inline
   display: inline-block
+  padding-top: 5px
   margin-bottom: 0
   vertical-align: middle
 
@@ -170,12 +193,6 @@ input[type="hidden"]
   margin-left: 10px
   // space out consecutive inline controls
 
-// But don't forget to remove their padding on first-child
-
-.controls > .radio.inline:first-child,
-.controls > .checkbox.inline:first-child
-  padding-top: 0
-
 // FOCUS STATE
 // -----------
 
@@ -192,9 +209,10 @@ textarea:focus
   +box-shadow($shadow)
   outline: 0
   outline: thin dotted \9
-  /* IE6-8
+  /* IE6-9
 
 input[type="file"]:focus,
+input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus
   +box-shadow(none)
@@ -255,29 +273,6 @@ textarea[readonly]
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Mixin for form field states
-=formFieldState($textColor: #555555, $borderColor: #cccccc, $backgroundColor: #f5f5f5)
-  // Set the text color
-  > label,
-  .help-block,
-  .help-inline
-    color: $textColor
-  // Style inputs accordingly
-  input,
-  select,
-  textarea
-    color: $textColor
-    border-color: $borderColor
-    &:focus
-      border-color: darken($borderColor, 10%)
-      +box-shadow(0 0 6px lighten($borderColor, 20%))
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on
-    color: $textColor
-    background-color: $backgroundColor
-    border-color: $textColor
-
 // Warning
 .control-group.warning
   +formFieldState($warningText, $warningText, $warningBackground)
@@ -327,6 +322,8 @@ select:focus:required:invalid
 // ---------
 
 .help-block
+  display: block
+  // account for any element using help-block
   margin-top: 5px
   margin-bottom: 0
   color: $grayLight
@@ -387,6 +384,7 @@ select:focus:required:invalid
     float: left
     +border-radius(3px 0 0 3px)
   .uneditable-input
+    border-left-color: #eee
     border-right-color: #ccc
   .add-on
     margin-right: 0
@@ -425,6 +423,9 @@ select:focus:required:invalid
   .uneditable-input
     display: inline-block
     margin-bottom: 0
+  // Re-hide hidden elements due to specifity
+  .hide
+    display: none
 
 .form-search label,
 .form-inline label,
@@ -442,24 +443,34 @@ select:focus:required:invalid
 .form-inline .input-prepend .add-on
   vertical-align: middle
 
+// Inline checkbox/radio labels
+
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox
+  margin-bottom: 0
+  vertical-align: middle
+
 // Margin to space out fieldsets
 .control-group
   margin-bottom: $baseLineHeight / 2
 
+// Legend collapses margin, so next element is responsible for spacing
+legend + .control-group
+  margin-top: $baseLineHeight
+  -webkit-margin-top-collapse: separate
+
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal
-  // Legend collapses margin, so we're relegated to padding
-  legend + .control-group
-    margin-top: $baseLineHeight
-    -webkit-margin-top-collapse: separate
   // Increase spacing between groups
   .control-group
     margin-bottom: $baseLineHeight
     +clearfix
   // Float the labels left
-  .control-group > label
+  .control-label
     float: left
     width: 140px
     padding-top: 5px

data/stylesheets_sass/compass_twitter_bootstrap/_labels.sass

@@ -1,23 +1,42 @@
 // LABELS
 // ------
 
+// Base
 .label
-  padding: 1px 3px 2px
-  font-size: $baseFontSize * 0.75
+  padding: 2px 4px 3px
+  font-size: $baseFontSize * 0.85
   font-weight: bold
   color: $white
-  text-transform: uppercase
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)
   background-color: $grayLight
   +border-radius(3px)
 
+// Hover state
+.label:hover
+  color: $white
+  text-decoration: none
+
+// Colors
 .label-important
   background-color: $errorText
 
+.label-important:hover
+  background-color: darken($errorText, 10%)
+
 .label-warning
   background-color: $orange
 
+.label-warning:hover
+  background-color: darken($orange, 10%)
+
 .label-success
   background-color: $successText
 
+.label-success:hover
+  background-color: darken($successText, 10%)
+
 .label-info
   background-color: $infoText
+
+.label-info:hover
+  background-color: darken($infoText, 10%)