bootstrap-sass-rails 3.0.0.0.rc2 → 3.0.0.0

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

@@ -12,6 +12,14 @@
   overflow: hidden;
 }
 
+
+// Account for hiding of scrollbar
+body.modal-open,
+.modal-open .navbar-fixed-top,
+.modal-open .navbar-fixed-bottom {
+  margin-right: 15px
+}
+
 // Container that the modal scrolls within
 .modal {
   display: none;

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

@@ -10,10 +10,10 @@
 
 .navbar {
   position: relative;
+  z-index: $zindex-navbar;
   min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
   margin-bottom: $navbar-margin-bottom;
-  background-color: $navbar-bg;
-  border: 1px solid $navbar-border;
+  border: 1px solid transparent;
 
   // Prevent floats from breaking the navbar
   @include clearfix();
@@ -30,8 +30,6 @@
 // styling of responsive aspects.
 
 .navbar-header {
-  padding-left:  $navbar-padding-horizontal;
-  padding-right: $navbar-padding-horizontal;
   @include clearfix();
 
   @media (min-width: $grid-float-breakpoint) {
@@ -51,25 +49,61 @@
 // 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;
+  padding-right: $navbar-padding-horizontal;
+  padding-left:  $navbar-padding-horizontal;
+  border-top: 1px solid transparent;
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
+  @include clearfix();
   -webkit-overflow-scrolling: touch;
 
+  &.in {
+    overflow-y: auto;
+  }
+
   @media (min-width: $grid-float-breakpoint) {
     width: auto;
-    padding-top: 0;
-    padding-bottom: 0;
     border-top: 0;
     box-shadow: none;
+
+    &.collapse {
+      display: block !important;
+      height: auto !important;
+      padding-bottom: 0; // Override default setting
+      overflow: visible !important;
+    }
+
+    &.in {
+      overflow-y: visible;
+    }
+
+    // Account for first and last children spacing
+    .navbar-nav.navbar-left:first-child {
+      margin-left: -$navbar-padding-horizontal;
+    }
+    .navbar-nav.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+    .navbar-text:last-child {
+      margin-right: 0;
+    }
+  }
+}
+
+
+// Both navbar header and collapse
+//
+// When a container is present, change the behavior of the header and collapse.
+
+.container > .navbar-header,
+.container > .navbar-collapse {
+  margin-right: -$navbar-padding-horizontal;
+  margin-left:  -$navbar-padding-horizontal;
+
+  @media (min-width: $grid-float-breakpoint) {
+    margin-right: 0;
+    margin-left:  0;
   }
 }
 
@@ -82,8 +116,8 @@
 
 // Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
+  border-width: 0 0 1px;
   @media (min-width: $grid-float-breakpoint) {
-    border-width: 0 0 1px;
     border-radius: 0;
   }
 }
@@ -94,7 +128,6 @@
   position: fixed;
   right: 0;
   left: 0;
-  z-index: $zindex-navbar-fixed;
   border-width: 0 0 1px;
 
   // Undo the rounded corners
@@ -103,6 +136,7 @@
   }
 }
 .navbar-fixed-top {
+  z-index: $zindex-navbar-fixed;
   top: 0;
 }
 .navbar-fixed-bottom {
@@ -115,17 +149,18 @@
 
 .navbar-brand {
   float: left;
-  margin-right: ($navbar-padding-horizontal / 2);
-  padding-top: $navbar-padding-vertical;
-  padding-bottom: $navbar-padding-vertical;
+  padding: $navbar-padding-vertical $navbar-padding-horizontal;
   font-size: $font-size-large;
   line-height: $line-height-computed;
-  color: $navbar-brand-color;
   &:hover,
   &:focus {
-    color: $navbar-brand-hover-color;
     text-decoration: none;
-    background-color: $navbar-brand-hover-bg;
+  }
+
+  @media (min-width: $grid-float-breakpoint) {
+    .navbar > .container & {
+      margin-left: -$navbar-padding-horizontal;
+    }
   }
 }
 
@@ -138,28 +173,27 @@
 .navbar-toggle {
   position: relative;
   float: right;
+  margin-right: $navbar-padding-horizontal;
   padding: 9px 10px;
   @include navbar-vertical-align(34px);
   background-color: transparent;
-  border: 1px solid $navbar-toggle-border-color;
+  border: 1px solid transparent;
   border-radius: $border-radius-base;
 
-  &:hover,
-  &:focus {
-    background-color: $navbar-toggle-hover-bg;
-  }
-
   // Bars
   .icon-bar {
     display: block;
     width: 22px;
     height: 2px;
-    background-color: $navbar-toggle-icon-bar-bg;
     border-radius: 1px;
   }
   .icon-bar + .icon-bar {
     margin-top: 4px;
   }
+
+  @media (min-width: $grid-float-breakpoint) {
+    display: none;
+  }
 }
 
 
@@ -169,44 +203,16 @@
 // 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;
-  }
+  margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
 
   > 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
