bootstrap-sass-rails 2.3.2.1 → 3.0.0.0.rc1

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

@@ -1,84 +1,106 @@
-/* Partial: twitter/bootstrap/_modals.scss */
 //
 // Modals
 // --------------------------------------------------
 
+// .modal-open      - body class for killing the scroll
+// .modal           - container to scroll within
+// .modal-dialog    - positioning shell for the actual modal
+// .modal-content   - actual modal w/ bg and corners and shit
 
-// Background
-.modal-backdrop {
+// Kill the scroll on the body
+.modal-open {
+  overflow: hidden;
+}
+
+// Container that the modal scrolls within
+.modal {
+  display: none;
+  overflow: auto;
+  overflow-y: scroll;
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: $zindexModalBackdrop;
-  background-color: $black;
-  // Fade for backdrop
-  &.fade { opacity: 0; }
+  z-index: $zindex-modal-background;
+
+  // When fading in the modal, animate it to slide down
+  &.fade .modal-dialog {
+    @include translate(0, -25%);
+    @include transition-transform(0.3s ease-out);
+  }
+  &.fade.in  .modal-dialog { @include translate(0, 0); }
 }
 
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  @include opacity(80);
+// Shell div to position the modal with bottom padding
+.modal-dialog {
+  position: relative;
+  top: 0;
+  left: 0;
+  right: 0;
+  width: auto;
+  padding: 10px;
+  z-index: ($zindex-modal-background + 10);
 }
 
-// Base modal
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: $zindexModal;
-  width: 560px;
-  margin-left: -280px;
-  background-color: $white;
-  border: 1px solid #999;
-  border: 1px solid rgba(0,0,0,.3);
-  *border: 1px solid #999; /* IE6-7 */
-  @include border-radius(6px);
-  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
+// Actual modal
+.modal-content {
+  position: relative;
+  background-color: $modal-content-bg;
+  border: 1px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
+  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);
   // Remove focus outline from opened modal
   outline: none;
+}
 
-  &.fade {
-    @include transition(opacity .3s linear, top .3s ease-out);
-    top: -25%;
-  }
-  &.fade.in { top: 10%; }
+// Modal background
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: ($zindex-modal-background - 10);
+  background-color: $modal-backdrop-bg;
+  // Fade for backdrop
+  &.fade { @include opacity(0); }
+  &.fade.in { @include opacity(.5); }
 }
+
+// Modal header
+// Top section of the modal w/ title and dismiss
 .modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-  // Close icon
-  .close { margin-top: 2px; }
-  // Heading
-  h3 {
-    margin: 0;
-    line-height: 30px;
-  }
+  padding: $modal-title-padding;
+  border-bottom: 1px solid $modal-header-border-color;
+  min-height: ($modal-title-padding + $modal-title-line-height);
+}
+// Close icon
+.modal-header .close {
+  margin-top: -2px;
 }
 
-// Body (where all modal content resides)
+// Title text within header
+.modal-title {
+  margin: 0;
+  line-height: $modal-title-line-height;
+}
+
+// Modal body
+// Where all modal content resides (sibling of .modal-header and .modal-footer)
 .modal-body {
   position: relative;
-  overflow-y: auto;
-  max-height: 400px;
-  padding: 15px;
-}
-// Remove bottom margin if need be
-.modal-form {
-  margin-bottom: 0;
+  padding: $modal-inner-padding;
 }
 
 // Footer (for actions)
 .modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  @include border-radius(0 0 6px 6px);
-  @include box-shadow(inset 0 1px 0 $white);
+  margin-top: 15px;
+  padding: ($modal-inner-padding - 1) $modal-inner-padding $modal-inner-padding;
+  text-align: right; // right align buttons
+  border-top: 1px solid $modal-footer-border-color;
   @include clearfix(); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
@@ -86,7 +108,7 @@
     margin-left: 5px;
     margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
   }
-  // but override tht for button groups
+  // but override that for button groups
   .btn-group .btn + .btn {
     margin-left: -1px;
   }
