sass-rails-bootstrap 2.1.1 → 2.2.1

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

@@ -68,7 +68,7 @@
     +nav-divider($dropdownDividerTop, $dropdownDividerBottom)
 
   // Links within the dropdown menu
-  a
+  li > a
     display: block
     padding: 3px 20px
     clear: both
@@ -82,18 +82,17 @@
 .dropdown-menu li > a:hover,
 .dropdown-menu li > a:focus,
 .dropdown-submenu:hover > a
-  text-decoration: none
   color: $dropdownLinkColorHover
-  background-color: $dropdownLinkBackgroundHover
+  text-decoration: none
+  +gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%))
 
 // Active state
 // ------------
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover
-  color: $dropdownLinkColorHover
+  color: $dropdownLinkColorActive
   text-decoration: none
   outline: 0
-  background-color: $dropdownLinkBackgroundActive
   +gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%))
 
 // Disabled state
@@ -107,6 +106,7 @@
 .dropdown-menu .disabled > a:hover
   text-decoration: none
   background-color: transparent
+  background-image: none  // Remove CSS gradient
   cursor: default
 
 // Open state for the dropdown
@@ -146,6 +146,7 @@
 .dropdown-submenu
   position: relative
 
+// Default dropdowns
 .dropdown-submenu > .dropdown-menu
   top: 0
   left: 100%
@@ -158,6 +159,17 @@
 .dropdown-submenu:hover > .dropdown-menu
   display: block
 
+// Dropups
+.dropup .dropdown-submenu > .dropdown-menu
+  top: auto
+  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
+
+// Caret to indicate there is a submenu
 .dropdown-submenu > a:after
   display: block
   content: " "
@@ -174,6 +186,21 @@
   border-left-color: $dropdownLinkColorHover
 
 
+// Left aligned submenus
+.dropdown-submenu.pull-left
+  // Undo the float
+  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
+  float: none
+
+  // Positioning the submenu
+  > .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
+
+
 // Tweak nav headers
 // -----------------
 // Increase padding from 15px to 20px on sides
@@ -186,4 +213,4 @@
 // ---------
 .typeahead
   margin-top: 2px  // give it some space to breathe
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)

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

@@ -74,11 +74,12 @@ input[type="color"],
   display: inline-block
   height: $baseLineHeight
   padding: 4px 6px
-  margin-bottom: 9px
+  margin-bottom: $baseLineHeight / 2
   font-size: $baseFontSize
   line-height: $baseLineHeight
   color: $gray
   +border-radius($inputBorderRadius)
+  vertical-align: middle
   
 // Reset appearance properties for textual inputs and textarea
 // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
@@ -141,9 +142,9 @@ input[type="checkbox"]
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"]
-  height: 30px  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: $inputHeight  /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px  /* For IE7, add top margin to align select with labels */
-  line-height: 30px
+  line-height: $inputHeight
   
 // Make select elements obey height by applying a border
 select
@@ -190,7 +191,7 @@ input[type="checkbox"]:focus
 // Placeholder
 // -------------------------
 
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
+// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
 input,
 textarea
   +placeholder
@@ -202,13 +203,13 @@ textarea
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox
-  min-height: 18px  // clear the floating input if there is no label text
-  padding-left: 18px
+  min-height: $baseLineHeight  // clear the floating input if there is no label text
+  padding-left: 20px
 
 .radio input[type="radio"],
 .checkbox input[type="checkbox"]
   float: left
-  margin-left: -18px
+  margin-left: -20px
 
 // Move the options list down to align with labels
 .controls > .radio:first-child,
@@ -283,9 +284,16 @@ textarea[class*="span"],
 .controls-row
   +clearfix  // Clear the float from controls
 
-.controls-row [class*="span"]
-  float: left  // Float to collapse white-space for proper grid alignment
+// Float to collapse white-space for proper grid alignment
+// Redeclare the fluid grid collapse since we undo the float for inputs
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"]
+  float: left
 
+// Explicity set top padding on all checkboxes/radios, not just first-child
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"]
+  padding-top: 5px
 
 
 // DISABLED STATE
@@ -377,15 +385,22 @@ select:focus:required:invalid
 .input-append,
 .input-prepend
   margin-bottom: 5px
-  font-size: 0
+  font-size: 0  // white space collapse hack
   white-space: nowrap  // Prevent span and input from separating
