bootstrap-sass-rails 3.0.0.0.rc1 → 3.0.0.0.rc2

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

@@ -29,15 +29,13 @@
     @include translate(0, -25%);
     @include transition-transform(0.3s ease-out);
   }
-  &.fade.in  .modal-dialog { @include translate(0, 0); }
+  &.in .modal-dialog { @include translate(0, 0)}
 }
 
 // Shell div to position the modal with bottom padding
 .modal-dialog {
-  position: relative;
-  top: 0;
-  left: 0;
-  right: 0;
+  margin-left: auto;
+  margin-right: auto;
   width: auto;
   padding: 10px;
   z-index: ($zindex-modal-background + 10);
@@ -51,7 +49,7 @@
   border: 1px solid $modal-content-border-color;
   border-radius: $border-radius-large;
   @include box-shadow(0 3px 9px rgba(0,0,0,.5));
-  @include background-clip(padding-box);
+  background-clip: padding-box;
   // Remove focus outline from opened modal
   outline: none;
 }
@@ -67,7 +65,7 @@
   background-color: $modal-backdrop-bg;
   // Fade for backdrop
   &.fade { @include opacity(0); }
-  &.fade.in { @include opacity(.5); }
+  &.in { @include opacity(.5); }
 }
 
 // Modal header
@@ -124,8 +122,7 @@
   .modal-dialog {
     left: 50%;
     right: auto;
-    width: 560px;
-    margin-left: -280px;
+    width: 600px;
     padding-top: 30px;
     padding-bottom: 30px;
   }

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

@@ -2,73 +2,90 @@
 // Navbars
 // --------------------------------------------------
 
+
 // Wrapper and base class
+//
+// Provide a static navbar from which we expand to create full-width, fixed, and
+// other navbar variations.
+
 .navbar {
   position: relative;
   min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
-  margin-bottom: 20px;
-  padding-left: $navbar-padding-horizontal;
-  padding-right: $navbar-padding-horizontal;
+  margin-bottom: $navbar-margin-bottom;
   background-color: $navbar-bg;
-  border-radius: $border-radius-base;
+  border: 1px solid $navbar-border;
 
   // Prevent floats from breaking the navbar
   @include clearfix();
+
+  @media (min-width: $grid-float-breakpoint) {
+    border-radius: $navbar-border-radius;
+  }
 }
 
-// Navbar nav links
-// -------------------------
 
-.navbar-nav {
-  // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
-  margin-top: 10px;
-  margin-bottom: 15px;
+// Navbar heading
+//
+// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy
+// styling of responsive aspects.
 
-  > li > a {
-    padding-top: (($navbar-height - $line-height-computed) / 2);
-    padding-bottom: (($navbar-height - $line-height-computed) / 2);
-    color: $navbar-link-color;
-    line-height: 20px;
-    border-radius: $border-radius-base;
-    &:hover,
-    &:focus {
-      color: $navbar-link-hover-color;
-      background-color: $navbar-link-hover-bg;
-    }
-  }
-  > .active > a {
-    &,
-    &:hover,
-    &:focus {
-      color: $navbar-link-active-color;
-      background-color: $navbar-link-active-bg;
-    }
-  }
-  > .disabled > a {
-    &,
-    &:hover,
-    &:focus {
-      color: $navbar-link-disabled-color;
-      background-color: $navbar-link-disabled-bg;
-    }
-  }
+.navbar-header {
+  padding-left:  $navbar-padding-horizontal;
+  padding-right: $navbar-padding-horizontal;
+  @include clearfix();
 
-  // Right aligned contents
-  // Make them full width first so that they align properly on mobile
-  &.pull-right {
-    width: 100%;
+  @media (min-width: $grid-float-breakpoint) {
+    float: left;
   }
 }
 
 
+// Navbar collapse (body)
+//
+// Group your navbar content into this for easy collapsing and expanding across
+// various device sizes. By default, this content is collapsed when <768px, but
+// will expand past that for a horizontal display.
+//
+// To start (on mobile devices) the navbar links, forms, and buttons are stacked
+// vertically and include a `max-height` to overflow in case you have too much
+// content for the user's viewport.
+
+.navbar-collapse {
+  padding: 5px $navbar-padding-horizontal;
+  border-top: 1px solid darken($navbar-bg, 7%);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
+  // Clear floated elements and prevent collapsing of padding
+  @include clearfix();
+
+  // This is not automatically added to the `.navbar-fixed-top` because it causes
+  // z-index bugs in iOS7 (possibly earlier).
+  max-height: 340px;
+  overflow-x: visible;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+
+  @media (min-width: $grid-float-breakpoint) {
+    width: auto;
+    padding-top: 0;
+    padding-bottom: 0;
+    border-top: 0;
+    box-shadow: none;
+  }
+}
+
 
 //
 // Navbar alignment options
-// --------------------------------------------------
+//
+// Display the navbar across the entirity of the page or fixed it to the top or
+// bottom of the page.
 
-// Static navbar
+// Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
-  border-radius: 0;
+  @media (min-width: $grid-float-breakpoint) {
+    border-width: 0 0 1px;
+    border-radius: 0;
+  }
 }
 
 // Fix the top/bottom navbars when screen real estate supports it
@@ -78,7 +95,12 @@
   right: 0;
   left: 0;
   z-index: $zindex-navbar-fixed;
-  border-radius: 0;
+  border-width: 0 0 1px;
+
+  // Undo the rounded corners
+  @media (min-width: $grid-float-breakpoint) {
+    border-radius: 0;
+  }
 }
 .navbar-fixed-top {
   top: 0;
@@ -89,23 +111,16 @@
 }
 
 
