merged master

CHANGES.txt

@@ -5,6 +5,7 @@ Features
 --------
 
 * New -r option for the link checker to check remote links (Issue #1684)
+* Use static navbars in bootstrap3 and bootstrap themes
 
 Bugfixes
 --------

nikola/data/themes/bootstrap-jinja/templates/base.tmpl

@@ -13,7 +13,7 @@
 
 <!-- Menubar -->
 
-<div class="navbar navbar-fixed-top" id="navbar">
+<div class="navbar navbar-static-top" id="navbar">
     <div class="navbar-inner">
         <div class="container">
 

nikola/data/themes/bootstrap/assets/css/theme.css

@@ -1,11 +1,3 @@
-body {
-  padding-top: 60px;
-}
-@media (max-width: 979px) {
-  body {
-    padding-top: 0px;
-  }
-}
 #container {
     width: 960px;
     margin: 50 auto;

nikola/data/themes/bootstrap/templates/base.tmpl

@@ -13,7 +13,7 @@ ${template_hooks['extra_head']()}
 
 <!-- Menubar -->
 
-<div class="navbar navbar-fixed-top" id="navbar">
+<div class="navbar navbar-static-top" id="navbar">
     <div class="navbar-inner">
         <div class="container">
 

nikola/data/themes/bootstrap3-jinja/templates/base.tmpl

@@ -13,7 +13,7 @@
 
 <!-- Menubar -->
 
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
     <div class="container"><!-- This keeps the margins nice -->
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">

nikola/data/themes/bootstrap3/assets/css/theme.css

@@ -1,7 +1,3 @@
-body {
-    margin-top: 60px;
-}
-
 #container {
     width: 960px;
     margin: 0 auto;

nikola/data/themes/bootstrap3/templates/base.tmpl

@@ -13,7 +13,7 @@ ${template_hooks['extra_head']()}
 
 <!-- Menubar -->
 
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
     <div class="container"><!-- This keeps the margins nice -->
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">