@@ -95,3 +117,20 @@
     margin-left: 0;
   }
 }
+
+// Scale up the modal
+@media screen and (min-width: $screen-tablet) {
+
+  .modal-dialog {
+    left: 50%;
+    right: auto;
+    width: 560px;
+    margin-left: -280px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+  }
+  .modal-content {
+    @include box-shadow(0 5px 15px rgba(0,0,0,.5));
+  }
+
+}

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

@@ -1,494 +1,380 @@
-/* Partial: twitter/bootstrap/_navbar.scss */
 //
-// Navbars (Redux)
+// Navbars
 // --------------------------------------------------
 
-
-// COMMON STYLES
-// -------------
-
-// Base class and wrapper
+// Wrapper and base class
 .navbar {
-  overflow: visible;
-  margin-bottom: $baseLineHeight;
-
-  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
-  *position: relative;
-  *z-index: 2;
-}
-
-// Inner for background effects
-// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
-.navbar-inner {
-  min-height: $navbarHeight;
-  padding-left:  20px;
-  padding-right: 20px;
-  @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
-  border: 1px solid $navbarBorder;
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(0 1px 4px rgba(0,0,0,.25));
+  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;
+  background-color: $navbar-bg;
+  border-radius: $border-radius-base;
 
   // Prevent floats from breaking the navbar
   @include clearfix();
 }
 
-// Set width to auto for default container
-// We then reset it for fixed navbars in the #gridSystem mixin
-.navbar .container {
-  width: auto;
-}
-
-// Override the default collapsed state
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-// Brand: website or project name
-// -------------------------
-.navbar .brand {
-  float: left;
-  display: block;
-  // Vertically center the text given $navbarHeight
-  padding: (($navbarHeight - $baseLineHeight) / 2) 20px (($navbarHeight - $baseLineHeight) / 2);
-  margin-left: -20px; // negative indent to left-align the text down the page
-  font-size: 20px;
-  font-weight: 200;
-  color: $navbarBrandColor;
-  text-shadow: 0 1px 0 $navbarBackgroundHighlight;
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-}
-
-// Plain text in topbar
-// -------------------------
-.navbar-text {
-  margin-bottom: 0;
-  line-height: $navbarHeight;
-  color: $navbarText;
-}
-
-// Janky solution for now to account for links outside the .nav
-// -------------------------
-.navbar-link {
-  color: $navbarLinkColor;
-  &:hover,
-  &:focus {
-    color: $navbarLinkColorHover;
-  }
-}
-
-// Dividers in navbar
+// Navbar nav links
 // -------------------------
-.navbar .divider-vertical {
-  height: $navbarHeight;
-  margin: 0 9px;
-  border-left: 1px solid $navbarBackground;
-  border-right: 1px solid $navbarBackgroundHighlight;
-}
-
-// Buttons in navbar
-// -------------------------
-.navbar .btn,
-.navbar .btn-group {
-  @include navbarVerticalAlign(30px); // Vertically center in navbar
-}
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0; // then undo the margin here so we don't accidentally double it
-}
 
