sass-rails-bootstrap 2.2.1 → 2.2.2

data/vendor/assets/stylesheets/twitter/_bootstrap-responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.2.1
+ * Bootstrap Responsive v2.2.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -11,10 +11,20 @@
 // NOTE: This file's format has to be SCSS rather than SASS because of an apparent bug
 // with variable visibility when importing.
 
+
 // For phone and tablet devices
 // -------------------------------------------------------------
 
 
+// IE10 Metro responsive
+// Required for Windows 8 Metro split-screen snapping with IE10
+// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
+
+@-ms-viewport {
+  width: device-width;
+}
+
+
 // RESPONSIVE CLASSES
 // ------------------
 

data/vendor/assets/stylesheets/twitter/_bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.1
+ * Bootstrap v2.2.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

data/vendor/assets/stylesheets/twitter/bootstrap/_alerts.sass

@@ -13,6 +13,10 @@
   background-color: $warningBackground
   border: 1px solid $warningBorder
   +border-radius($baseBorderRadius)
+
+.alert,
+.alert h4
+  // Specified for the h4 to prevent conflicts of changing @headingsColor
   color: $warningText
   
 .alert h4
@@ -33,6 +37,9 @@
   background-color: $successBackground
   border-color: $successBorder
   color: $successText
+
+.alert-success h4
+  color: $successText
   
 .alert-danger,
 .alert-error
@@ -40,11 +47,18 @@
   border-color: $errorBorder
   color: $errorText
 
+.alert-danger h4,
+.alert-error h4
+  color: $errorText
+
 .alert-info
   background-color: $infoBackground
   border-color: $infoBorder
   color: $infoText
 
+.alert-info h4
+  color: $infoText
+
 
 // Block alerts
 // -------------------------

data/vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.sass

@@ -9,12 +9,12 @@
   list-style: none
   background-color: #f5f5f5
   +border-radius($baseBorderRadius)
-  li
+  > li
     display: inline-block
     +ie7-inline-block
     text-shadow: 0 1px 0 $white
-  .divider
-    padding: 0 5px
-    color: #ccc
-  .active
+    > .divider
+      padding: 0 5px
+      color: #ccc
+  > .active
     color: $grayLight

data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.sass

@@ -22,9 +22,9 @@
   font-size: 0  // Hack to remove whitespace that results from using inline-block
   margin-top: $baseLineHeight / 2
   margin-bottom: $baseLineHeight / 2
-  .btn + .btn,
-  .btn-group + .btn,
-  .btn + .btn-group
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group
     margin-left: 5px
 
 // Float them, remove border radius, then re-add to first and last elements
@@ -36,56 +36,41 @@
   margin-left: -1px
 
 .btn-group > .btn,
-.btn-group > .dropdown-menu
+.btn-group > .dropdown-menu,
+.btn-group > .popover
   font-size: $baseFontSize  // redeclare as part 2 of font-size inline-block hack
 
 // Reset fonts for other sizes
 .btn-group > .btn-mini
-  font-size: 11px
+  font-size: $fontSizeMini
 .btn-group > .btn-small
-  font-size: 12px
+  font-size: $fontSizeSmall
 
 .btn-group > .btn-large
-  font-size: 16px
+  font-size: $fontSizeLarge
   
 // 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
   margin-left: 0
-  -webkit-border-top-left-radius: 4px
-  -moz-border-radius-topleft: 4px
-  border-top-left-radius: 4px
-  -webkit-border-bottom-left-radius: 4px
-  -moz-border-radius-bottomleft: 4px
-  border-bottom-left-radius: 4px
+  +border-top-left-radius($baseBorderRadius)
+  +border-bottom-left-radius($baseBorderRadius)
 
 // 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
-  -webkit-border-bottom-right-radius: 4px
-  -moz-border-radius-bottomright: 4px
-  border-bottom-right-radius: 4px
+  +border-top-left-radius($baseBorderRadius)
+  +border-bottom-left-radius($baseBorderRadius)
   
 // Reset corners for large buttons
 .btn-group > .btn.large:first-child
   margin-left: 0