-
-//
-// Navbar optional components
-// --------------------------------------------------
-
 // Brand/project name
+
 .navbar-brand {
-  display: block;
-  max-width: 200px;
-  margin-left: auto;
-  margin-right: auto;
-  padding: $navbar-padding-vertical $navbar-padding-horizontal;
+  float: left;
+  margin-right: ($navbar-padding-horizontal / 2);
+  padding-top: $navbar-padding-vertical;
+  padding-bottom: $navbar-padding-vertical;
   font-size: $font-size-large;
-  font-weight: 500;
   line-height: $line-height-computed;
   color: $navbar-brand-color;
-  text-align: center;
   &:hover,
   &:focus {
     color: $navbar-brand-hover-color;
@@ -114,14 +129,17 @@
   }
 }
 
-// Collapsible navbar toggle
+
+// Navbar toggle
+//
+// Custom button for toggling the `.navbar-collapse`, powered by the collapse
+// JavaScript plugin.
+
 .navbar-toggle {
-  position: absolute;
-  top: floor(($navbar-height - 32) / 2);
-  right: 10px;
-  width: 48px;
-  height: 32px;
-  padding: 8px 12px;
+  position: relative;
+  float: right;
+  padding: 9px 10px;
+  @include navbar-vertical-align(34px);
   background-color: transparent;
   border: 1px solid $navbar-toggle-border-color;
   border-radius: $border-radius-base;
@@ -144,24 +162,153 @@
   }
 }
 
