anjlab-bootstrap-rails 3.0.0.rc2 → 3.0.0.0

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

@@ -8,7 +8,7 @@
   @include container-fixed();
 }
 
-// Mobile-first defaults
+// mobile first defaults
 .row {
   @include make-row();
 }
@@ -223,6 +223,7 @@
   .col-md-12 { width: 100%; }
 
   // Push and pull columns for source order changes
+  .col-md-push-0  { left: auto; }
   .col-md-push-1  { left: percentage((1 / $grid-columns)); }
   .col-md-push-2  { left: percentage((2 / $grid-columns)); }
   .col-md-push-3  { left: percentage((3 / $grid-columns)); }
@@ -235,6 +236,7 @@
   .col-md-push-10 { left: percentage((10/ $grid-columns)); }
   .col-md-push-11 { left: percentage((11/ $grid-columns)); }
 
+  .col-md-pull-0  { right: auto; }
   .col-md-pull-1  { right: percentage((1 / $grid-columns)); }
   .col-md-pull-2  { right: percentage((2 / $grid-columns)); }
   .col-md-pull-3  { right: percentage((3 / $grid-columns)); }
@@ -248,6 +250,7 @@
   .col-md-pull-11 { right: percentage((11/ $grid-columns)); }
 
   // Offsets
+  .col-md-offset-0  { margin-left: 0; }
   .col-md-offset-1  { margin-left: percentage((1 / $grid-columns)); }
   .col-md-offset-2  { margin-left: percentage((2 / $grid-columns)); }
   .col-md-offset-3  { margin-left: percentage((3 / $grid-columns)); }
@@ -269,9 +272,9 @@
 // Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
 // it's full-width.
 
-@media (min-width: $screen-large-desktop) {
+@media (min-width: $screen-lg-desktop) {
   .container {
-    max-width: $container-large-desktop;
+    max-width: $container-lg-desktop;
   }
 
   .col-lg-1,
@@ -301,6 +304,7 @@
   .col-lg-12 { width: 100%; }
 
   // Push and pull columns for source order changes
+  .col-lg-push-0  { left: auto; }
   .col-lg-push-1  { left: percentage((1 / $grid-columns)); }
   .col-lg-push-2  { left: percentage((2 / $grid-columns)); }
   .col-lg-push-3  { left: percentage((3 / $grid-columns)); }
@@ -313,6 +317,7 @@
   .col-lg-push-10 { left: percentage((10/ $grid-columns)); }
   .col-lg-push-11 { left: percentage((11/ $grid-columns)); }
 
+  .col-lg-pull-0  { right: auto; }
   .col-lg-pull-1  { right: percentage((1 / $grid-columns)); }
   .col-lg-pull-2  { right: percentage((2 / $grid-columns)); }
   .col-lg-pull-3  { right: percentage((3 / $grid-columns)); }
@@ -326,6 +331,7 @@
   .col-lg-pull-11 { right: percentage((11/ $grid-columns)); }
 
   // Offsets
+  .col-lg-offset-0  { margin-left: 0; }
   .col-lg-offset-1  { margin-left: percentage((1 / $grid-columns)); }
   .col-lg-offset-2  { margin-left: percentage((2 / $grid-columns)); }
   .col-lg-offset-3  { margin-left: percentage((3 / $grid-columns)); }
@@ -337,4 +343,4 @@
   .col-lg-offset-9  { margin-left: percentage((9 / $grid-columns)); }
   .col-lg-offset-10 { margin-left: percentage((10/ $grid-columns)); }
   .col-lg-offset-11 { margin-left: percentage((11/ $grid-columns)); }
-}
+}

data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss

@@ -32,7 +32,7 @@
 .input-group-lg > .input-group-btn > .btn { @extend .input-lg; }
 .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn { @extend .input-sm; }
+.input-group-sm > .input-group-btn > .btn { @extend .input-sm; }
 
 
 // Display as table-cell

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

