bootstrap-sass-rails 3.0.0.0.rc2 → 3.0.0.0

data/app/assets/stylesheets/twitter/bootstrap/_navs.scss

@@ -19,7 +19,7 @@
     > a {
       position: relative;
       display: block;
-      padding: 10px 15px;
+      padding: $nav-link-padding;
       &:hover,
       &:focus {
         text-decoration: none;
@@ -42,17 +42,12 @@
   }
 
   // Open dropdowns
-  &.open > a {
+  .open > a {
     &,
     &:hover,
     &:focus {
-      color: $nav-open-link-hover-color;
-      background-color: $link-color;
+      background-color: $nav-link-hover-bg;
       border-color: $link-color;
-      .caret {
-        border-top-color: $nav-open-caret-border-color;
-        border-bottom-color: $nav-open-caret-border-color;
-      }
     }
   }
 
@@ -87,7 +82,7 @@
       border: 1px solid transparent;
       border-radius: $border-radius-base $border-radius-base 0 0;
       &:hover {
-        border-color: $nav-tabs-link-hover-border-color;
+        border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
       }
     }
 
@@ -159,14 +154,20 @@
 
 .nav-justified {
   width: 100%;
+
   > li {
     float: none;
-    display: table-cell;
-    width: 1%;
-    > a {
+     > a {
       text-align: center;
     }
   }
+
+  @media (min-width: $screen-sm) {
+    > li {
+      display: table-cell;
+      width: 1%;
+    }
+  }
 }
 
 // Move borders to anchors instead of bottom of list

data/app/assets/stylesheets/twitter/bootstrap/_pager.scss

@@ -23,7 +23,7 @@
     > a:hover,
     > a:focus {
       text-decoration: none;
-      background-color: $pagination-active-bg;
+      background-color: $pagination-hover-bg;
     }
   }
 

data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss

@@ -11,18 +11,19 @@
     display: inline; // Remove list-style and block-level defaults
     > a,
     > span {
+      position: relative;
       float: left; // Collapse white-space
       padding: $padding-base-vertical $padding-base-horizontal;
       line-height: $line-height-base;
       text-decoration: none;
       background-color: $pagination-bg;
       border: 1px solid $pagination-border;
-      border-left-width: 0;
+      margin-left: -1px;
     }
     &:first-child {
       > a,
       > span {
-        border-left-width: 1px;
+        margin-left: 0;
         @include border-left-radius($border-radius-base);
       }
     }
@@ -34,16 +35,25 @@
     }
   }
 
