twitter-bootstrap-rails 2.0 → 2.0.1

data/vendor/toolkit/twitter/bootstrap/navs.less

@@ -26,34 +26,38 @@
 // NAV LIST
 // --------
 
-.nav.list {
+.nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav.list > li > a,
-.nav.list .nav-header {
+.nav-list > li > a,
+.nav-list .nav-header {
   display: block;
   padding: 3px 15px;
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav.list .nav-header {
+.nav-list .nav-header {
   font-size: 11px;
   font-weight: bold;
   line-height: @baseLineHeight;
   color: @grayLight;
   text-transform: uppercase;
 }
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
   margin-top: 9px;
 }
-.nav.list .active > a {
+.nav-list .active > a,
+.nav-list .active > a:hover {
   color: @white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: @linkColor;
 }
+.nav-list [class^="icon-"] {
+  margin-right: 2px;
+}
 
 
 
@@ -61,16 +65,16 @@
 // -------------
 
 // Common styles
-.tabs,
-.pills {
+.nav-tabs,
+.nav-pills {
   .clearfix();
 }
-.tabs > li,
-.pills > li {
+.nav-tabs > li,
+.nav-pills > li {
   float: left;
 }
-.tabs > li > a,
-.pills > li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
@@ -81,17 +85,17 @@
 // ----
 
 // Give the tabs something to sit on
-.tabs {
+.nav-tabs {
   border-bottom: 1px solid #ddd;
 }
 
 // Make the list-items overlay the bottom border
-.tabs > li {
+.nav-tabs > li {
   margin-bottom: -1px;
 }
 
 // Actual tabs (as links)
-.tabs > li > a {
+.nav-tabs > li > a {
   padding-top: 9px;
   padding-bottom: 9px;
   border: 1px solid transparent;
@@ -101,8 +105,8 @@
   }
 }
 // Active state, and it's :hover to override normal :hover
-.tabs > .active > a,
-.tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
   color: @gray;
   background-color: @white;
   border: 1px solid #ddd;
@@ -114,7 +118,7 @@
 // -----
 
 // Links rendered as pills
-.pills > li > a {
+.nav-pills > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
   margin-top: 2px;
@@ -123,8 +127,8 @@
 }
 
 // Active state
-.pills .active > a,
-.pills .active > a:hover {
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
   color: @white;
   background-color: @linkColor;
 }
@@ -135,37 +139,37 @@
 // -----------
 
 // Stacked tabs and pills
-.nav.stacked > li {
+.nav-stacked > li {
   float: none;
 }
-.nav.stacked > li > a {
+.nav-stacked > li > a {
   margin-right: 0; // no need for the gap between nav items
 }
 
 // Tabs
-.tabs.stacked {
+.nav-tabs.nav-stacked {
   border-bottom: 0;
 }
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
   border: 1px solid #ddd;
-  .border-radius(0);
+  .border-radius(0px);
 }
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
   .border-radius(4px 4px 0 0);
 }
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
   .border-radius(0 0 4px 4px);
 }
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
   border-color: #ddd;
   z-index: 2;
 }
 
 // Pills
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
   margin-bottom: 3px;
 }
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
 }
 
@@ -175,32 +179,32 @@
 // ---------
 
 // Position the menu
-.pills .dropdown-menu,
-.tabs .dropdown-menu {
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
   .border-radius(4px);
 }
 
 // Default dropdown links
 // -------------------------
 // Make carets use linkColor to start
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
   border-top-color: @linkColor;
   margin-top: 6px;
 }
-.tabs .dropdown-toggle:hover .caret,
-.pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
   border-top-color: @linkColorHover;
 }
 
 // Active dropdown links
 // -------------------------
-.tabs .active .dropdown-toggle .caret,
-.pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
   border-top-color: @grayDark;
 }
 
@@ -213,8 +217,8 @@
 
 // Open dropdowns
 // -------------------------
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle,
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
 .nav > .open.active > a:hover {
   color: @white;
   background-color: @grayLight;
@@ -228,7 +232,7 @@
 }
 
 // Dropdowns in stacked tabs
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
   border-color: @grayLight;
 }
 
@@ -247,9 +251,9 @@
 }
 
 // Remove border on bottom, left, right
-.tabs-below .tabs,
-.tabs-right .tabs,
-.tabs-left .tabs {
+.tabs-below .nav-tabs,
+.tabs-right .nav-tabs,
+.tabs-left .nav-tabs {
   border-bottom: 0;
 }
 
@@ -267,22 +271,22 @@
 // BOTTOM
 // ------
 
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
   border-top: 1px solid #ddd;
 }
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
   margin-top: -1px;
   margin-bottom: 0;
 }
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
   .border-radius(0 0 4px 4px);
   &:hover {
     border-bottom-color: transparent;
     border-top-color: #ddd;
   }
 }