+
+  // Reset the white space collapse hack
+  input,
+  select,
+  .uneditable-input,
+  .dropdown-menu
+    font-size: $baseFontSize
+
   input,
   select,
   .uneditable-input
     position: relative  // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
     margin-bottom: 0  // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0
-    font-size: $baseFontSize
     vertical-align: top
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
     // Make input on top when focused so blue border and shadow always show
@@ -418,6 +433,7 @@ select:focus:required:invalid
     margin-right: -1px
   .add-on:first-child,
   .btn:first-child
+    // FYI, `.btn:first-child` accounts for a button group that's prepended
     +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
     
 .input-append
@@ -425,8 +441,11 @@ select:focus:required:invalid
   select,
   .uneditable-input
     +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
+    + .btn-group .btn
+      +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
   .add-on,
-  .btn
+  .btn,
+  .btn-group
     margin-left: -1px
   .add-on:last-child,
   .btn:last-child
@@ -438,6 +457,8 @@ select:focus:required:invalid
   select,
   .uneditable-input
     +border-radius(0)
+    .btn-group .btn
+      +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
   .add-on:first-child,
   .btn:first-child
     margin-right: -1px
@@ -446,6 +467,8 @@ select:focus:required:invalid
   .btn:last-child
     margin-left: -1px
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
+  .btn-group:first-child
+    margin-left: 0
 
 
 

data/vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.sass

@@ -6,6 +6,10 @@
 .hero-unit
   padding: 60px
   margin-bottom: 30px
+  font-size: 18px
+  font-weight: 200
+  line-height: $baseLineHeight * 1.5
+  color: $heroUnitLeadColor
   background-color: $heroUnitBackground
   +border-radius(6px)
   h1
@@ -14,8 +18,5 @@
     line-height: 1
     color: $heroUnitHeadingColor
     letter-spacing: -1px
-  p
-    font-size: 18px
-    font-weight: 200
-    line-height: $baseLineHeight * 1.5
-    color: $heroUnitLeadColor
+  li
+    line-height: $baseLineHeight * 1.5  // Reset since we specify in type.less

data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.sass

@@ -6,6 +6,8 @@
 // Base classes
 .label,
 .badge
+  display: inline-block
+  padding: 2px 4px
   font-size: $baseFontSize * 0.846
   font-weight: bold
   line-height: 14px  // ensure proper line-height if floated
@@ -18,11 +20,11 @@
   
 // Set unique padding and border-radii
 .label
-  padding: 1px 4px 2px
   +border-radius(3px)
   
 .badge
-  padding: 1px 9px 2px
+  padding-left: 9px
+  padding-right: 9px
   +border-radius(9px)
 
 

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

@@ -0,0 +1,54 @@
+// Media objects
+// Source: http://stubbornella.org/content/?p=497
+// --------------------------------------------------
+
+
+// Common styles
+// -------------------------
+
+// Clear the floats
+.media,
+.media-body
+  overflow: hidden
+  *overflow: visible
+  zoom: 1
+
+
+// Proper spacing between instances of .media
+.media,
+.media .media
+  margin-top: 15px
+
+.media:first-child
+  margin-top: 0
+
+
+// For images and videos, set to block
+.media-object
+  display: block
+
+
+// Reset margins on headings for tighter default spacing
+.media-heading
+  margin: 0 0 5px
+
+
+
+// Media image alignment
+// -------------------------
+
+.media .pull-left
+  margin-right: 10px
+
+.media .pull-right
+  margin-left: 10px
+
+
+
+// Media list variation
+// -------------------------
+
+// Undo default ul/ol styles
+.media-list
+  margin-left: 0
+  list-style: none

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

@@ -132,7 +132,7 @@
 =input-block-level
   display: block
   width: 100%
-  min-height: 30px  // Make inputs at least the height of their button counterpart
+  min-height: $inputHeight  // Make inputs at least the height of their button counterpart (base line-height + padding + border)
   +box-sizing(border-box)  // Makes inputs behave like true block-level elements
   
 
@@ -263,6 +263,7 @@
   -ms-transform: skewX($x) skewY($y)  // See https://github.com/twitter/bootstrap/issues/4885
   -o-transform: skew($x, $y)
   transform: skew($x, $y)
+  -webkit-backface-visibility: hidden  // See https://github.com/twitter/bootstrap/issues/5319
   
 =translate3d($x, $y, $z)
   -webkit-transform: translate3d($x, $y, $z)
@@ -551,6 +552,10 @@
       
     [class*="span"]:first-child
       margin-left: 0