+  @media (max-width: $screen-xs-max) {
+    // Dropdowns get custom display when collapsed
     .open .dropdown-menu {
       position: static;
       float: none;
@@ -220,30 +226,25 @@
         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;
-        }
+    }
+  }
+
+  // Uncollapse the nav
+  @media (min-width: $grid-float-breakpoint) {
+    float: left;
+    margin: 0;
+
+    > li {
+      float: left;
+      > a {
+        padding-top: (($navbar-height - $line-height-computed) / 2);
+        padding-bottom: (($navbar-height - $line-height-computed) / 2);
       }
     }
   }
@@ -258,8 +259,8 @@
 // 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-left  { float: left !important; }
+  .navbar-right { float: right !important; }
 }
 
 
@@ -272,14 +273,16 @@
   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%);
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+  @include box-shadow($shadow);
 
   // Mixin behavior for optimum display
   @extend .form-inline;
 
   .form-group {
-    @media (max-width: $screen-phone-max) {
+    @media (max-width: $screen-xs-max) {
       margin-bottom: 5px;
     }
   }
@@ -295,6 +298,7 @@
     margin-right: 0;
     padding-top: 0;
     padding-bottom: 0;
+    @include box-shadow(none);
   }
 }
 
@@ -311,45 +315,176 @@
   @include border-bottom-radius(0);
 }
 
-// Dropdown menu items and carets
-.navbar-nav {
-  // Caret should match text color on hover
-  > .dropdown > a:hover .caret,
-  > .dropdown > a:focus .caret {
-    border-top-color: $navbar-link-hover-color;
-    border-bottom-color: $navbar-link-hover-color;
+// Right aligned menus need alt position
+.navbar-nav.pull-right > li > .dropdown-menu,
+.navbar-nav > li > .dropdown-menu.pull-right {
+  left: auto;
+  right: 0;
+}
+
+
+// Buttons in navbars
+//
+// Vertically center a button within a navbar (when *not* in a form).
+
+.navbar-btn {
+  @include navbar-vertical-align($input-height-base);
+}
+
+
+// Text in navbars
+//
+// 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);
+
+  @media (min-width: $grid-float-breakpoint) {
+    margin-left: $navbar-padding-horizontal;
+    margin-right: $navbar-padding-horizontal;
   }
+}
+
+// Alternate navbars
+// --------------------------------------------------
 
-  // Remove background color from open dropdown
-  > .open > a {
-    &,
+// Default navbar
+.navbar-default {
+  background-color: $navbar-default-bg;
+  border-color: $navbar-default-border;
+
+  .navbar-brand {
+    color: $navbar-default-brand-color;
     &:hover,
     &:focus {
-      background-color: $navbar-link-active-bg;
-      color: $navbar-link-active-color;
-      .caret {
-        border-top-color: $navbar-link-active-color;
-        border-bottom-color: $navbar-link-active-color;
+      color: $navbar-default-brand-hover-color;
+      background-color: $navbar-default-brand-hover-bg;
+    }
+  }
+
+  .navbar-text {
+    color: $navbar-default-color;
+  }
+
+  .navbar-nav {
+    > li > a {
+      color: $navbar-default-link-color;
+
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-hover-color;
+        background-color: $navbar-default-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-active-color;
+        background-color: $navbar-default-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-disabled-color;
+        background-color: $navbar-default-link-disabled-bg;
       }
     }
   }
-  > .dropdown > a .caret {
-    border-top-color: $navbar-link-color;
-    border-bottom-color: $navbar-link-color;
+
+  .navbar-toggle {
+    border-color: $navbar-default-toggle-border-color;
+    &:hover,
+    &:focus {
+      background-color: $navbar-default-toggle-hover-bg;
+    }
+    .icon-bar {
+      background-color: $navbar-default-toggle-icon-bar-bg;
+    }
   }
-}
 
-// Right aligned menus need alt position
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
+  .navbar-collapse,
+  .navbar-form {
+    border-color: darken($navbar-default-bg, 7%);
+  }
+
+  // Dropdown menu items and carets
+  .navbar-nav {
+    // Caret should match text color on hover
+    > .dropdown > a:hover .caret,
+    > .dropdown > a:focus .caret {
+      border-top-color: $navbar-default-link-hover-color;
+      border-bottom-color: $navbar-default-link-hover-color;
+    }
 
+    // Remove background color from open dropdown
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navbar-default-link-active-bg;
+        color: $navbar-default-link-active-color;
+        .caret {
+          border-top-color: $navbar-default-link-active-color;
+          border-bottom-color: $navbar-default-link-active-color;
+        }
+      }
+    }
+    > .dropdown > a .caret {
+      border-top-color: $navbar-default-link-color;
+      border-bottom-color: $navbar-default-link-color;
+    }
 
 
+    @media (max-width: $screen-xs-max) {
+      // Dropdowns get custom display when collapsed
+      .open .dropdown-menu {
+        > li > a {
+          color: $navbar-default-link-color;
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-hover-color;
+            background-color: $navbar-default-link-hover-bg;
+          }
+        }
+        > .active > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-active-color;
+            background-color: $navbar-default-link-active-bg;
+          }
+        }
+        > .disabled > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-disabled-color;
+            background-color: $navbar-default-link-disabled-bg;
+          }
+        }
+      }
+    }
+  }
+
+
+  // Links in navbars
+  //
+  // Add a class to ensure links outside the navbar nav are colored correctly.
+
+  .navbar-link {
+    color: $navbar-default-link-color;
+    &:hover {
+      color: $navbar-default-link-hover-color;
+    }
+  }
+
+}
+
 // Inverse navbar