-// Navbar forms
-// -------------------------
-.navbar-form {
-  margin-bottom: 0; // remove default bottom margin
-  @include clearfix();
-  input,
-  select,
-  .radio,
-  .checkbox {
-    @include navbarVerticalAlign(30px); // Vertically center in navbar
-  }
-  input,
-  select {
-    display: inline-block;
-    margin-bottom: 0;
+.navbar-nav {
+  // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
+  margin-top: 10px;
+  margin-bottom: 15px;
+
+  > 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;
+    }
   }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
-    margin-top: 3px;
+  > .active > a {
+    &,
+    &:hover,
+    &:focus {
+      color: $navbar-link-active-color;
+      background-color: $navbar-link-active-bg;
+    }
   }
-  .input-append,
-  .input-prepend {
-    margin-top: 5px;
-    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
-    input {
-      margin-top: 0; // remove the margin on top since it's on the parent
+  > .disabled > a {
+    &,
+    &:hover,
+    &:focus {
+      color: $navbar-link-disabled-color;
+      background-color: $navbar-link-disabled-bg;
     }
   }
-}
 
-// Navbar search
-// -------------------------
-.navbar-search {
-  position: relative;
-  float: left;
-  @include navbarVerticalAlign(30px); // Vertically center in navbar
-  margin-bottom: 0;
-  .search-query {
-    margin-bottom: 0;
-    padding: 4px 14px;
-    @include font-sans-serif(13px, normal, 1);
-    @include border-radius(15px); // redeclare because of specificity of the type attribute
+  // Right aligned contents
+  // Make them full width first so that they align properly on mobile
+  &.pull-right {
+    width: 100%;
   }
 }
 
 
-// Static navbar
-// -------------------------
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0; // remove 18px margin for default navbar
-  .navbar-inner {
-    @include border-radius(0);
-   }
- }
 
+//
+// Navbar alignment options
+// --------------------------------------------------
 
-// Fixed navbar
-// -------------------------
+// Static navbar
+.navbar-static-top {
+  border-radius: 0;
+}
 
-// Shared (top/bottom) styles
+// Fix the top/bottom navbars when screen real estate supports it
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   position: fixed;
   right: 0;
   left: 0;
-  z-index: $zindexFixedNavbar;
-  margin-bottom: 0; // remove 18px margin for default navbar
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-left:  0;
-  padding-right: 0;
-  @include border-radius(0);
+  z-index: $zindex-navbar-fixed;
+  border-radius: 0;
 }
-
-// Reset container width
-// Required here as we reset the width earlier on and the grid mixins don't override early enough
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  @include grid-core-span($gridColumnWidth, $gridGutterWidth, $gridColumns);
-}
-
-// Fixed to top
 .navbar-fixed-top {
   top: 0;
 }
-.navbar-fixed-top,
-.navbar-static-top {
-  .navbar-inner {
-    @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1));
-  }
-}
-
-// Fixed to bottom
 .navbar-fixed-bottom {
   bottom: 0;
-  .navbar-inner {
-    @include box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1));
-  }
+  margin-bottom: 0; // override .navbar defaults
 }
 
 
 
-// NAVIGATION
-// ----------
+//
+// Navbar optional components
+// --------------------------------------------------
 
-.navbar .nav {
-  position: relative;
-  left: 0;
+// Brand/project name
+.navbar-brand {
   display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-  margin-right: 0; // remove margin on float right nav
-}
-.navbar .nav > li {
-  float: left;
+  max-width: 200px;
+  margin-left: auto;
+  margin-right: auto;
+  padding: $navbar-padding-vertical $navbar-padding-horizontal;
+  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;
+    text-decoration: none;
+    background-color: $navbar-brand-hover-bg;
+  }
 }
 
-// Links
-.navbar .nav > li > a {
-  float: none;
-  // Vertically center the text given @navbarHeight
-  padding: (($navbarHeight - $baseLineHeight) / 2) 15px (($navbarHeight - $baseLineHeight) / 2);
-  color: $navbarLinkColor;
-  text-decoration: none;
-  text-shadow: 0 1px 0 $navbarBackgroundHighlight;
-}
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-// Hover/focus
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
-  color: $navbarLinkColorHover;
-  text-decoration: none;
-}
+// Collapsible navbar toggle
+.navbar-toggle {
+  position: absolute;
+  top: floor(($navbar-height - 32) / 2);
+  right: 10px;
+  width: 48px;
+  height: 32px;
+  padding: 8px 12px;
+  background-color: transparent;
+  border: 1px solid $navbar-toggle-border-color;
+  border-radius: $border-radius-base;
 
-// Active nav items
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: $navbarLinkColorActive;
-  text-decoration: none;
-  background-color: $navbarLinkBackgroundActive;
-  @include box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
-}
+  &:hover,
+  &:focus {
+    background-color: $navbar-toggle-hover-bg;
+  }
 