-  > li > a:hover,
-  > li > a:focus,
-  > .active > a,
-  > .active > span {
-    background-color: $pagination-active-bg;
+  > li > a,
+  > li > span {
+    &:hover,
+    &:focus {
+      background-color: $pagination-hover-bg;
+    }
   }
+
   > .active > a,
   > .active > span {
-    color: $pagination-active-color;
-    cursor: default;
+    &,
+    &:hover,
+    &:focus {
+      z-index: 2;
+      color: $pagination-active-color;
+      background-color: $pagination-active-bg;
+      border-color: $pagination-active-bg;
+      cursor: default;
+    }
   }
 
   > .disabled {
@@ -53,6 +63,7 @@
     > a:focus {
       color: $pagination-disabled-color;
       background-color: $pagination-bg;
+      border-color: $pagination-border;
       cursor: not-allowed;
     }
   }

data/app/assets/stylesheets/twitter/bootstrap/_panels.scss

@@ -7,7 +7,7 @@
 .panel {
   margin-bottom: $line-height-computed;
   background-color: $panel-bg;
-  border: 1px solid $panel-border;
+  border: 1px solid transparent;
   border-radius: $panel-border-radius;
   @include box-shadow(0 1px 1px rgba(0,0,0,.05));
 }
@@ -15,15 +15,17 @@
 // Panel contents
 .panel-body {
   padding: 15px;
+  @include clearfix();
 }
 
+
 // List groups in panels
 //
 // By default, space out list group content from panel headings to account for
 // any kind of custom content between the two.
 
 .panel {
-  .list-group {
+  > .list-group {
     margin-bottom: 0;
 
     .list-group-item {
@@ -47,11 +49,26 @@
   }
 }
 
+
+// Tables in panels
+//
+// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and
+// watch it go full width.
+
+.panel {
+  > .table {
+    margin-bottom: 0;
+  }
+  > .panel-body + .table {
+    border-top: 1px solid $table-border-color;
+  }
+}
+
+
 // Optional heading
 .panel-heading {
   padding: 10px 15px;
-  background-color: $panel-heading-bg;
-  border-bottom: 1px solid $panel-border;
+  border-bottom: 1px solid transparent;
   @include border-top-radius($panel-border-radius - 1);
 }
 
@@ -59,7 +76,7 @@
 .panel-title {
   margin-top: 0;
   margin-bottom: 0;
-  font-size: ($font-size-base * 1.25);
+  font-size: ceil(($font-size-base * 1.125));
   > a {
     color: inherit;
   }
@@ -69,7 +86,7 @@
 .panel-footer {
   padding: 10px 15px;
   background-color: $panel-footer-bg;
-  border-top: 1px solid $panel-border;
+  border-top: 1px solid $panel-inner-border;
   @include border-bottom-radius($panel-border-radius - 1);
 }
 
@@ -93,13 +110,13 @@
   .panel-heading {
     border-bottom: 0;
     + .panel-collapse .panel-body {
-      border-top: 1px solid $panel-border;
+      border-top: 1px solid $panel-inner-border;
     }
   }
   .panel-footer {
     border-top: 0;
     + .panel-collapse .panel-body {
-      border-bottom: 1px solid $panel-border;
+      border-bottom: 1px solid $panel-inner-border;
     }
   }
 
@@ -111,6 +128,9 @@
 
 
 // Contextual variations
+.panel-default {
+  @include panel-variant($panel-default-border, $panel-default-text, $panel-default-heading-bg, $panel-default-border);
+}
 .panel-primary {
   @include panel-variant($panel-primary-border, $panel-primary-text, $panel-primary-heading-bg, $panel-primary-border);
 }

data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss

@@ -78,22 +78,18 @@
 // Variations
 // -------------------------
 
-// Danger (red)
-.progress-bar-danger {
-  @include progress-bar-variant($progress-bar-danger-bg);
-}
-
-// Success (green)
 .progress-bar-success {
   @include progress-bar-variant($progress-bar-success-bg);
 }
 
-// Warning (orange)
+.progress-bar-info {
+  @include progress-bar-variant($progress-bar-info-bg);
+}
+
 .progress-bar-warning {
   @include progress-bar-variant($progress-bar-warning-bg);
 }
 
-// Info (teal)
-.progress-bar-info {
-  @include progress-bar-variant($progress-bar-info-bg);
+.progress-bar-danger {
+  @include progress-bar-variant($progress-bar-danger-bg);
 }

data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss

@@ -35,91 +35,115 @@
 
 // Visibility utilities
 
-@include responsive-visibility('.visible-xs');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-invisibility('.visible-xs');
+@include responsive-invisibility('.visible-xs');
+@media (max-width: $screen-xs-max) {
+  @include responsive-visibility('.visible-xs');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-invisibility('.visible-xs');
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-visibility('.visible-xs.visible-sm');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-invisibility('.visible-xs');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-visibility('.visible-xs.visible-md');
 }
+@media (min-width: $screen-lg) {
+  @include responsive-visibility('.visible-xs.visible-lg');
+}
+
 @include responsive-invisibility('.visible-sm');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
+@media (max-width: $screen-xs-max) {
+  @include responsive-visibility('.visible-sm.visible-xs');
+}
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-sm');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-invisibility('.visible-sm');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-visibility('.visible-sm.visible-md');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-invisibility('.visible-sm');
+@media (min-width: $screen-lg) {
+  @include responsive-visibility('.visible-sm.visible-lg');
 }
 @include responsive-invisibility('.visible-md');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-invisibility('.visible-md');
+@media (max-width: $screen-xs-max) {
+  @include responsive-visibility('.visible-md.visible-xs');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-visibility('.visible-md.visible-sm');
+}
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-md');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-invisibility('.visible-md');
+@media (min-width: $screen-lg) {
+  @include responsive-visibility('.visible-md.visible-lg');
 }
 @include responsive-invisibility('.visible-lg');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-invisibility('.visible-lg');
+@media (max-width: $screen-xs-max) {
+  @include responsive-visibility('.visible-lg.visible-xs');
+}
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-visibility('.visible-lg.visible-sm');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-invisibility('.visible-lg');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-visibility('.visible-lg.visible-md');
 }
-@media (min-width: $screen-large-desktop) {
+@media (min-width: $screen-lg) {
   @include responsive-visibility('.visible-lg');
 }
 
-@include responsive-invisibility('.hidden-xs');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-visibility('.hidden-xs');
+@include responsive-visibility('.hidden-xs');
+@media (max-width: $screen-xs-max) {
+  @include responsive-invisibility('.hidden-xs');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-visibility('.hidden-xs');
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-invisibility('.hidden-xs.hidden-sm');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-visibility('.hidden-xs');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-invisibility('.hidden-xs.hidden-md');
+}
+@media (min-width: $screen-lg) {
+  @include responsive-invisibility('.hidden-xs.hidden-lg');
 }
 @include responsive-visibility('.hidden-sm');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
+@media (max-width: $screen-xs-max) {
+  @include responsive-invisibility('.hidden-sm.hidden-xs');
+}
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-invisibility('.hidden-sm');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-visibility('.hidden-sm');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-invisibility('.hidden-sm.hidden-md');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-visibility('.hidden-sm');
+@media (min-width: $screen-lg) {
+  @include responsive-invisibility('.hidden-sm.hidden-lg');
 }
 @include responsive-visibility('.hidden-md');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-visibility('.hidden-md');
+@media (max-width: $screen-xs-max) {
+  @include responsive-invisibility('.hidden-md.hidden-xs');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-invisibility('.hidden-md.hidden-sm');
+}
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-invisibility('.hidden-md');
 }
-@media (min-width: $screen-large-desktop) {
-  @include responsive-visibility('.hidden-md');
+@media (min-width: $screen-lg) {
+  @include responsive-invisibility('.hidden-md.hidden-lg');
 }
 @include responsive-visibility('.hidden-lg');
-@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  @include responsive-visibility('.hidden-lg');
+@media (max-width: $screen-xs-max) {
+  @include responsive-invisibility('.hidden-lg.hidden-xs');
+}
+@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
+  @include responsive-invisibility('.hidden-lg.hidden-sm');
 }
-@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
-  @include responsive-visibility('.hidden-lg');
+@media (min-width: $screen-md) and (max-width: $screen-md-max) {
+  @include responsive-invisibility('.hidden-lg.hidden-md');
 }
-@media (min-width: $screen-large-desktop) {
+@media (min-width: $screen-lg) {
   @include responsive-invisibility('.hidden-lg');
 }
 
 // Print utilities
 @include responsive-invisibility('.visible-print');
-.hidden-print  { }
 
 @media print {
   @include responsive-visibility('.visible-print');

data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss

@@ -4,7 +4,6 @@
 
 
 // Reset the box-sizing
-// -------------------------
 
 *,
 *:before,
@@ -14,7 +13,6 @@
 
 
 // Body reset
-// -------------------------
 
 html {
   font-size: 62.5%;
@@ -39,26 +37,37 @@ textarea {
   line-height: inherit;
 }
 
+// Reset unusual Firefox-on-Android default style.
+//
+// See https://github.com/necolas/normalize.css/issues/214
+
+button,
+input,
+select[multiple],
+textarea {
+  background-image: none;
+}
+
 
 // Links
-// -------------------------
 
 a {
   color: $link-color;
   text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: $link-hover-color;
-  text-decoration: underline;
-}
-a:focus {
-  @include tab-focus();
+
+  &:hover,
+  &:focus {
+    color: $link-hover-color;
+    text-decoration: underline;
+  }
+
+  &:focus {
+    @include tab-focus();
+  }
 }
 
 
 // Images
-// -------------------------
 
 img {
   vertical-align: middle;
@@ -66,9 +75,7 @@ img {
 
 // Responsive images (ensure images don't scale beyond their parents)
 .img-responsive {
-  display: inline-block;
-  max-width: 100%; // Part 1: Set a maximum relative to the parent
-  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+  @include img-responsive();
 }
 
 // Rounded corners
@@ -77,7 +84,19 @@ img {
 }
 
 // Image thumbnails
-// See thumbnails.less for `.img-thumbnail`
+//
+// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.
+.img-thumbnail {
+  padding: $thumbnail-padding;
+  line-height: $line-height-base;
+  background-color: $thumbnail-bg;
+  border: 1px solid $thumbnail-border;
+  border-radius: $thumbnail-border-radius;
+  @include transition(all .2s ease-in-out);
+
+  // Keep them at most 100% wide
+  @include img-responsive(inline-block);
+}
 
 // Perfect circle
 .img-circle {
@@ -86,7 +105,6 @@ img {
 
 
 // Horizontal rules
-// -------------------------
 
 hr {
   margin-top:    $line-height-computed;
@@ -95,9 +113,10 @@ hr {
   border-top: 1px solid $hr-border;
 }
 
+
 // Only display content to screen readers
+//
 // See: http://a11yproject.com/posts/how-to-hide-content/
-// -------------------------
 
 .sr-only {
   position: absolute;