use static navbars in bootstrap3

This makes things look a bit better, especially if the navbar expands. Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · May 5, 2015 · ff6222898fcf0ead93d0ce03b0995b0427afeb7f · ff62228
1 parent a403a21
commit ff6222898fcf0ead93d0ce03b0995b0427afeb7f
Unified Split

Showing with 4 additions and 6 deletions.

+2 −0 CHANGES.txt

+1 −1 nikola/data/themes/bootstrap3-jinja/templates/base.tmpl

+0 −4 nikola/data/themes/bootstrap3/assets/css/theme.css

+1 −1 nikola/data/themes/bootstrap3/templates/base.tmpl
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ New in master
 Features
 --------
 
+* Use static navbars in bootstrap3 themes
+
 Bugfixes
 --------
 

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl b/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">

diff --git a/nikola/data/themes/bootstrap3/assets/css/theme.css b/nikola/data/themes/bootstrap3/assets/css/theme.css
@@ -1,7 +1,3 @@
-body {
-    margin-top: 60px;
-}
-
 #container {
     width: 960px;
     margin: 0 auto;

diff --git a/nikola/data/themes/bootstrap3/templates/base.tmpl b/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">