compass_twitter_bootstrap 2.0.1.2 → 2.0.3

data/stylesheets/compass_twitter_bootstrap/_wells.scss

@@ -8,10 +8,21 @@
   background-color: #f5f5f5;
   border: 1px solid #eee;
   border: 1px solid rgba(0,0,0,.05);
-  @include border-radius(4px);
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  @include bootstrap-border-radius(4px);
+  @include bootstrap-box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
     border-color: rgba(0,0,0,.15);
   }
 }
+
+// Sizes
+.well-large {
+  padding: 24px;
+  @include bootstrap-border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  @include bootstrap-border-radius(3px);
+}
+

data/stylesheets_sass/_compass_twitter_bootstrap.sass

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.0
+ * Bootstrap v2.0.3
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -58,7 +58,7 @@
 
 // Components: Misc
 @import compass_twitter_bootstrap/thumbnails
-@import compass_twitter_bootstrap/labels
+@import compass_twitter_bootstrap/labels-badges
 @import compass_twitter_bootstrap/progress-bars
 @import compass_twitter_bootstrap/accordion
 @import compass_twitter_bootstrap/carousel

data/stylesheets_sass/_compass_twitter_bootstrap_awesome.sass

@@ -0,0 +1,70 @@
+/*
+ * Bootstrap v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+
+@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
+
+// Grid system and page structure
+@import compass_twitter_bootstrap/scaffolding
+@import compass_twitter_bootstrap/grid
+@import compass_twitter_bootstrap/layouts
+
+// Base CSS
+@import compass_twitter_bootstrap/type
+@import compass_twitter_bootstrap/code
+@import compass_twitter_bootstrap/forms
+@import compass_twitter_bootstrap/tables
+
+// Components: common
+@import compass_twitter_bootstrap/font-awesome
+@import compass_twitter_bootstrap/dropdowns
+@import compass_twitter_bootstrap/wells
+@import compass_twitter_bootstrap/component-animations
+@import compass_twitter_bootstrap/close
+
+// Components: Buttons & Alerts
+@import compass_twitter_bootstrap/buttons
+@import compass_twitter_bootstrap/button-groups
+@import compass_twitter_bootstrap/alerts
+
+// Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import compass_twitter_bootstrap/navs
+@import compass_twitter_bootstrap/navbar
+@import compass_twitter_bootstrap/breadcrumbs
+@import compass_twitter_bootstrap/pagination
+@import compass_twitter_bootstrap/pager
+
+// Components: Popovers
+@import compass_twitter_bootstrap/modals
+@import compass_twitter_bootstrap/tooltip
+@import compass_twitter_bootstrap/popovers
+
+// Components: Misc
+@import compass_twitter_bootstrap/thumbnails
+@import compass_twitter_bootstrap/labels-badges
+@import compass_twitter_bootstrap/progress-bars
+@import compass_twitter_bootstrap/accordion
+@import compass_twitter_bootstrap/carousel
+@import compass_twitter_bootstrap/hero-unit
+
+// Utility classes
+@import compass_twitter_bootstrap/utilities
+
+// Has to be last to override when necessary

data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.0.1
+ * Bootstrap Responsive v2.0.3
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -23,233 +23,22 @@
 // RESPONSIVE CLASSES
 // ------------------
 
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden
-  display: none
-  visibility: hidden
+@import compass_twitter_bootstrap/responsive-utilities
 
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px)
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse
-    -webkit-transform: translate3d(0, 0, 0)
-    // activate the GPU
-  // Block level the page header small tag for readability
-  .page-header h1 small
-    display: block
-    line-height: $baseLineHeight
-  // Make span* classes full width
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input
-    display: block
-    width: 100%
-    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
-    /* Older Webkit
-    -moz-box-sizing: border-box
-    /* Older FF
-    -ms-box-sizing: border-box
-    /* IE8
-    box-sizing: border-box
-    /* CSS3 spec
-  // But don't let it screw up prepend/append inputs
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"]
-    width: auto
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"]
-    border: 1px solid #ccc
-  // Remove the horizontal form styles
-  .form-horizontal .control-group > label
-    float: none
-    width: auto
-    padding-top: 0
-    text-align: left
-  // Move over all input controls and content
-  .form-horizontal .controls
-    margin-left: 0
-  // Move the options list down to align with labels
-  .form-horizontal .control-list
-    padding-top: 0
-    // has to be padding because margin collaspes
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions
-    padding-left: 10px
-    padding-right: 10px
-  // Modals
-  .modal
-    position: absolute
-    top: 10px
-    left: 10px
-    right: 10px
-    width: auto
-    margin: 0
-    &.fade.in
-      top: auto
-  .modal-header .close
-    padding: 10px
-    margin: -10px
-  // Carousel
-  .carousel-caption
-    position: static
-
-// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
-// --------------------------------------------------
-
-@media (max-width: 767px)
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container
-    width: auto
-    padding: 0 20px
-  // Fluid rows
-  .row-fluid
-    width: 100%
-  // Undo negative margin on rows
-  .row
-    margin-left: 0
-  // Make all columns even
-  .row > [class*="span"],
-  .row-fluid > [class*="span"]
-    float: none
-    display: block
-    width: auto
-    margin: 0
-
-// PORTRAIT TABLET TO DEFAULT DESKTOP
-// ----------------------------------
-
-@media (min-width: 768px) and (max-width: 979px)
-  // Fixed grid
-  +gridSystem-generate(12, 42px, 20px)
-  // Fluid grid
-  +fluidGridSystem-generate(12, 5.801%, 2.762%)
-  // Input grid
-  +inputGridSystem-generate(12, 42px, 20px)
+// MEDIA QUERIES
+// ------------------
 
-// TABLETS AND BELOW
-// -----------------
-@media (max-width: 979px)
-  // UNFIX THE TOPBAR
-  // ----------------
-  // Remove any padding from the body
-  body
-    padding-top: 0
-  // Unfix the navbar
-  .navbar-fixed-top
-    position: static
-    margin-bottom: $baseLineHeight
-  .navbar-fixed-top .navbar-inner
-    padding: 5px
-  .navbar .container
-    width: auto
-    padding: 0
-  // Account for brand name
-  .navbar .brand
-    padding-left: 10px
-    padding-right: 10px
-    margin: 0 0 0 -5px
-  // Nav collapse clears brand
-  .navbar .nav-collapse
-    clear: left
-  // Block-level the nav
-  .navbar .nav
-    float: none
-    margin: 0 0 $baseLineHeight / 2
-  .navbar .nav > li
-    float: none
-  .navbar .nav > li > a
-    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
-    padding: 6px 15px
-    font-weight: bold
-    color: $navbarLinkColor
-    +border-radius(3px)
-  .navbar .dropdown-menu li + li a
-    margin-bottom: 2px
-  .navbar .nav > li > a:hover,
-  .navbar .dropdown-menu a:hover
-    background-color: $navbarBackground
-  // Dropdowns in the navbar
-  .navbar .dropdown-menu
-    position: static
-    top: auto
-    left: auto
-    float: none
-    display: block
-    max-width: none
-    margin: 0 15px
-    padding: 0
-    background-color: transparent
-    border: none
-    +border-radius(0)
-    +box-shadow(none)
-  .navbar .dropdown-menu:before,
-  .navbar .dropdown-menu:after
-    display: none
-  .navbar .dropdown-menu .divider
-    display: none
-  // Forms in navbar
-  .navbar-form,
-  .navbar-search
-    float: none
-    padding: $baseLineHeight / 2 15px
-    margin: $baseLineHeight / 2 0
-    border-top: 1px solid $navbarBackground
-    border-bottom: 1px solid $navbarBackground
-    $shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1)
-    +box-shadow($shadow)
-  // Pull right (secondary) nav content
-  .navbar .nav.pull-right
-    float: none
-    margin-left: 0
-  // Static navbar
-  .navbar-static .navbar-inner
-    padding-left: 10px
-    padding-right: 10px
-  // Navbar button
-  .btn-navbar
-    display: block
-  // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse
-    overflow: hidden
-    height: 0
+// Phones to portrait tablets and narrow desktops
+@import compass_twitter_bootstrap/responsive-767px-max
 
-// DEFAULT DESKTOP
-// ---------------
+// Tablets to regular desktops
+@import compass_twitter_bootstrap/responsive-768px-979px
 
-@media (min-width: 980px)
-  .nav-collapse.collapse
-    height: auto !important
+// Large desktops
+@import compass_twitter_bootstrap/responsive-1200px-min
 
-// LARGE DESKTOP & UP
+// RESPONSIVE NAVBAR
 // ------------------
 
-@media (min-width: 1200px)
-  // Fixed grid
-  +gridSystem-generate(12, 70px, 30px)
-  // Fluid grid
-  +fluidGridSystem-generate(12, 5.983%, 2.564%)
-  // Input grid
-  +inputGridSystem-generate(12, 70px, 30px)
-  // Thumbnails
-  .thumbnails
-    margin-left: -30px
-  .thumbnails > li
-    margin-left: 30px
+// From 979px and below, show a button to toggle navbar contents
+@import compass_twitter_bootstrap/responsive-navbar

data/stylesheets_sass/compass_twitter_bootstrap/_accordion.sass

@@ -9,7 +9,7 @@
 .accordion-group
   margin-bottom: 2px
   border: 1px solid #e5e5e5
-  +border-radius(4px)
+  +bootstrap-border-radius(4px)
 
 .accordion-heading
   border-bottom: 0
@@ -18,6 +18,10 @@
   display: block
   padding: 8px 15px
 
+// General toggle styles
+.accordion-toggle
+  cursor: pointer
+
 // Inner needs the styles because you can't animate properly with any styles on the element
 .accordion-inner
   padding: 9px 15px

data/stylesheets_sass/compass_twitter_bootstrap/_alerts.sass

@@ -8,11 +8,11 @@
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
   background-color: $warningBackground
   border: 1px solid $warningBorder
-  +border-radius(4px)
+  +bootstrap-border-radius(4px)
+  color: $warningText
 
-.alert,
 .alert-heading
-  color: $warningText
+  color: inherit
 
 // Adjust close link position
 .alert .close
@@ -27,28 +27,17 @@
 .alert-success
   background-color: $successBackground
   border-color: $successBorder
-
-.alert-success,
-.alert-success .alert-heading
   color: $successText
 
 .alert-danger,
 .alert-error
   background-color: $errorBackground
   border-color: $errorBorder
-
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading
   color: $errorText
 
 .alert-info
   background-color: $infoBackground
   border-color: $infoBorder
-
-.alert-info,
-.alert-info .alert-heading
   color: $infoText
 
 // Block alerts

data/stylesheets_sass/compass_twitter_bootstrap/_breadcrumbs.sass

@@ -4,12 +4,14 @@
 .breadcrumb
   padding: 7px 14px
   margin: 0 0 $baseLineHeight
-  +gradient-vertical($white, #f5f5f5)
+  list-style: none
+  +bootstrap-gradient-vertical($white, #f5f5f5)
   border: 1px solid #ddd
-  +border-radius(3px)
-  +box-shadow(inset 0 1px 0 $white)
+  +bootstrap-border-radius(3px)
+  +bootstrap-box-shadow(inset 0 1px 0 $white)
   li
     display: inline-block
+    +bootstrap-ie7-inline-block
     text-shadow: 0 1px 0 $white
   .divider
     padding: 0 5px

data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass

@@ -4,9 +4,9 @@
 // Make the div behave like a button
 .btn-group
   position: relative
-  +clearfix
+  +bootstrap-clearfix
   // clears the floated buttons
-  +ie7-restore-left-whitespace
+  +bootstrap-ie7-restore-left-whitespace
 
 // Space out series of button groups
 .btn-group + .btn-group
@@ -18,17 +18,17 @@
   margin-bottom: $baseLineHeight / 2
   .btn-group
     display: inline-block
-    +ie7-inline-block
+    +bootstrap-ie7-inline-block
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group .btn
+.btn-group > .btn
   position: relative
   float: left
   margin-left: -1px
-  +border-radius(0)
+  +bootstrap-border-radius(0)
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group .btn:first-child
+.btn-group > .btn:first-child
   margin-left: 0
   -webkit-border-top-left-radius: 4px
   -moz-border-radius-topleft: 4px
@@ -37,8 +37,10 @@
   -moz-border-radius-bottomleft: 4px
   border-bottom-left-radius: 4px
 
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle
   -webkit-border-top-right-radius: 4px
   -moz-border-radius-topright: 4px
   border-top-right-radius: 4px
@@ -47,7 +49,7 @@
   border-bottom-right-radius: 4px
 
 // Reset corners for large buttons
-.btn-group .btn.large:first-child
+.btn-group > .btn.large:first-child
   margin-left: 0
   -webkit-border-top-left-radius: 6px
   -moz-border-radius-topleft: 6px
@@ -56,8 +58,8 @@
   -moz-border-radius-bottomleft: 6px
   border-bottom-left-radius: 6px
 
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle
   -webkit-border-top-right-radius: 6px
   -moz-border-radius-topright: 6px
   border-top-right-radius: 6px
@@ -67,10 +69,10 @@
 
 // On hover/focus/active, bring the proper btn to front
 
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active
   z-index: 2
 
 // On active and open, don't show outline
@@ -83,27 +85,46 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group .dropdown-toggle
+.btn-group > .dropdown-toggle
   padding-left: 8px
   padding-right: 8px
-  $shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)
-  +box-shadow($shadow)
-  *padding-top: 5px
-  *padding-bottom: 5px
+  +bootstrap-box-shadow("inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)")
+  *padding-top: 4px
+  *padding-bottom: 4px
+
+.btn-group > .btn-mini.dropdown-toggle
+  padding-left: 5px
+  padding-right: 5px
+
+.btn-group > .btn-small.dropdown-toggle
+  *padding-top: 4px
+  *padding-bottom: 4px
+
+.btn-group > .btn-large.dropdown-toggle
+  padding-left: 12px
+  padding-right: 12px
 
 .btn-group.open
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: $zindexDropdown
-  // Reposition menu on open and round all corners
-  .dropdown-menu
-    display: block
-    margin-top: 1px
-    +border-radius(5px)
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
   .dropdown-toggle
     background-image: none
-    $shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)
-    +box-shadow($shadow)
+    +bootstrap-box-shadow("inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)")
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle
+    background-color: $btnBackgroundHighlight
+  .btn-primary.dropdown-toggle
+    background-color: $btnPrimaryBackgroundHighlight
+  .btn-warning.dropdown-toggle
+    background-color: $btnWarningBackgroundHighlight
+  .btn-danger.dropdown-toggle
+    background-color: $btnDangerBackgroundHighlight
+  .btn-success.dropdown-toggle
+    background-color: $btnSuccessBackgroundHighlight
+  .btn-info.dropdown-toggle
+    background-color: $btnInfoBackgroundHighlight
+  .btn-inverse.dropdown-toggle
+    background-color: $btnInverseBackgroundHighlight
 
 // Reposition the caret
 .btn .caret
@@ -112,19 +133,35 @@
 
 .btn:hover .caret,
 .open.btn-group .caret
-  +opacity(1)
+  +bootstrap-opacity(100)
+
+// Carets in other button sizes
+.btn-mini .caret
+  margin-top: 5px
+
+.btn-small .caret
+  margin-top: 6px
+
+.btn-large .caret
+  margin-top: 6px
+  border-left-width: 5px
+  border-right-width: 5px
+  border-top-width: 5px
+
+// Upside down carets for .dropup
+.dropup .btn-large .caret
+  border-bottom: 5px solid $black
+  border-top: 0
 
 // Account for other colors
 
 .btn-primary,
+.btn-warning,
 .btn-danger,
 .btn-info,
 .btn-success,
 .btn-inverse
   .caret
     border-top-color: $white
-    +opacity(0.75)
-
-// Small button dropdowns
-.btn-small .caret
-  margin-top: 4px
+    border-bottom-color: $white
+    +bootstrap-opacity(75)