-  -webkit-border-top-left-radius: 6px
-  -moz-border-radius-topleft: 6px
-  border-top-left-radius: 6px
-  -webkit-border-bottom-left-radius: 6px
-  -moz-border-radius-bottomleft: 6px
-  border-bottom-left-radius: 6px
+  +border-top-left-radius($borderRadiusLarge)
+  +border-bottom-left-radius($borderRadiusLarge)
 
 .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
-  -webkit-border-bottom-right-radius: 6px
-  -moz-border-radius-bottomright: 6px
-  border-bottom-right-radius: 6px
+  +border-top-left-radius($borderRadiusLarge)
+  +border-bottom-left-radius($borderRadiusLarge)
 
 // On hover/focus/active, bring the proper btn to front
 .btn-group > .btn:hover,
@@ -200,24 +185,24 @@
   display: inline-block  // makes buttons only take up the width they need
   +ie7-inline-block
 
-.btn-group-vertical .btn
+.btn-group-vertical > .btn
   display: block
   float: none
-  width: 100%
+  max-width: 100%
   +border-radius(0)
 
-.btn-group-vertical .btn + .btn
+.btn-group-vertical > .btn + .btn
   margin-left: 0
   margin-top: -1px
 
-.btn-group-vertical .btn:first-child
-  +border-radius(4px 4px 0 0)
+.btn-group-vertical > .btn:first-child
+  +border-radius($baseBorderRadius $baseBorderRadius 0 0)
 
-.btn-group-vertical .btn:last-child
-  +border-radius(0 0 4px 4px)
+.btn-group-vertical > .btn:last-child
+  +border-radius(0 0 $baseBorderRadius $baseBorderRadius)
 
-.btn-group-vertical .btn-large:first-child
-  +border-radius(6px 6px 0 0)
+.btn-group-vertical > .btn-large:first-child
+  +border-radius($borderRadiusLarge $borderRadiusLarge 0 0)
 
-.btn-group-vertical .btn-large:last-child
-  +border-radius(0 0 6px 6px)
+.btn-group-vertical > .btn-large:last-child
+  +border-radius(0 0 $borderRadiusLarge $borderRadiusLarge)

data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.sass

@@ -12,9 +12,8 @@
   +ie7-inline-block
   padding: 4px 12px
   margin-bottom: 0  // For input.btn
-  font-size: 13px
-  line-height: 20px
-  *line-height: 20px
+  font-size: $baseFontSize
+  line-height: $baseLineHeight
   text-align: center
   vertical-align: middle
   cursor: pointer
@@ -31,8 +30,6 @@
   &: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
     // transition is only when going to hover, otherwise the background
     // behind the gradient (there for IE<=9 fallback) gets mismatched
@@ -45,8 +42,6 @@
   // Active state
   &.active,
   &:active
-    background-color: darken($white, 10%)
-    background-color: darken($white, 15%) #{"\9"}
     background-image: none
     outline: 0
     $shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05)
@@ -56,7 +51,6 @@
   &.disabled,
   &[disabled]
     cursor: default
-    background-color: darken($white, 10%)
     background-image: none
     +opacity(65)
     +box-shadow(none)
@@ -71,7 +65,7 @@
   +border-radius($borderRadiusLarge)
 .btn-large [class^="icon-"],
 .btn-large [class*=" icon-"]
-  margin-top: 2px
+  margin-top: 4px
     
 // Small
 .btn-small
@@ -81,6 +75,9 @@
 .btn-small [class^="icon-"],
 .btn-small [class*=" icon-"]
   margin-top: 0
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"]
+  margin-top: -1px
     
 // Mini
 .btn-mini

data/vendor/assets/stylesheets/twitter/bootstrap/_carousel.sass

@@ -13,42 +13,42 @@
   width: 100%
   position: relative
 
-.carousel
-  .item
+.carousel-inner
+  > .item
     display: none
     position: relative
     +transition(.6s ease-in-out left)
 
   // Account for jankitude on images
-  .item > img
+  > .item > img
     display: block
     line-height: 1
 
-  .active,
-  .next,
-  .prev
+  > .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%
 
 

data/vendor/assets/stylesheets/twitter/bootstrap/_code.sass