-// Navbar button for toggling navbar items in responsive layouts
-// These definitions need to come after '.navbar .btn'
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  @include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%));
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
-}
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  @include border-radius(1px);
-  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
-}
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
+  // 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;
+  }
 }
 
-
+// Navbar form
+.navbar-form {
+  @extend .form-inline;
+  @include navbar-vertical-align($input-height-base); // Vertically center in navbar
+}
 
 // Dropdown menus
-// --------------
 
 // Menu position and menu carets
-.navbar .nav > li > .dropdown-menu {
-  &:before {
-    content: '';
-    display: inline-block;
-    border-left:   7px solid transparent;
-    border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: $dropdownBorder;
-    position: absolute;
-    top: -7px;
-    left: 9px;
-  }
-  &:after {
-    content: '';
-    display: inline-block;
-    border-left:   6px solid transparent;
-    border-right:  6px solid transparent;
-    border-bottom: 6px solid $dropdownBackground;
-    position: absolute;
-    top: -6px;
-    left: 10px;
-  }
+.navbar-nav > li > .dropdown-menu {
+  margin-top: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
 // Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
-  &:before {
-    border-top: 7px solid #ccc;
-    border-top-color: $dropdownBorder;
-    border-bottom: 0;
-    bottom: -7px;
-    top: auto;
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  border-bottom-left-radius: 0;
+  border-bottom-right-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;
   }
-  &:after {
-    border-top: 6px solid $dropdownBackground;
-    border-bottom: 0;
-    bottom: -6px;
-    top: auto;
-  }
-}
 
-// Caret should match text color on hover/focus
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: $navbarLinkColorHover;
-  border-bottom-color: $navbarLinkColorHover;
-}
-
-// Remove background color from open dropdown
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  background-color: $navbarLinkBackgroundActive;
-  color: $navbarLinkColorActive;
-}
-
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: $navbarLinkColor;
-  border-bottom-color: $navbarLinkColor;
-}
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: $navbarLinkColorActive;
-  border-bottom-color: $navbarLinkColorActive;
+  // Remove background color from open dropdown
+  > .open > a {
+    &,
+    &: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;
+      }
+    }
+  }
+  > .dropdown > a .caret {
+    border-top-color: $navbar-link-color;
+    border-bottom-color: $navbar-link-color;
+  }
 }
 
 // Right aligned menus need alt position
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
+.navbar-nav.pull-right > li > .dropdown-menu,
+.navbar-nav > li > .dropdown-menu.pull-right {
   left: auto;
   right: 0;
-  &:before {
-    left: auto;
-    right: 12px;
-  }
-  &:after {
-    left: auto;
-    right: 13px;
-  }
-  .dropdown-menu {
-    left: auto;
-    right: 100%;
-    margin-left: 0;
-    margin-right: -1px;
-    @include border-radius(6px 0 6px 6px);
-  }
 }
 
 
-// Inverted navbar
-// -------------------------
 
