make fixing of subnav work again

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index ec23b0fe01d8cf19d264501fef36c927a82e9114..a8bf03d725c697a547b52c40fd88a7267c549741 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -1004,7 +1004,7 @@
     height: auto !important;
     overflow: visible !important;
   }
-  .subnav-fixed {
+  .navbar-subnav-fixed {
     position: fixed;
     top: 40px;
     right: 0;
@@ -1020,13 +1020,14 @@
        -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
             box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
   }
-  .subnav-fixed .nav {
-    max-width: 780px;
+  .navbar-subnav-fixed .nav {
+    float: none;
+    max-width: 970px;
     padding: 0 1px;
     margin: 0 auto;
   }
-  .subnav .nav > li:first-child > a,
-  .subnav .nav > li:first-child > a:hover {
+  .navbar-subnav .nav > li:first-child > a,
+  .navbar-subnav .nav > li:first-child > a:hover {
     -webkit-border-radius: 0;
        -moz-border-radius: 0;
             border-radius: 0;

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index f38ee4956b8bac4eef4108bb48bc5450b274a02c..b2499b6b09a40873050217fec5c4a988bc61db87 100644 (file)
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -45,8 +45,8 @@
 
     // fix sub nav on scroll
     var $win = $(window)
-      , $nav = $('.subnav')
-      , navTop = $('.subnav').length && $('.subnav').offset().top - 40
+      , $nav = $('.navbar-subnav')
+      , navTop = $('.navbar-subnav').length && $('.navbar-subnav').offset().top - 40
       , isFixed = 0
 
     processScroll()
@@ -62,10 +62,10 @@
       var i, scrollTop = $win.scrollTop()
       if (scrollTop >= navTop && !isFixed) {
         isFixed = 1
-        $nav.addClass('subnav-fixed')
+        $nav.addClass('navbar-subnav-fixed')
       } else if (scrollTop <= navTop && isFixed) {
         isFixed = 0
-        $nav.removeClass('subnav-fixed')
+        $nav.removeClass('navbar-subnav-fixed')
       }
     }
 

diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 92e651e0ba1b2669cb23dc5a0ad92ae1fc2583eb..480939f7cf0f2044a3fcfc2bc2e5f0c29a9d8f27 100644 (file)
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -153,7 +153,7 @@
   }
 
   // Fixed subnav on scroll, but only for 980px and up (sorry IE!)
-  .subnav-fixed {
+  .navbar-subnav-fixed {
     position: fixed;
     top: 40px;
     left: 0;
@@ -169,13 +169,14 @@
             box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
     filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
   }
-  .subnav-fixed .nav {
-    max-width: 780px;
+  .navbar-subnav-fixed .nav {
+    float: none;
+    max-width: 970px;
     margin: 0 auto;
     padding: 0 1px;
   }
-  .subnav .nav > li:first-child > a,
-  .subnav .nav > li:first-child > a:hover {
+  .navbar-subnav .nav > li:first-child > a,
+  .navbar-subnav .nav > li:first-child > a:hover {
     -webkit-border-radius: 0;
        -moz-border-radius: 0;
             border-radius: 0;