compass_twitter_bootstrap 2.0.3 → 2.2.2

data/stylesheets_sass/compass_twitter_bootstrap/_navs.sass

@@ -1,5 +1,6 @@
-// NAVIGATIONS
-// -----------
+//
+// Navs
+// --------------------------------------------------
 
 // BASE CLASS
 // ----------
@@ -17,27 +18,17 @@
   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
 
 // Nav headers (for dropdowns and lists)
-.nav .nav-header
-  display: block
-  padding: 3px 15px
-  font-size: 11px
-  font-weight: bold
-  line-height: $baseLineHeight
-  color: $grayLight
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
-  text-transform: uppercase
-
-// Space them out when they follow another list item (link)
-.nav li + .nav-header
-  margin-top: 9px
-
-// Nav headers (for dropdowns and lists)
-.nav .nav-header
+.nav-header
   display: block
   padding: 3px 15px
   font-size: 11px
@@ -74,12 +65,13 @@
   text-shadow: 0 -1px 0 rgba(0, 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
 .nav-list .divider
-  +bootstrap-nav-divider
+  +ctb-nav-divider
 
 // TABS AND PILLS
 // -------------
@@ -88,7 +80,7 @@
 
 .nav-tabs,
 .nav-pills
-  +bootstrap-clearfix
+  +ctb-clearfix
 
 .nav-tabs > li,
 .nav-pills > li
@@ -115,11 +107,11 @@
 
 // Actual tabs (as links)
 .nav-tabs > li > a
-  padding-top: 9px
-  padding-bottom: 9px
+  padding-top: 8px
+  padding-bottom: 8px
   line-height: $baseLineHeight
   border: 1px solid transparent
-  +bootstrap-border-radius(4px 4px 0 0)
+  +ctb-border-radius(4px 4px 0 0)
   &:hover
     border-color: $grayLighter $grayLighter #dddddd
 
@@ -128,7 +120,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
@@ -142,7 +134,7 @@
   padding-bottom: 8px
   margin-top: 2px
   margin-bottom: 2px
-  +bootstrap-border-radius(5px)
+  +ctb-border-radius(5px)
 
 // Active state
 
@@ -168,13 +160,13 @@
 
 .nav-tabs.nav-stacked > li > a
   border: 1px solid #ddd
-  +bootstrap-border-radius(0)
+  +ctb-border-radius(0)
 
 .nav-tabs.nav-stacked > li:first-child > a
-  +bootstrap-border-radius(4px 4px 0 0)
+  +ctb-border-top-radius(4px)
 
 .nav-tabs.nav-stacked > li:last-child > a
-  +bootstrap-border-radius(0 0 4px 4px)
+  +ctb-border-bottom-radius(4px)
 
 .nav-tabs.nav-stacked > li > a:hover
   border-color: #ddd
@@ -192,40 +184,42 @@
 // ---------
 
 .nav-tabs .dropdown-menu
-  +bootstrap-border-radius(0 0 5px 5px)
+  +ctb-border-radius(0 0 6px 6px)
   // remove the top rounded corners here since there is a hard edge above the menu
 
 .nav-pills .dropdown-menu
-  +bootstrap-border-radius(4px)
+  +ctb-border-radius(6px)
   // make rounded corners match the pills
 
 // Default dropdown links
 // -------------------------
 // Make carets use linkColor to start
-
-.nav-tabs .dropdown-toggle .caret,
-.nav-pills .dropdown-toggle .caret
+.nav .dropdown-toggle .caret
   border-top-color: $linkColor
   border-bottom-color: $linkColor
   margin-top: 6px
 
-.nav-tabs .dropdown-toggle:hover .caret,
-.nav-pills .dropdown-toggle:hover .caret
+.nav .dropdown-toggle:hover .caret
   border-top-color: $linkColorHover
   border-bottom-color: $linkColorHover
 
+/* move down carets for tabs
+.nav-tabs .dropdown-toggle .caret
+  margin-top: 8px
+
 // Active dropdown links
 // -------------------------
+.nav .active .dropdown-toggle .caret
+  border-top-color: #fff
+  border-bottom-color: #fff
 
-.nav-tabs .active .dropdown-toggle .caret,
-.nav-pills .active .dropdown-toggle .caret
-  border-top-color: $grayDark
-  border-bottom-color: $grayDark
+.nav-tabs .active .dropdown-toggle .caret
+  border-top-color: $gray
+  border-bottom-color: $gray
 
 // Active:hover dropdown links
 // -------------------------
 .nav > .dropdown.active > a:hover
-  color: $black
   cursor: pointer
 
 // Open dropdowns
@@ -243,7 +237,7 @@
 .nav li.dropdown.open a:hover .caret
   border-top-color: $white
   border-bottom-color: $white
-  +bootstrap-opacity(100)
+  +ctb-opacity(1)
 
 // Dropdowns in stacked tabs
 .tabs-stacked .open > a:hover
@@ -257,7 +251,7 @@
 
 // Clear any floats
 .tabbable
-  +bootstrap-clearfix
+  +ctb-clearfix
 
 .tab-content
   overflow: auto
@@ -291,7 +285,7 @@
   margin-bottom: 0
 
 .tabs-below > .nav-tabs > li > a
-  +bootstrap-border-radius(0 0 4px 4px)
+  +ctb-border-radius(0 0 4px 4px)
   &:hover
     border-bottom-color: transparent
     border-top-color: #ddd
@@ -323,7 +317,7 @@
 
 .tabs-left > .nav-tabs > li > a
   margin-right: -1px
-  +bootstrap-border-radius(4px 0 0 4px)
+  +ctb-border-radius(4px 0 0 4px)
 
 .tabs-left > .nav-tabs > li > a:hover
   border-color: $grayLighter #dddddd $grayLighter $grayLighter
@@ -341,7 +335,7 @@
 
 .tabs-right > .nav-tabs > li > a
   margin-left: -1px
-  +bootstrap-border-radius(0 4px 4px 0)
+  +ctb-border-radius(0 4px 4px 0)
 
 .tabs-right > .nav-tabs > li > a:hover
   border-color: $grayLighter $grayLighter $grayLighter #dddddd
@@ -350,3 +344,16 @@
 .tabs-right > .nav-tabs .active > a:hover
   border-color: #ddd #ddd #ddd transparent
   *border-left-color: $white
+
+// DISABLED STATES
+// ---------------
+
+// Gray out text
+.nav > .disabled > a
+  color: $grayLight
+
+// Nuke hover effects
+.nav > .disabled > a:hover
+  text-decoration: none
+  background-color: transparent
+  cursor: default

data/stylesheets_sass/compass_twitter_bootstrap/_pager.sass

@@ -1,35 +1,39 @@
-// PAGER
-// -----
+//
+// Pager pagination
+// --------------------------------------------------
 
 .pager
-  margin-left: 0
-  margin-bottom: $baseLineHeight
+  margin: $baseLineHeight 0
   list-style: none
   text-align: center
-  +bootstrap-clearfix
+  +ctb-clearfix
 
 .pager li
   display: inline
 
-.pager a
+.pager li > a,
+.pager li > span
   display: inline-block
   padding: 5px 14px
   background-color: #fff
   border: 1px solid #ddd
-  +bootstrap-border-radius(15px)
+  +ctb-border-radius(15px)
 
-.pager a:hover
+.pager li > a:hover
   text-decoration: none
   background-color: #f5f5f5
 
-.pager .next a
+.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 > a,
+.pager .disabled > a:hover,
+.pager .disabled > span
   color: $grayLight
   background-color: #fff
   cursor: default

data/stylesheets_sass/compass_twitter_bootstrap/_pagination.sass

@@ -1,54 +1,109 @@
-// PAGINATION
-// ----------
+//
+// 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
-  +bootstrap-ie7-inline-block
+  +ctb-ie7-inline-block
+  // Reset default ul styles
   margin-left: 0
   margin-bottom: 0
-  +bootstrap-border-radius(3px)
-  +bootstrap-box-shadow(0 1px 2px rgba(0, 0, 0, 0.05))
+  // Visuals
+  +ctb-border-radius($baseBorderRadius)
+  +ctb-box-shadow(0 1px 2px rgba(0, 0, 0, 0.05))
 
-.pagination li
+.pagination ul > li
   display: inline
+  // Remove list-style and block-level defaults
 
-.pagination a
+.pagination ul > li > a,
+.pagination ul > li > span
   float: left
-  padding: 0 14px
-  line-height: $baseLineHeight * 2 - 2
+  // Collapse white-space
+  padding: 4px 12px
+  line-height: $baseLineHeight
   text-decoration: none
-  border: 1px solid #ddd
+  background-color: $paginationBackground
+  border: 1px solid $paginationBorder
   border-left-width: 0
 
-.pagination a:hover,
-.pagination .active a
-  background-color: #f5f5f5
+.pagination ul > li > a:hover,
+.pagination ul > .active > a,
+.pagination ul > .active > span
+  background-color: $paginationActiveBackground
 
-.pagination .active a
+.pagination ul > .active > a,
+.pagination ul > .active > span
   color: $grayLight
   cursor: default
 
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover
   color: $grayLight
   background-color: transparent
   cursor: default
 
-.pagination li:first-child a
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span
   border-left-width: 1px
-  +bootstrap-border-radius(3px 0 0 3px)
+  +ctb-border-left-radius($baseBorderRadius)
 
-.pagination li:last-child a
-  +bootstrap-border-radius(0 3px 3px 0)
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span
+  +ctb-border-right-radius($baseBorderRadius)
+
+// Alignment
+// --------------------------------------------------
 
-// Centered
 .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
+    +ctb-border-left-radius($borderRadiusLarge)
+  ul > li:last-child > a,
+  ul > li:last-child > span
+    +ctb-border-right-radius($borderRadiusLarge)
+
+// Small and mini
+
+.pagination-mini,
+.pagination-small
+  ul > li:first-child > a,
+  ul > li:first-child > span
+    +ctb-border-left-radius($borderRadiusSmall)
+  ul > li:last-child > a,
+  ul > li:last-child > span
+    +ctb-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/stylesheets_sass/compass_twitter_bootstrap/_popovers.sass

@@ -1,5 +1,6 @@
-// POPOVERS
-// --------
+//
+// Popovers
+// --------------------------------------------------
 
 .popover
   position: absolute
@@ -7,49 +8,114 @@
   left: 0
   z-index: $zindexPopover
   display: none
-  padding: 5px
+  width: 236px
+  padding: 1px
+  text-align: left
+  // Reset given new insertion method
+  background-color: $popoverBackground
+  -webkit-background-clip: padding-box
+  -moz-background-clip: padding
+  background-clip: padding-box
+  border: 1px solid #ccc
+  border: 1px solid rgba(0, 0, 0, 0.2)
+  +ctb-border-radius(6px)
+  +ctb-box-shadow(0 5px 10px rgba(0, 0, 0, 0.2))
+  // Overrides for proper insertion
+  white-space: normal
+  // Offset the popover to account for the popover arrow
   &.top
-    margin-top: -5px
+    margin-top: -10px
   &.right
-    margin-left: 5px
+    margin-left: 10px
   &.bottom
-    margin-top: 5px
+    margin-top: 10px
   &.left
-    margin-left: -5px
-  &.top .arrow
-    +bootstrap-popoverArrow-top
-  &.right .arrow
-    +bootstrap-popoverArrow-right
-  &.bottom .arrow
-    +bootstrap-popoverArrow-bottom
-  &.left .arrow
-    +bootstrap-popoverArrow-left
-  .arrow
-    position: absolute
-    width: 0
-    height: 0
-
-.popover-inner
-  padding: 3px
-  width: 280px
-  overflow: hidden
-  background: $black
-  // has to be full background declaration for IE fallback
-  background: rgba(0, 0, 0, 0.8)
-  +bootstrap-border-radius(6px)
-  +bootstrap-box-shadow(0 3px 7px rgba(0, 0, 0, 0.3))
+    margin-left: -10px
 
 .popover-title
-  padding: 9px 15px
-  line-height: 1
-  background-color: #f5f5f5
-  border-bottom: 1px solid #eee
-  +bootstrap-border-radius(3px 3px 0 0)
+  margin: 0
+  // reset heading margin
+  padding: 8px 14px
+  font-size: 14px
+  font-weight: normal
+  line-height: 18px
+  background-color: $popoverTitleBackground
+  border-bottom: 1px solid darken($popoverTitleBackground, 5%)
+  +ctb-border-radius(5px 5px 0 0)
 
 .popover-content
-  padding: 14px
-  background-color: $white
-  +bootstrap-border-radius(0 0 3px 3px)
-  +bootstrap-background-clip(padding-box)
-  p, ul, ol
-    margin-bottom: 0
+  padding: 9px 14px
+
+// Arrows
+//
+// .arrow is outer, .arrow:after is inner
+
+.popover .arrow,
+.popover .arrow:after
+  position: absolute
+  display: block
+  width: 0
+  height: 0
+  border-color: transparent
+  border-style: solid
+
+.popover .arrow
+  border-width: $popoverArrowOuterWidth
+
+.popover .arrow:after
+  border-width: $popoverArrowWidth
+  content: ""
+
+.popover
+  &.top .arrow
+    left: 50%
+    margin-left: -$popoverArrowOuterWidth
+    border-bottom-width: 0
+    border-top-color: #999
+    // IE8 fallback
+    border-top-color: $popoverArrowOuterColor
+    bottom: -$popoverArrowOuterWidth
+    &:after
+      bottom: 1px
+      margin-left: -$popoverArrowWidth
+      border-bottom-width: 0
+      border-top-color: $popoverArrowColor
+  &.right .arrow
+    top: 50%
+    left: -$popoverArrowOuterWidth
+    margin-top: -$popoverArrowOuterWidth
+    border-left-width: 0
+    border-right-color: #999
+    // IE8 fallback
+    border-right-color: $popoverArrowOuterColor
+    &:after
+      left: 1px
+      bottom: -$popoverArrowWidth
+      border-left-width: 0
+      border-right-color: $popoverArrowColor
+  &.bottom .arrow
+    left: 50%
+    margin-left: -$popoverArrowOuterWidth
+    border-top-width: 0
+    border-bottom-color: #999
+    // IE8 fallback
+    border-bottom-color: $popoverArrowOuterColor
+    top: -$popoverArrowOuterWidth
+    &:after
+      top: 1px
+      margin-left: -$popoverArrowWidth
+      border-top-width: 0
+      border-bottom-color: $popoverArrowColor
+  &.left .arrow
+    top: 50%
+    right: -$popoverArrowOuterWidth
+    margin-top: -$popoverArrowOuterWidth
+    border-right-width: 0
+    border-left-color: #999
+    // IE8 fallback
+    border-left-color: $popoverArrowOuterColor
+    &:after
+      right: 1px
+      border-right-width: 0
+      border-left-color: $popoverArrowColor
+      bottom: -$popoverArrowWidth