-// --------------------------------------------------
 
 .navbar-inverse {
   background-color: $navbar-inverse-bg;
@@ -408,8 +543,9 @@
     }
   }
 
-  .navbar-collapse {
-    border-top-color: darken($navbar-inverse-bg, 7%);
+  .navbar-collapse,
+  .navbar-form {
+    border-color: darken($navbar-inverse-bg, 7%);
   }
 
   // Dropdowns
@@ -441,7 +577,7 @@
       }
     }
 
-    @media (max-width: $screen-phone-max) {
+    @media (max-width: $screen-xs-max) {
       // Dropdowns get custom display
       .open .dropdown-menu {
         > .dropdown-header {
@@ -475,85 +611,11 @@
     }
   }
 
-}
-
-
-
-// Responsive navbar
-// --------------------------------------------------
-
-@media screen and (min-width: $grid-float-breakpoint) {
-
-  .navbar-nav {
-    float: left;
-    // undo margin to make nav extend full height of navbar
-    margin-top: 0;
-    margin-bottom: 0;
-
-    > li {
-      float: left;
-      > a {
-        padding-top: (($navbar-height - $line-height-computed) / 2);
-        padding-bottom: (($navbar-height - $line-height-computed) / 2);
-      }
+  .navbar-link {
+    color: $navbar-inverse-link-color;
+    &:hover {
+      color: $navbar-inverse-link-hover-color;
     }
   }
 
-  // Required to make the collapsing navbar work on regular desktops
-  .navbar-toggle {
-    position: relative;
-    top: auto;
-    left: auto;
-    display: none;
-  }
-  .navbar-collapse.collapse {
-    display: block !important;
-    height: auto !important;
-    padding-bottom: 0; // Override default setting
-    overflow: visible !important;
-  }
-
-}
-
-
-
-// Buttons in navbars
-//
-// Vertically center a button within a navbar (when *not* in a form).
-
-.navbar-btn {
-  margin-top: (($navbar-height - $input-height-base) / 2);
-}
-
-
-
-// Text in navbars
-//
-// 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);
-}
-
-
-
-// Links in navbars
-//
-// Add a class to ensure links outside the navbar nav are colored correctly.
-
-// Default navbar variables
-.navbar-link {
-  color: $navbar-link-color;
-  &:hover {
-    color: $navbar-link-hover-color;
-  }
-}
-
-// Use the inverse navbar variables
-.navbar-inverse .navbar-link {
-  color: $navbar-inverse-link-color;
-  &:hover {
-    color: $navbar-inverse-link-hover-color;
-  }
 }