+
+    // Space grid-sized controls properly if multiple per line
+    .controls-row [class*="span"] + [class*="span"]
+      margin-left: $fluidGridGutterWidth
       
     @for $i from 1 through $gridColumns
       .span#{$i}

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

@@ -3,18 +3,6 @@
 // --------------------------------------------------
 
 
-// Recalculate z-index where appropriate,
-// but only apply to elements within modal
-.modal-open .modal
-  .dropdown-menu
-    z-index: $zindexDropdown + $zindexModal
-  .dropdown.open
-    *z-index: $zindexDropdown + $zindexModal
-  .popover
-    z-index: $zindexPopover + $zindexModal
-  .tooltip
-    z-index: $zindexTooltip + $zindexModal
-
 // Background
 .modal-backdrop
   position: fixed
@@ -38,7 +26,6 @@
   top: 50%
   left: 50%
   z-index: $zindexModal
-  overflow: auto
   width: 560px
   margin: -250px 0 0 -280px
   background-color: $white
@@ -48,6 +35,8 @@
   +border-radius(6px)
   +box-shadow(0 3px 7px rgba(0,0,0,0.3))
   +background-clip(padding-box)
+  // Remove focus outline from opened modal
+  outline: none
   &.fade
     +transition(#{'opacity .3s linear, top .3s ease-out'})
     top: -25%
@@ -92,3 +81,7 @@
   // but override that for button groups
   .btn-group .btn + .btn
     margin-left: -1px
+  // and override it for block buttons as well
+  .btn-block + .btn-block
+    margin-left: 0
+

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

@@ -24,7 +24,7 @@
   padding-right: 20px
   +gradient-vertical($navbarBackgroundHighlight, $navbarBackground)
   border: 1px solid $navbarBorder
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
   +box-shadow(0 1px 4px rgba(0,0,0,.065))
 
   // Prevent floats from breaking the navbar
@@ -38,6 +38,7 @@
 // Override the default collapsed state
 .nav-collapse.collapse
   height: auto
+  overflow: visible
 
 
 // Brand: website or project name
@@ -139,7 +140,6 @@
 
 .navbar-static-top
   position: static
-  width: 100%
   margin-bottom: 0  // remove 18px margin for default navbar
   .navbar-inner
     +border-radius(0)
@@ -184,15 +184,13 @@
 .navbar-fixed-top,
 .navbar-static-top
   .navbar-inner
-    $shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)
-    +box-shadow($shadow)
+    +box-shadow(0 1px 10px rgba(0,0,0,.1))
 
 // Fixed to bottom
 .navbar-fixed-bottom
   bottom: 0
   .navbar-inner
-    $shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)
-    +box-shadow($shadow)
+    +box-shadow(0 -1px 10px rgba(0,0,0,.1))
 
 
 

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

@@ -63,7 +63,8 @@
   text-shadow: 0 -1px 0 rgba(0,0,0,.2)
   background-color: $linkColor
 
-.nav-list [class^="icon-"]
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"]
   margin-right: 2px
 
 // Dividers (basically an hr) within the dropdown
@@ -117,7 +118,7 @@
 .nav-tabs > .active > a,
 .nav-tabs > .active > a:hover
   color: $gray
-  background-color: $white
+  background-color: $bodyBackground
   border: 1px solid #ddd
   border-bottom-color: transparent
   cursor: default

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

@@ -12,28 +12,29 @@
 .pager li
   display: inline
 
-.pager a,
-.pager span
+.pager li > a,
+.pager li > span
   display: inline-block
   padding: 5px 14px
   background-color: #fff
   border: 1px solid #ddd
   +border-radius(15px)
 
-.pager a:hover
+.pager li > a:hover
   text-decoration: none
   background-color: #f5f5f5
 
-.pager .next a,
-.pager .next span
+.pager .next > a,
+.pager .next > span
   float: right
 
-.pager .previous a
+.pager .previous > a,
+.pager .previous > span
   float: left
 
-.pager .disabled a,
-.pager .disabled a:hover,
-.pager .disabled span
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > span
   color: $grayLight
   background-color: #fff
   cursor: default

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

@@ -2,27 +2,30 @@
 // Pagination (multiple pages)
 // --------------------------------------------------
 
-
+// Space out pagination from surrounding content
 .pagination
-  height: $baseLineHeight * 2
   margin: $baseLineHeight 0
  
