Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add footer styling to bootstrap3
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Jun 20, 2015
1 parent d93e32b commit 849d5a6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -4,6 +4,7 @@ New in master
Features
--------

* Add distinct styling for the site footer in bootstrap3
* Bootstrap v3.3.5 (Issue #1828)
* Use ``watchdog`` in ``nikola auto`` (Issue #1810)
* Add redirection for tags in Wordpress importer (Issue #1168)
Expand Down
9 changes: 8 additions & 1 deletion nikola/data/themes/bootstrap3-jinja/assets/css/theme.css
Expand Up @@ -173,5 +173,12 @@ article.post-micro {

/* for alignment with Bootstrap's .entry-content styling */
.entry-summary {
margin-top: 1em;
margin-top: 1em;
}

/* Custom page footer */
#footer {
padding-top: 19px;
color: #777;
border-top: 1px solid #e5e5e5;
}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
Expand Up @@ -67,7 +67,7 @@
</div>
<!--End of body content-->

<footer>
<footer id="footer">
{{ content_footer }}
{{ template_hooks['page_footer']() }}
</footer>
Expand Down
9 changes: 8 additions & 1 deletion nikola/data/themes/bootstrap3/assets/css/theme.css
Expand Up @@ -173,5 +173,12 @@ article.post-micro {

/* for alignment with Bootstrap's .entry-content styling */
.entry-summary {
margin-top: 1em;
margin-top: 1em;
}

/* Custom page footer */
#footer {
padding-top: 19px;
color: #777;
border-top: 1px solid #e5e5e5;
}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base.tmpl
Expand Up @@ -67,7 +67,7 @@ ${template_hooks['extra_head']()}
</div>
<!--End of body content-->

<footer>
<footer id="footer">
${content_footer}
${template_hooks['page_footer']()}
</footer>
Expand Down

0 comments on commit 849d5a6

Please sign in to comment.