Skip to content

Commit

Permalink
use static navbars in bootstrap3
Browse files Browse the repository at this point in the history
This makes things look a bit better, especially if the navbar expands.

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed May 5, 2015
1 parent a403a21 commit ff62228
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGES.txt
Expand Up @@ -4,6 +4,8 @@ New in master
Features Features
-------- --------


* Use static navbars in bootstrap3 themes

Bugfixes Bugfixes
-------- --------


Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
Expand Up @@ -13,7 +13,7 @@


<!-- Menubar --> <!-- 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="container"><!-- This keeps the margins nice -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
Expand Down
4 changes: 0 additions & 4 deletions nikola/data/themes/bootstrap3/assets/css/theme.css
@@ -1,7 +1,3 @@
body {
margin-top: 60px;
}

#container { #container {
width: 960px; width: 960px;
margin: 0 auto; margin: 0 auto;
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base.tmpl
Expand Up @@ -13,7 +13,7 @@ ${template_hooks['extra_head']()}


<!-- Menubar --> <!-- 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="container"><!-- This keeps the margins nice -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
Expand Down

0 comments on commit ff62228

Please sign in to comment.