+
 .pagination ul
+  // Allow for text-based alignment
   display: inline-block
   +ie7-inline-block
+  // Reset default ul styles
   margin-left: 0
   margin-bottom: 0
-  +border-radius(3px)
+  // Visuals
+  +border-radius($baseBorderRadius)
   +box-shadow(0 1px 2px rgba(0,0,0,.05))
 
 .pagination ul > li
-  display: inline
+  display: inline  // Remove list-style and block-level defaults
 
 .pagination ul > li > a,
 .pagination ul > li > span
-  float: left
-  padding: 0 14px
-  line-height: ($baseLineHeight * 2) - 2
+  float: left  // Collapse white-space
+  padding: 4px 12px
+  line-height: $baseLineHeight
   text-decoration: none
   background-color: $paginationBackground
   border: 1px solid $paginationBorder
@@ -31,7 +34,7 @@
 .pagination ul > li > a:hover,
 .pagination ul > .active > a,
 .pagination ul > .active > span
-  background-color: #f5f5f5
+  background-color: $paginationActiveBackground
 
 .pagination ul > .active > a,
 .pagination ul > .active > span
@@ -48,16 +51,62 @@
 .pagination ul > li:first-child > a,
 .pagination ul > li:first-child > span
   border-left-width: 1px
-  +border-radius(3px 0 0 3px)
+  +border-left-radius($baseBorderRadius)
 
 .pagination ul > li:last-child > a,
 .pagination ul > li:last-child > span
-  +border-radius(0 3px 3px 0)
+  +border-right-radius($baseBorderRadius)
 
 
-// Centered
+// Alignment
+// --------------------------------------------------
+
 .pagination-centered
   text-align: center
 
 .pagination-right
   text-align: right
+
+
+// Sizing
+// --------------------------------------------------
+
+// Large
+.pagination-large
+  ul > li > a,
+  ul > li > span
+    padding: $paddingLarge
+    font-size: $fontSizeLarge
+  ul > li:first-child > a,
+  ul > li:first-child > span
+    +border-left-radius($borderRadiusLarge)
+  ul > li:last-child > a,
+  ul > li:last-child > span
+    +border-right-radius($borderRadiusLarge)
+
+
+// Small and mini
+.pagination-mini,
+.pagination-small
+  ul > li:first-child > a,
+  ul > li:first-child > span
+    +border-left-radius($borderRadiusSmall)
+  ul > li:last-child > a,
+  ul > li:last-child > span
+    +border-right-radius($borderRadiusSmall)
+
+
+// Small
+.pagination-small
+  ul > li > a,
+  ul > li > span
+    padding: $paddingSmall
+    font-size: $fontSizeSmall
+
+
+// Mini
+.pagination-mini
+  ul > li > a,
+  ul > li > span
+    padding: $paddingMini
+    font-size: $fontSizeMini

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

@@ -22,13 +22,13 @@
 
   // Offset the popover to account for the popover arrow
   &.top
-    margin-bottom: 10px
+    margin-top: -10px
   &.right
     margin-left: 10px
   &.bottom
     margin-top: 10px
-  &.right
-    margin-left: 10px
+  &.left
+    margin-left: -10px
 
 .popover-title
   margin: 0  // reset heading margin

data/vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.sass

@@ -53,7 +53,7 @@
   margin-bottom: $baseLineHeight
   +gradient-vertical(#f5f5f5, #f9f9f9)
   +box-shadow(inset 0 1px 2px rgba(0,0,0,.1))
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
 
 // Bar of progress
 .progress .bar

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

@@ -79,7 +79,8 @@ img
   -ms-interpolation-mode: bicubic
   
 // Prevent max-width from affecting Google Maps
-#map_canvas img
+#map_canvas img,
+.google-maps img
   max-width: none
 
 // Forms
@@ -105,11 +106,11 @@ input::-moz-focus-inner  // Inner padding and border oddities in FF3/4
   border: 0
   
 button,
-input[type="button"],
+html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
 input[type="reset"],
 input[type="submit"]
-  cursor: pointer  // Cursors on all buttons applied consistently
-  -webkit-appearance: button  // Style clickable inputs in iOS
+  -webkit-appearance: button  // Corrects inability to style clickable `input` types in iOS.
+  cursor: pointer  // Improves usability and consistency of cursor style between image-type `input` and others.
   
 input[type="search"]  // Appearance in Safari/Chrome
   -webkit-box-sizing: content-box