fixes #56 (for good this time)

codemonkey-jack · Feb 1, 2015 · 77c68a7 · 77c68a7
1 parent 731a355
commit 77c68a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/assets/less/app.less b/assets/less/app.less
@@ -339,3 +339,7 @@ textarea[rows="12"] { height: 24em; }
 	.btn-primary;
 	width: auto;
 }
+
+.navbar-brand > img {
+	max-height: 100%;
+}
diff --git a/views/nav.twig b/views/nav.twig
@@ -22,7 +22,7 @@
 				<a id="menu-left-close" href="#" class="btn btn-links btn-lg toggle"><i class="el-icon-caret-right"></i></a>
 			{% endif %}
 
-				<div class="sidebar-header">{% include 'navbar-brand.twig' %}</div>
+				<div class="sidebar-header">{% include 'site-logo.twig' %}</div>
 
 				{% include 'navbar-search.twig' %}
 
@@ -108,7 +108,7 @@
 
 				{{ '<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-main, .nav-extras"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>'|apply_filters( 'maera/header/toggler' ) }}
 
-				{% include 'navbar-brand.twig' %}
+				{% include 'site-logo.twig' %}
 
 			</div>
 

diff --git a/views/navbar-brand.twig b/views/navbar-brand.twig
diff --git a/views/site-logo.twig b/views/site-logo.twig
@@ -1,4 +1,4 @@
-<a href="{{ site.url }}" class="site-name-logo">
+<a href="{{ site.url }}" class="site-name-logo navbar-brand">
 	{% if site_logo %}
 		<img id="brand-logo" src="{{ TimberImage(site_logo.id).src }}" alt="{{ site.name }}">
 	{% else %}