Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merged master
  • Loading branch information
ralsina committed May 6, 2015
2 parents f46d50f + a60b513 commit 65a3d01
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -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
--------
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/base.tmpl
Expand Up @@ -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">

Expand Down
8 changes: 0 additions & 8 deletions 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;
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap/templates/base.tmpl
Expand Up @@ -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">

Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
Expand Up @@ -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">
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 {
width: 960px;
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 -->

<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">
Expand Down

0 comments on commit 65a3d01

Please sign in to comment.