-.navbar-inverse {
+// Inverse navbar
+// --------------------------------------------------
 
-  .navbar-inner {
-    @include gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground);
-    border-color: $navbarInverseBorder;
-  }
+.navbar-inverse {
+  background-color: $navbar-inverse-bg;
 
-  .brand,
-  .nav > li > a {
-    color: $navbarInverseLinkColor;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  .navbar-brand {
+    color: $navbar-inverse-brand-color;
     &:hover,
     &:focus {
-      color: $navbarInverseLinkColorHover;
+      color: $navbar-inverse-brand-hover-color;
+      background-color: $navbar-inverse-brand-hover-bg;
     }
   }
 
-  .brand {
-    color: $navbarInverseBrandColor;
-  }
-
   .navbar-text {
-    color: $navbarInverseText;
+    color: $navbar-inverse-color;
   }
 
-  .nav > li > a:focus,
-  .nav > li > a:hover {
-    background-color: $navbarInverseLinkBackgroundHover;
-    color: $navbarInverseLinkColorHover;
-  }
+  .navbar-nav {
+    > li > a {
+      color: $navbar-inverse-link-color;
 
-  .nav .active > a,
-  .nav .active > a:hover,
-  .nav .active > a:focus {
-    color: $navbarInverseLinkColorActive;
-    background-color: $navbarInverseLinkBackgroundActive;
+      &: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;
+      }
+    }
   }
 
-  // Inline text links
-  .navbar-link {
-    color: $navbarInverseLinkColor;
+  // Darken the responsive nav toggle
+  .navbar-toggle {
+    border-color: $navbar-inverse-toggle-border-color;
     &:hover,
     &:focus {
-      color: $navbarInverseLinkColorHover;
+      background-color: $navbar-inverse-toggle-hover-bg;
+    }
+    .icon-bar {
+      background-color: $navbar-inverse-toggle-icon-bar-bg;
     }
-  }
-
-  // Dividers in navbar
-  .divider-vertical {
-    border-left-color: $navbarInverseBackground;
-    border-right-color: $navbarInverseBackgroundHighlight;
   }
 
   // Dropdowns
-  .nav li.dropdown.open > .dropdown-toggle,
-  .nav li.dropdown.active > .dropdown-toggle,
-  .nav li.dropdown.open.active > .dropdown-toggle {
-    background-color: $navbarInverseLinkBackgroundActive;
-    color: $navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > a:hover .caret,
-  .nav li.dropdown > a:focus .caret {
-    border-top-color: $navbarInverseLinkColorActive;
-    border-bottom-color: $navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > .dropdown-toggle .caret {
-    border-top-color: $navbarInverseLinkColor;
-    border-bottom-color: $navbarInverseLinkColor;
+  .navbar-nav {
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navbar-inverse-link-active-bg;
+        color: $navbar-inverse-link-active-color;
+      }
+    }
+    > .dropdown > a:hover .caret {
+      border-top-color: $navbar-inverse-link-hover-color;
+      border-bottom-color: $navbar-inverse-link-hover-color;
+    }
+    > .dropdown > a .caret {
+      border-top-color: $navbar-inverse-link-color;
+      border-bottom-color: $navbar-inverse-link-color;
+    }
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        .caret {
+          border-top-color: $navbar-inverse-link-active-color;
+          border-bottom-color: $navbar-inverse-link-active-color;
+        }
+      }
+    }
   }
-  .nav li.dropdown.open > .dropdown-toggle .caret,
-  .nav li.dropdown.active > .dropdown-toggle .caret,
-  .nav li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: $navbarInverseLinkColorActive;
-    border-bottom-color: $navbarInverseLinkColorActive;
+}
+
+
+
+// Responsive navbar
+// --------------------------------------------------
+
+@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
+    margin-top: 0;
+    margin-bottom: 0;
 
-  // Navbar search
-  .navbar-search {
-    .search-query {
-      color: $white;
-      background-color: $navbarInverseSearchBackground;
-      border-color: $navbarInverseSearchBorder;
-      @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
-      @include transition(none);
-      @include placeholder($navbarInverseSearchPlaceholderColor);
-
-      // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
-      &:focus,
-      &.focused {
-        padding: 5px 15px;
-        color: $grayDark;
-        text-shadow: 0 1px 0 $white;
-        background-color: $navbarInverseSearchBackgroundFocus;
-        border: 0;
-        @include box-shadow(0 0 3px rgba(0,0,0,.15));
-        outline: 0;
+    > li {
+      float: left;
+      > a {
+        border-radius: 0;
       }
     }
+
+    &.pull-right {
+      float: right;
+      width: auto;
+    }
   }
 
-  // Navbar collapse button
-  .btn-navbar {
-    @include buttonBackground(darken($navbarInverseBackgroundHighlight, 5%), darken($navbarInverseBackground, 5%));
+  // Required to make the collapsing navbar work on regular desktops
+  .navbar-toggle {
+    position: relative;
+    top: auto;
+    left: auto;
+    display: none;
+  }
+  .nav-collapse.collapse {
+    display: block !important;
+    height: auto !important;
+    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 {
+  @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;
+  }
+}