sass-rails-bootstrap 2.2.1 → 2.2.2

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

@@ -28,6 +28,13 @@
   +border-radius(9px)
 
 
+// Empty labels/badges collapse
+.label,
+.badge
+  &:empty
+    display: none
+    
+
 // Hover state, but only for links
 a
   &.label:hover,

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

@@ -139,7 +139,7 @@
 // Mixin for form field states
 =form-field-state($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5)
   // Set the text color
-  > label,
+  .control-label,
   .help-block,
   .help-inline
     color: $textColor

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

@@ -23,11 +23,11 @@
 // Base modal
 .modal
   position: fixed
-  top: 50%
+  top: 10%
   left: 50%
   z-index: $zindexModal
   width: 560px
-  margin: -250px 0 0 -280px
+  margin-left: -280px
   background-color: $white
   border: 1px solid #999
   border: 1px solid rgba(0,0,0,.3)
@@ -41,7 +41,7 @@
     +transition(#{'opacity .3s linear, top .3s ease-out'})
     top: -25%
     &.in
-      top: 50%
+      top: 10%
       
 .modal-header
   padding: 9px 15px
@@ -56,6 +56,7 @@
 
 // Body (where all modal content resides)
 .modal-body
+  position: relative
   overflow-y: auto
   max-height: 400px
   padding: 15px

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

@@ -10,7 +10,6 @@
 .navbar
   overflow: visible
   margin-bottom: $baseLineHeight
-  color: $navbarText
 
   // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
   *position: relative
@@ -62,6 +61,7 @@
 .navbar-text
   margin-bottom: 0
   line-height: $navbarHeight
+  color: $navbarText
 
 
 // Janky solution for now to account for links outside the .nav
@@ -114,7 +114,7 @@
     margin-top: 3px
   .input-append,
   .input-prepend
-    margin-top: 6px
+    margin-top: 5px
     white-space: nowrap  // preven two  items from separating within a .navbar-form that has .pull-left
     input
       margin-top: 0  // remove the margin on top since it's on the parent
@@ -310,6 +310,12 @@
     top: auto
 
 
+// Caret should match text color on hover
+.navbar .nav li.dropdown > a:hover .caret
+  border-top-color: $navbarLinkColorActive
+  border-bottom-color: $navbarLinkColorActive
+
+
 // Remove background color from open dropdown
 .navbar .nav li.dropdown.open > .dropdown-toggle,
 .navbar .nav li.dropdown.active > .dropdown-toggle,
@@ -352,8 +358,6 @@
 // -------------------------
 
 .navbar-inverse
-  color: $navbarInverseText
-
   .navbar-inner
     +gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground)
     border-color: $navbarInverseBorder
@@ -365,6 +369,12 @@
     &:hover
       color: $navbarInverseLinkColorHover
 
+  .brand
+    color: $navbarInverseBrandColor
+
+  .navbar-text
+    color: $navbarInverseText
+
   .nav > li > a:focus,
   .nav > li > a:hover
     background-color: $navbarInverseLinkBackgroundHover
@@ -394,6 +404,10 @@
     background-color: $navbarInverseLinkBackgroundActive
     color: $navbarInverseLinkColorActive
 
+  .nav li.dropdown > a:hover .caret
+    border-top-color: $navbarInverseLinkColorActive
+    border-bottom-color: $navbarInverseLinkColorActive
+
   .nav li.dropdown > .dropdown-toggle .caret
     border-top-color: $navbarInverseLinkColor
     border-bottom-color: $navbarInverseLinkColor

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

@@ -19,6 +19,11 @@
   text-decoration: none
   background-color: $grayLighter
 
+// Prevent IE8 from misplacing imgs
+// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
+.nav > li > a > img
+  max-width: none
+
 // Redeclare pull classes because of specifity
 .nav > .pull-right
   float: right

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

@@ -11,6 +11,7 @@
   display: none
   width: 236px
   padding: 1px
+  text-align: left  // Reset given new insertion method
   background-color: $popoverBackground
   -webkit-background-clip: padding-box
   -moz-background-clip: padding
@@ -20,6 +21,9 @@
   +border-radius(6px)
   +box-shadow(0 5px 10px rgba(0,0,0,.2))
 
+  // Overrides for proper insertion
+  white-space: normal
+
   // Offset the popover to account for the popover arrow
   &.top
     margin-top: -10px
@@ -42,67 +46,75 @@
 
 .popover-content
   padding: 9px 14px
-  p, ul, ol
-    margin-bottom: 0
 
 // Arrows
+//
+// .arrow is outer, .arrow:after is inner
+
 .popover .arrow,
 .popover .arrow:after
   position: absolute
-  display: inline-block
+  display: block
   width: 0
   height: 0
   border-color: transparent
   border-style: solid
+.popover .arrow
+  border-width: $popoverArrowOuterWidth
 .popover .arrow:after
+  border-width: $popoverArrowWidth
   content: ""
-  z-index: -1
 
 .popover
   &.top .arrow
