aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Levin <brianlevin@fluorine.kiewit.dartmouth.edu>2016-06-01 17:38:49 -0400
committerBrian Levin <brianlevin@fluorine.kiewit.dartmouth.edu>2016-06-01 17:38:49 -0400
commit35d54746404b6ddcca5a47ba58d4abc2ce24226c (patch)
tree7840c7bf0c1fb1eb5f9c4edd6b411181d77dd6dc
parent4fa865ee2ec2265cf725dbbdd86d0e5e13e155ee (diff)
downloadpelican-themes-35d54746404b6ddcca5a47ba58d4abc2ce24226c.zip
pelican-themes-35d54746404b6ddcca5a47ba58d4abc2ce24226c.tar.gz
pelican-themes-35d54746404b6ddcca5a47ba58d4abc2ce24226c.tar.bz2
Logo/Site Name Navbar issue
Fixed issue where if you had both your site name and your site logo turned on, they sat on top of each other. Now they sit next to each other.
-rw-r--r--pelican-bootstrap3/static/css/style.css8
-rw-r--r--pelican-bootstrap3/templates/base.html2
2 files changed, 9 insertions, 1 deletions
diff --git a/pelican-bootstrap3/static/css/style.css b/pelican-bootstrap3/static/css/style.css
index 4f23c18..646765a 100644
--- a/pelican-bootstrap3/static/css/style.css
+++ b/pelican-bootstrap3/static/css/style.css
@@ -231,3 +231,11 @@ figure.floatcenter, .align-center {
margin:-50px 0 0;
/* negative fixed header height */
}
+
+.gap-right {
+ margin-right: 10px;
+}
+
+.gap-left {
+ margin-left: 10px;
+}
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html
index 610d050..85f7f5f 100644
--- a/pelican-bootstrap3/templates/base.html
+++ b/pelican-bootstrap3/templates/base.html
@@ -112,7 +112,7 @@
<span class="icon-bar"></span>
</button>
<a href="{{ SITEURL }}/" class="navbar-brand">
- {% if SITELOGO %}<img src="{{ SITEURL }}/{{ SITELOGO }}" width="{{ SITELOGO_SIZE }}"/> {% endif %}
+ {% if SITELOGO %}<img class="img-responsive pull-left gap-right" src="{{ SITEURL }}/{{ SITELOGO }}" width="{{ SITELOGO_SIZE }}"/> {% endif %}
{% if not HIDE_SITENAME %}{{ SITENAME }}{% endif %}
</a>
</div>