From 35d54746404b6ddcca5a47ba58d4abc2ce24226c Mon Sep 17 00:00:00 2001
From: Brian Levin <brianlevin@fluorine.kiewit.dartmouth.edu>
Date: Wed, 1 Jun 2016 17:38:49 -0400
Subject: 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.
---
 pelican-bootstrap3/static/css/style.css | 8 ++++++++
 pelican-bootstrap3/templates/base.html  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'pelican-bootstrap3')

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>
-- 
cgit v1.1