-.tabs-below .tabs .active > a,
-.tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a,
+.tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
 
@@ -290,49 +294,51 @@
 // ------------
 
 // Common styles
-.tabs-left .tabs > li,
-.tabs-right .tabs > li {
+.tabs-left .nav-tabs > li,
+.tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .tabs > li > a,
-.tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a,
+.tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
 }
 
 // Tabs on the left
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
   border-right: 1px solid #ddd;
 }
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
   margin-right: -1px;
   .border-radius(4px 0 0 4px);
 }
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
   border-color: @grayLighter #ddd @grayLighter @grayLighter;
 }
-.tabs-left .tabs .active > a,
-.tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a,
+.tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: @white;
 }
 
 // Tabs on the right
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
   border-left: 1px solid #ddd;
 }
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
   margin-left: -1px;
   .border-radius(0 4px 4px 0);
 }
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
   border-color: @grayLighter @grayLighter @grayLighter #ddd;
 }
-.tabs-right .tabs .active > a,
-.tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a,
+.tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: @white;
 }

data/vendor/toolkit/twitter/bootstrap/pager.less

@@ -13,10 +13,15 @@
 }
 .pager a {
   display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
   .border-radius(15px);
 }
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
 .pager .next a {
   float: right;
 }

data/vendor/toolkit/twitter/bootstrap/pagination.less

@@ -30,6 +30,7 @@
 }
 .pagination .active a {
   color: @grayLight;
+  cursor: default;
 }
 .pagination .disabled a,
 .pagination .disabled a:hover {

data/vendor/toolkit/twitter/bootstrap/popovers.less

@@ -21,29 +21,29 @@
     width: 0;
     height: 0;
   }
-  .inner {
-    padding: 3px;
-    width: 280px;
-    overflow: hidden;
-    background: @black; // has to be full background declaration for IE fallback
-    background: rgba(0,0,0,.8);
-    .border-radius(6px);
-    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: @black; // has to be full background declaration for IE fallback
+  background: rgba(0,0,0,.8);
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom:1px solid #eee;
+  .border-radius(3px 3px 0 0);
+}
+.popover-content {
+  padding: 14px;
+  background-color: @white;
+  .border-radius(0 0 3px 3px);
+  .background-clip(padding-box);
+  p, ul, ol {
+    margin-bottom: 0;
   }
-  .title {
-    padding: 9px 15px;
-    line-height: 1;
-    background-color: #f5f5f5;
-    border-bottom:1px solid #eee;
-    .border-radius(3px 3px 0 0);
-  }
-  .content {
-    padding: 14px;
-    background-color: @white;
-    .border-radius(0 0 3px 3px);
-    .background-clip(padding-box);
-    p, ul, ol {
-      margin-bottom: 0;
-    }
-  }
-}
+}

data/vendor/toolkit/twitter/bootstrap/progress-bars.less

@@ -11,11 +11,11 @@
   to    { background-position: 40px 0; }
 }
 
-// Temporarily commented out since LESS won't compile with this
-// @-moz-keyframes progress-bar-stripes {
-//   from  { background-position: 0 0; }
-//   to    { background-position: 40px 0; }
-// }
+// Firefox
+@-moz-keyframes progress-bar-stripes {
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
 
 // Spec
 @keyframes progress-bar-stripes {
@@ -28,18 +28,14 @@
 // THE BARS
 // --------
 
-// Common styles
-.progress,
-.progress .bar {
-  .border-radius(4px);
-}
-
 // Outer container
 .progress {
+  overflow: hidden;
   height: 18px;
   margin-bottom: 18px;
   #gradient > .vertical(#f5f5f5, #f9f9f9);
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+  .border-radius(4px);
 }
 
 // Bar of progress
@@ -57,7 +53,7 @@
 }
 
 // Striped bars
-.progress.striped .bar {
+.progress-striped .bar {
   #gradient > .striped(#62c462);
   .background-size(40px 40px);
 }
@@ -75,25 +71,25 @@
 // ------
 
 // Danger (red)
-.progress.danger .bar {
+.progress-danger .bar {
   #gradient > .vertical(#ee5f5b, #c43c35);
 }
-.progress.danger.striped .bar {
+.progress-danger.progress-striped .bar {
   #gradient > .striped(#ee5f5b);
 }
 
 // Success (green)
-.progress.success .bar {
+.progress-success .bar {
   #gradient > .vertical(#62c462, #57a957);
 }
-.progress.success.striped .bar {
+.progress-success.progress-striped .bar {
   #gradient > .striped(#62c462);
 }
 
 // Info (teal)
-.progress.info .bar {
+.progress-info .bar {
   #gradient > .vertical(#5bc0de, #339bb9);
 }
-.progress.info.striped .bar {
+.progress-info.progress-striped .bar {
   #gradient > .striped(#5bc0de);
 }