@@ -18,6 +18,7 @@ code
   color: #d14
   background-color: #f7f7f9
   border: 1px solid #e1e1e8
+  white-space: nowrap
 
 // Blocks of code
 pre
@@ -32,8 +33,8 @@ pre
   white-space: pre-wrap
   background-color: #f5f5f5
   border: 1px solid #ccc  // fallback for IE7-8
-  border: 1px solid rgba(0, 0, 0, 0.15)
-  +border-radius($baseBorderRadius)
+  border: 1px solid rgba(0,0,0,.15)
+  .border-radius($baseBorderRadius)
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint
@@ -42,8 +43,13 @@ pre
   // Account for some code outputs that place code tags in pre tags
   code
     padding: 0
+    color: inherit
+    white-space: pre
+    white-space: pre-wrap
     background-color: transparent
-    
+    border: 0
+
+
 // Enable scrollable blocks of code
 .pre-scrollable
   max-height: 340px

data/vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.sass

@@ -107,6 +107,7 @@
   text-decoration: none
   background-color: transparent
   background-image: none  // Remove CSS gradient
+  +reset-filter
   cursor: default
 
 // Open state for the dropdown
@@ -152,9 +153,7 @@
   left: 100%
   margin-top: -6px
   margin-left: -1px
-  -webkit-border-radius: 0 6px 6px 6px
-  -moz-border-radius: 0 6px 6px 6px
-  border-radius: 0 6px 6px 6px
+  +border-radius(0 6px 6px 6px)
 
 .dropdown-submenu:hover > .dropdown-menu
   display: block
@@ -165,9 +164,7 @@
   bottom: 0
   margin-top: 0
   margin-bottom: -2px
-  -webkit-border-radius: 5px 5px 5px 0
-  -moz-border-radius: 5px 5px 5px 0
-  border-radius: 5px 5px 5px 0
+  +border-radius(5px 5px 5px 0)
 
 // Caret to indicate there is a submenu
 .dropdown-submenu > a:after
@@ -196,9 +193,7 @@
   > .dropdown-menu
     left: -100%
     margin-left: 10px
-    -webkit-border-radius: 6px 0 6px 6px
-    -moz-border-radius: 6px 0 6px 6px
-    border-radius: 6px 0 6px 6px
+    +border-radius(6px 0 6px 6px)
 
 
 // Tweak nav headers
@@ -212,5 +207,6 @@
 // Typeahead
 // ---------
 .typeahead
+  z-index: 1051
   margin-top: 2px  // give it some space to breathe
   +border-radius($baseBorderRadius)

data/vendor/assets/stylesheets/twitter/bootstrap/_forms.sass

@@ -128,7 +128,6 @@ input[type="checkbox"]
   *margin-top: 0  /* IE7 */
   margin-top: 1px \9  /* IE8-9 */
   line-height: normal
-  cursor: pointer
   
 // Reset width of input buttons, radios, checkboxes
 input[type="file"],
@@ -334,9 +333,9 @@ input[type="checkbox"][readonly]
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid
   color: #b94a48
   border-color: #ee5f5b
   &:focus
@@ -420,7 +419,8 @@ select:focus:required:invalid
     background-color: $grayLighter
     border: 1px solid #ccc
   .add-on,
-  .btn
+  .btn,
+  .btn-group > .dropdown-toggle
     vertical-align: top
     +border-radius(0)
   .active
@@ -441,14 +441,15 @@ select:focus:required:invalid
   select,
   .uneditable-input
     +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
-    + .btn-group .btn
+    + .btn-group .btn:last-child
       +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
   .add-on,
   .btn,
   .btn-group
     margin-left: -1px
   .add-on:last-child,
-  .btn:last-child
+  .btn:last-child,
+  .btn-group:last-child > .dropdown-toggle
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
     
 // Remove all border-radius for inputs with both prepend and append
@@ -593,7 +594,10 @@ legend + .control-group
   // And apply it only to .help-block instances that follow a form control
   input,
   select,
-  textarea
+  textarea,
+  .uneditable-input,
+  .input-prepend,
+  .input-append
     + .help-block
       margin-top: $baseLineHeight / 2
   // Move over buttons in .form-actions to align with .controls