-    bottom: -$popoverArrowWidth
     left: 50%
-    margin-left: -$popoverArrowWidth
-    border-width: $popoverArrowWidth $popoverArrowWidth 0
-    border-top-color: $popoverArrowColor
+    margin-left: -$popoverArrowOuterWidth
+    border-bottom-width: 0
+    border-top-color: #999  // IE8 fallback
+    border-top-color: $popoverArrowOuterColor
+    bottom: -$popoverArrowOuterWidth
     &:after
-      border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth 0
-      border-top-color: $popoverArrowOuterColor
-      bottom: -1px
-      left: -$popoverArrowOuterWidth
+      bottom: 1px
+      margin-left: -$popoverArrowWidth
+      border-bottom-width: 0
+      border-top-color: $popoverArrowColor
 
   &.right .arrow
     top: 50%
-    left: -$popoverArrowWidth
-    margin-top: -$popoverArrowWidth
-    border-width: $popoverArrowWidth $popoverArrowWidth $popoverArrowWidth 0
-    border-right-color: $popoverArrowColor
+    left: -$popoverArrowOuterWidth
+    margin-top: -$popoverArrowOuterWidth
+    border-left-width: 0
+    border-right-color: #999  // IE8 fallback
+    border-right-color: $popoverArrowOuterColor
     &:after
-      border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth $popoverArrowOuterWidth 0
-      border-right-color: $popoverArrowOuterColor
-      bottom: -$popoverArrowOuterWidth
-      left: -1px
+      left: 1px
+      bottom: -$popoverArrowWidth
+      border-left-width: 0
+      border-right-color: $popoverArrowColor
 
   &.bottom .arrow
-    top: -$popoverArrowWidth
     left: 50%
-    margin-left: -$popoverArrowWidth
-    border-width: 0 $popoverArrowWidth $popoverArrowWidth
-    border-bottom-color: $popoverArrowColor
+    margin-left: -$popoverArrowOuterWidth
+    border-top-width: 0
+    border-bottom-color: #999  // IE8 fallback
+    border-bottom-color: $popoverArrowOuterColor
+    top: -$popoverArrowOuterWidth
     &:after
-      border-width: 0 $popoverArrowOuterWidth $popoverArrowOuterWidth
-      border-bottom-color: $popoverArrowOuterColor
-      top: -1px
-      left: -$popoverArrowOuterWidth
+      top: 1px
+      margin-left: -$popoverArrowWidth
+      border-top-width: 0
+      border-bottom-color: $popoverArrowColor
 
   &.left .arrow
     top: 50%
-    right: -$popoverArrowWidth
-    margin-top: -$popoverArrowWidth
-    border-width: $popoverArrowWidth 0 $popoverArrowWidth $popoverArrowWidth
-    border-left-color: $popoverArrowColor
+    right: -$popoverArrowOuterWidth
+    margin-top: -$popoverArrowOuterWidth
+    border-right-width: 0
+    border-left-color: #999  // IE8 fallback
+    border-left-color: $popoverArrowOuterColor
     &:after
-      border-width: $popoverArrowOuterWidth 0 $popoverArrowOuterWidth $popoverArrowOuterWidth
-      border-left-color: $popoverArrowOuterColor
-      bottom: -$popoverArrowOuterWidth
-      right: -1px
+      right: 1px
+      border-right-width: 0
+      border-left-color: $popoverArrowColor
+      bottom: -$popoverArrowWidth
+

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

@@ -1,5 +1,5 @@
 //
-// Reset
+// Reset CSS
 // Adapted from http://github.com/necolas/normalize.css
 // --------------------------------------------------
 
@@ -111,11 +111,19 @@ input[type="reset"],
 input[type="submit"]
   -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.
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"]
+  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
-  -moz-box-sizing: content-box
-  box-sizing: content-box
+  +box-sizing(content-box)
   -webkit-appearance: textfield
   
 input[type="search"]::-webkit-search-decoration,
@@ -125,3 +133,60 @@ input[type="search"]::-webkit-search-cancel-button
 textarea
   overflow: auto  // Remove vertical scrollbar in IE6-9
   vertical-align: top  // Readability and alignment cross-browser
+
+
+
+// Printing
+// -------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+
+@media print
+  *
+    text-shadow: none !important
+    color: #000 !important  // Black prints faster: h5bp.com/s
+    background: transparent !important
+    box-shadow: none !important
+
+  a,
+  a:visited
+    text-decoration: underline
+
+  a[href]:after
+    content: " (" attr(href) ")"
+
+  abbr[title]:after
+    content: " (" attr(title) ")"
+
+  // Don't show links for images, or javascript/internal links
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after
+    content: ""
+
+  pre,
+  blockquote
+    border: 1px solid #999
+    page-break-inside: avoid
+
+  thead
+    display: table-header-group  // h5bp.com/t
+
+  tr,
+  img
+    page-break-inside: avoid
+
+  img
+    max-width: 100% !important
+
+  @page
+    margin: 0.5cm
+
+  p,
+  h2,
+  h3
+    orphans: 3
+    widows: 3
+
+  h2,
+  h3
+    page-break-after: avoid

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