+
+// Navbar nav links
+//
+// Builds on top of the `.nav` components with it's own modifier class to make
+// the nav the full height of the horizontal nav (above 768px).
+
+.navbar-nav {
+  margin-left: -$navbar-padding-horizontal;
+  margin-right: -$navbar-padding-horizontal;
+
+  @media (min-width: $grid-float-breakpoint) {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  > li > a {
+    padding-top:    10px;
+    padding-bottom: 10px;
+    color: $navbar-link-color;
+    line-height: $line-height-computed;
+    &:hover,
+    &:focus {
+      color: $navbar-link-hover-color;
+      background-color: $navbar-link-hover-bg;
+    }
+  }
+  > .active > a {
+    &,
+    &:hover,
+    &:focus {
+      color: $navbar-link-active-color;
+      background-color: $navbar-link-active-bg;
+    }
+  }
+  > .disabled > a {
+    &,
+    &:hover,
+    &:focus {
+      color: $navbar-link-disabled-color;
+      background-color: $navbar-link-disabled-bg;
+    }
+  }
+
+  @media (max-width: $screen-phone-max) {
+    // Dropdowns get custom display
+    .open .dropdown-menu {
+      position: static;
+      float: none;
+      width: auto;
+      margin-top: 0;
+      background-color: transparent;
+      border: 0;
+      box-shadow: none;
+      > li > a,
+      .dropdown-header {
+        padding: 5px 15px 5px 25px;
+      }
+      > li > a {
+        color: $navbar-link-color;
+        line-height: $line-height-computed;
+        &:hover,
+        &:focus {
+          color: $navbar-link-hover-color;
+          background-color: $navbar-link-hover-bg;
+          background-image: none;
+        }
+      }
+      > .active > a {
+        &,
+        &:hover,
+        &:focus {
+          color: $navbar-link-active-color;
+          background-color: $navbar-link-active-bg;
+        }
+      }
+      > .disabled > a {
+        &,
+        &:hover,
+        &:focus {
+          color: $navbar-link-disabled-color;
+          background-color: $navbar-link-disabled-bg;
+        }
+      }
+    }
+  }
+
+}
+
+
+// Component alignment
+//
+// Repurpose the pull utilities as their own navbar utilities to avoid specifity
+// issues with parents and chaining. Only do this when the navbar is uncollapsed
+// though so that navbar contents properly stack and align in mobile.
+
+@media (min-width: $grid-float-breakpoint) {
+  .navbar-left  { @extend .pull-left; }
+  .navbar-right { @extend .pull-right; }
+}
+
+
 // Navbar form
+//
+// Extension of the `.form-inline` with some extra flavor for optimum display in
+// our navbars.
+
 .navbar-form {
+  margin-left: -$navbar-padding-horizontal;
+  margin-right: -$navbar-padding-horizontal;
+  padding: 10px $navbar-padding-horizontal;
+  border-top: 1px solid darken($navbar-bg, 7%);
+  border-bottom: 1px solid darken($navbar-bg, 7%);
+
+  // Mixin behavior for optimum display
   @extend .form-inline;
-  @include navbar-vertical-align($input-height-base); // Vertically center in navbar
+
+  .form-group {
+    @media (max-width: $screen-phone-max) {
+      margin-bottom: 5px;
+    }
+  }
+
+  // Vertically center in expanded, horizontal navbar
+  @include navbar-vertical-align($input-height-base);
+
+  // Undo 100% width for pull classes
+  @media (min-width: $grid-float-breakpoint) {
+    width: auto;
+    border: 0;
+    margin-left: 0;
+    margin-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
 }
 
+
 // Dropdown menus
 
 // Menu position and menu carets
 .navbar-nav > li > .dropdown-menu {
   margin-top: 0;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  @include border-top-radius(0);
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
+  @include border-bottom-radius(0);
 }
 
 // Dropdown menu items and carets
@@ -206,6 +353,7 @@
 
 .navbar-inverse {
   background-color: $navbar-inverse-bg;
+  border-color: $navbar-inverse-border;
 
   .navbar-brand {
     color: $navbar-inverse-brand-color;
@@ -260,6 +408,10 @@
     }
   }
 
+  .navbar-collapse {
+    border-top-color: darken($navbar-inverse-bg, 7%);
+  }
+
   // Dropdowns
   .navbar-nav {
     > .open > a {
@@ -288,7 +440,41 @@
         }
       }
     }
+
+    @media (max-width: $screen-phone-max) {
+      // Dropdowns get custom display
+      .open .dropdown-menu {
+        > .dropdown-header {
+          border-color: $navbar-inverse-border;
+        }
+        > li > a {
+          color: $navbar-inverse-link-color;
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-hover-color;
+            background-color: $navbar-inverse-link-hover-bg;
+          }
+        }
+        > .active > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-active-color;
+            background-color: $navbar-inverse-link-active-bg;
+          }
+        }
+        > .disabled > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-disabled-color;
+            background-color: $navbar-inverse-link-disabled-bg;
+          }
+        }
+      }
+    }
   }
+
 }
 
 
@@ -298,11 +484,6 @@
 
 @media screen and (min-width: $grid-float-breakpoint) {
 
-  .navbar-brand {
-    float: left;
-    margin-left: -($navbar-padding-horizontal);
-    margin-right: 5px;
-  }
   .navbar-nav {
     float: left;
     // undo margin to make nav extend full height of navbar
@@ -312,14 +493,10 @@
     > li {
       float: left;
       > a {
-        border-radius: 0;
+        padding-top: (($navbar-height - $line-height-computed) / 2);
+        padding-bottom: (($navbar-height - $line-height-computed) / 2);
       }
     }
-
-    &.pull-right {
-      float: right;
-      width: auto;
-    }
   }
 
   // Required to make the collapsing navbar work on regular desktops
@@ -329,9 +506,10 @@
     left: auto;
     display: none;
   }
-  .nav-collapse.collapse {
+  .navbar-collapse.collapse {
     display: block !important;
     height: auto !important;
+    padding-bottom: 0; // Override default setting
     overflow: visible !important;
   }
 
@@ -354,6 +532,7 @@
 // Add a class to make any element properly align itself vertically within the navbars.
 
 .navbar-text {
+  float: left;
   @include navbar-vertical-align($line-height-computed);
 }