@@ -4,13 +4,14 @@
 
 
 .jumbotron {
-  padding: 30px;
-  margin-bottom: 30px;
+  padding: $jumbotron-padding;
+  margin-bottom: $jumbotron-padding;
   font-size: ($font-size-base * 1.5);
   font-weight: 200;
   line-height: ($line-height-base * 1.5);
-  color: $jumbotron-lead-color;
+  color: $jumbotron-color;
   background-color: $jumbotron-bg;
+
   h1 {
     line-height: 1;
     color: $jumbotron-heading-color;
@@ -19,9 +20,19 @@
     line-height: 1.4;
   }
 
+  .container & {
+    border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
+  }
+
   @media screen and (min-width: $screen-tablet) {
-    padding: 50px 60px;
-    border-radius: $border-radius-large; // Only round corners at higher resolutions
+    padding-top:    ($jumbotron-padding * 1.6);
+    padding-bottom: ($jumbotron-padding * 1.6);
+
+    .container & {
+      padding-left:  ($jumbotron-padding * 2);
+      padding-right: ($jumbotron-padding * 2);
+    }
+
     h1 {
       font-size: ($font-size-base * 4.5);
     }

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

@@ -4,7 +4,7 @@
 
 .label {
   display: inline;
-  padding: .25em .6em;
+  padding: .2em .6em .3em;
   font-size: 75%;
   font-weight: bold;
   line-height: 1;
@@ -37,18 +37,22 @@
   @include label-variant($label-default-bg);
 }
 
-.label-danger {
-  @include label-variant($label-danger-bg);
+.label-primary {
+  @include label-variant($label-primary-bg);
 }
 
 .label-success {
   @include label-variant($label-success-bg);
 }
 
+.label-info {
+  @include label-variant($label-info-bg);
+}
+
 .label-warning {
   @include label-variant($label-warning-bg);
 }
 
-.label-info {
-  @include label-variant($label-info-bg);
+.label-danger {
+  @include label-variant($label-danger-bg);
 }

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

@@ -284,7 +284,7 @@
 
 // Reset filters for IE
 //
-// When you need to remove a gradient background, don't forget to use this to reset
+// When you need to remove a gradient background, do not forget to use this to reset
 // the IE filter for IE9 and below.
 @mixin reset-filter() {
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
@@ -292,12 +292,12 @@
 
 
 
-// RETINA IMAGE SUPPORT
-// --------------------------------------------------
-
+// Retina images
+//
 // Short retina mixin for setting background-image and -size
+
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: url("#{$file-1x}");
+  background-image: url($file-1x);
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -312,6 +312,17 @@
 }
 
 
+// Responsive image
+//
+// Keep images from scaling beyond the width of their parents.
+
+@mixin img-responsive($display: block) {
+  display: $display;
+  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
+}
+
+
 // COMPONENT MIXINS
 // --------------------------------------------------
 
@@ -329,7 +340,7 @@
 // -------------------------
 @mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
   border-color: $border;
-  .panel-heading {
+  & > .panel-heading {
     color: $heading-text-color;
     background-color: $heading-bg-color;
     border-color: $heading-border;
@@ -337,7 +348,7 @@
       border-top-color: $border;
     }
   }
-  .panel-footer {
+  & > .panel-footer {
     + .panel-collapse .panel-body {
       border-bottom-color: $border;
     }
@@ -358,27 +369,63 @@
   }
 }
 
+// Tables
+// -------------------------
+@mixin table-row-variant($state, $background, $border) {
+  // Exact selectors below required to override `.table-striped` and prevent
+  // inheritance to nested tables.
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.#{state},
+    > th.#{state},
+    &.#{state} > td,
+    &.#{state} > th {
+      background-color: $background;
+      border-color: $border;
+    }
+  }
+
+  // Hover states for `.table-hover`
+  // Note: this is not available for cells or rows within `thead` or `tfoot`.
+  .table-hover > tbody > tr {
+    > td.#{state}:hover,
+    > th.#{state}:hover,
+    &.#{state}:hover > td {
+      background-color: darken($background, 5%);
+      border-color: darken($border, 5%);
+    }
+  }
+}
+
 // Button variants
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
 // and disabled options for all buttons
-@mixin button-variant($color, $background, $border) {
-  color: $color;
-  background-color: $background;
-  border-color: $border;
+@mixin button-variant($selector, $color, $background, $border) {
+  #{$selector} {
+    color: $color;
+    background-color: $background;
+    border-color: $border;
+  }
 
-  &:hover,
-  &:focus,
-  &:active,
-  &.active {
+  #{$selector}:hover,
+  #{$selector}:focus,
+  #{$selector}:active,
+  #{$selector}.active,
+  .open .dropdown-toggle#{$selector} {
     color: $color;
     background-color: darken($background, 8%);
         border-color: darken($border, 12%);
   }
-
-  &.disabled,
-  &[disabled],
-  fieldset[disabled] & {
+  #{$selector}:active,
+  #{$selector}.active,
+  .open .dropdown-toggle#{$selector} {
+    background-image: none;
+  }
+  #{$selector}.disabled,
+  #{$selector}[disabled],
+  fieldset[disabled] #{$selector} {
     &,
     &:hover,
     &:focus,
@@ -482,43 +529,28 @@
 @mixin container-fixed() {
   margin-right: auto;
   margin-left: auto;
+  padding-left:  ($grid-gutter-width / 2);
+  padding-right: ($grid-gutter-width / 2);
   @include clearfix();
 }
 
 // Creates a wrapper for a series of columns
 @mixin make-row($gutter: $grid-gutter-width) {
-  // Then clear the floated columns
+  margin-left:  ($gutter / -2);
+  margin-right: ($gutter / -2);
   @include clearfix();
-
-  .container & {
-    @media (min-width: $screen-small) {
-      margin-left:  ($gutter / -2);
-      margin-right: ($gutter / -2);
-    }
-  }
-
-  // Negative margin nested rows out to align the content of columns
-  .row {
-    margin-left:  ($gutter / -2);
-    margin-right: ($gutter / -2);
-  }
 }
 
 // Generate the extra small columns
 @mixin make-xs-column($columns, $gutter: $grid-gutter-width) {
   position: relative;
   float: left;
+  width: percentage(($columns / $grid-columns));
   // Prevent columns from collapsing when empty
   min-height: 1px;
   // Inner gutter via padding
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  $max-width: ($screen-small - 1);
-
-  // Calculate width based on number of columns available
-  @media (max-width: $max-width) {
-    width: percentage(($columns / $grid-columns));
-  }
 }
 
 // Generate the small columns
@@ -531,7 +563,7 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-small) {
+  @media (min-width: $screen-sm) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
@@ -539,17 +571,17 @@
 
 // Generate the small column offsets
 @mixin make-sm-column-offset($columns) {
-  @media (min-width: $screen-small) {
+  @media (min-width: $screen-sm) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-sm-column-push($columns) {
-  @media (min-width: $screen-small) {
+  @media (min-width: $screen-sm) {
     left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-sm-column-pull($columns) {
-  @media (min-width: $screen-small) {
+  @media (min-width: $screen-sm) {
     right: percentage(($columns / $grid-columns));
   }
 }
@@ -564,7 +596,7 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-medium) {
+  @media (min-width: $screen-md) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
@@ -572,17 +604,17 @@
 
 // Generate the large column offsets
 @mixin make-md-column-offset($columns) {
-  @media (min-width: $screen-medium) {
+  @media (min-width: $screen-md) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-md-column-push($columns) {
-  @media (min-width: $screen-medium) {
+  @media (min-width: $screen-md) {
     left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-md-column-pull($columns) {
-  @media (min-width: $screen-medium) {
+  @media (min-width: $screen-md) {
     right: percentage(($columns / $grid-columns));
   }
 }
@@ -597,7 +629,7 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-large) {
+  @media (min-width: $screen-lg) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
@@ -605,17 +637,17 @@
 
 // Generate the large column offsets
 @mixin make-lg-column-offset($columns) {
-  @media (min-width: $screen-large) {
+  @media (min-width: $screen-lg) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-lg-column-push($columns) {
-  @media (min-width: $screen-large) {
+  @media (min-width: $screen-lg) {
     left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-lg-column-pull($columns) {
-  @media (min-width: $screen-large) {
+  @media (min-width: $screen-lg) {
     right: percentage(($columns / $grid-columns));
   }
 }

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

@@ -12,6 +12,13 @@
   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,15 +259,8 @@
 // though so that navbar contents properly stack and align in mobile.
 
 @media (min-width: $grid-float-breakpoint) {
-  .navbar-left  { @include pull-left; }
-  .navbar-right {
-    @include pull-right;
-    .dropdown-menu {
-      left: auto;
-      right: 0;
-      //INLINED .pull-right > .dropdown-menu();
-    }
-  }
+  .navbar-left  { @include pull-left(); }
+  .navbar-right { @include pull-right(); }
 }
 
 
@@ -279,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
   @include form-inline();
 
   .form-group {
-    @media (max-width: $screen-phone-max) {
+    @media (max-width: $screen-xs-max) {
       margin-bottom: 5px;
     }
   }
@@ -302,6 +298,7 @@
     margin-right: 0;
     padding-top: 0;
     padding-bottom: 0;
+    @include box-shadow(none);
   }
 }
 
@@ -318,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;
@@ -415,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
@@ -448,7 +577,7 @@
       }
     }
 
-    @media (max-width: $screen-phone-max) {
+    @media (max-width: $screen-xs-max) {
       // Dropdowns get custom display
       .open .dropdown-menu {
         > .dropdown-header {
@@ -482,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;
-  }
-}
+}