@@ -42,6 +42,9 @@ table
   // Account for multiple tbody instances
   tbody + tbody
     border-top: 2px solid $tableBorder
+  // Nesting
+  .table
+    background-color: $bodyBackground
 
 
 
@@ -78,45 +81,39 @@ table
   tbody:first-child tr:first-child td
     border-top: 0
   // For first th or td in the first row in the first thead or tbody
-  thead:first-child tr:first-child th:first-child,
-  tbody:first-child tr:first-child td:first-child
-    -webkit-border-top-left-radius: 4px
-    border-top-left-radius: 4px
-    -moz-border-radius-topleft: 4px
-  thead:first-child tr:first-child th:last-child,
-  tbody:first-child tr:first-child td:last-child
-    -webkit-border-top-right-radius: 4px
-    border-top-right-radius: 4px
-    -moz-border-radius-topright: 4px
-  // For first th or td in the first row in the first thead or tbody
-  thead:last-child tr:last-child th:first-child,
-  tbody:last-child tr:last-child td:first-child,
-  tfoot:last-child tr:last-child td:first-child
-    -webkit-border-bottom-left-radius: 4px
-    border-bottom-left-radius: 4px
-    -moz-border-radius-bottomleft: 4px
-  thead:last-child tr:last-child th:last-child,
-  tbody:last-child tr:last-child td:last-child,
-  tfoot:last-child tr:last-child td:last-child
-    -webkit-border-bottom-right-radius: 4px
-    border-bottom-right-radius: 4px
-    -moz-border-radius-bottomright: 4px
+  thead:first-child tr:first-child > th:first-child,
+  tbody:first-child tr:first-child > td:first-child
+    +border-top-left-radius($baseBorderRadius)
+  thead:first-child tr:first-child > th:last-child,
+  tbody:first-child tr:first-child > td:last-child
+    +border-top-right-radius($baseBorderRadius)
+  // For first th or td in the last row in the last thead or tbody
+  thead:last-child tr:last-child > th:first-child,
+  tbody:last-child tr:last-child > td:first-child,
+  tfoot:last-child tr:last-child > td:first-child
+    +border-bottom-left-radius($baseBorderRadius)
+  thead:last-child tr:last-child > th:last-child,
+  tbody:last-child tr:last-child > td:last-child,
+  tfoot:last-child tr:last-child > td:last-child
+    +border-bottom-right-radius($baseBorderRadius)
+
+  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
+  tfoot + tbody:last-child tr:last-child td:first-child
+    +border-bottom-left-radius(0)
+  tfoot + tbody:last-child tr:last-child td:last-child
+    +border-bottom-right-radius(0)
 
   // Special fixes to round the left border on the first td/th
   caption + thead tr:first-child th:first-child,
   caption + tbody tr:first-child td:first-child,
   colgroup + thead tr:first-child th:first-child,
   colgroup + tbody tr:first-child td:first-child
-    -webkit-border-top-left-radius: 4px
-    border-top-left-radius: 4px
-    -moz-border-radius-topleft: 4px
+    +border-top-left-radius($baseBorderRadius)
   caption + thead tr:first-child th:last-child,
   caption + tbody tr:first-child td:last-child,
   colgroup + thead tr:first-child th:last-child,
   colgroup + tbody tr:first-child td:last-child
-    -webkit-border-top-right-radius: 4px
-    border-top-right-radius: 4px
-    -moz-border-radius-topright: 4px
+    +border-top-right-radius($baseBorderRadius)
 
 
 // ZEBRA-STRIPING
@@ -125,8 +122,8 @@ table
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 .table-striped
   tbody
-    tr:nth-child(odd) td,
-    tr:nth-child(odd) th
+    > tr:nth-child(odd) > td,
+    > tr:nth-child(odd) > th
       background-color: $tableBackgroundAccent
 
 

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

@@ -19,8 +19,9 @@ p
 // Emphasis & misc
 // -------------------------
 
+// Ex: 14px base font * 85% = about 12px
 small
-  font-size: 85%  // Ex: 14px base font * 85% = about 12px
+  font-size: 85%
 
 strong
   font-weight: bold
@@ -34,6 +35,8 @@ cite
 // Utility classes
 .muted
   color: $grayLight
+a.muted:hover
+  color: darken($grayLight, 10%)
 
 .text-warning
   color: $warningText
@@ -125,10 +128,23 @@ ol ul
 li
   line-height: $baseLineHeight
   
+
+// Remove default list styles
 ul.unstyled,
 ol.unstyled
   margin-left: 0
   list-style: none
+
+
+// Single-line list items
+ul.inline,
+ol.inline
+  margin-left: 0
+  list-style: none
+  & > li
+    display: inline-block
+    padding-left: 5px
+    padding-right: 5px
   
 
 // Description Lists