Merge branch 'ha_custom_image_logo'

services/web/app/views/layout/navbar.jade

@@ -3,7 +3,9 @@ nav.navbar.navbar-default
 		.navbar-header
 			button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}")
 				i.fa.fa-bars
-			if nav.title
+			if settings.nav.custom_logo
+				a(href='/', style='background-image:url("#{settings.nav.custom_logo}")').navbar-brand
+			else if (nav.title)
 				a(href='/').navbar-title #{nav.title}
 			else
 				a(href='/').navbar-brand

services/web/config/settings.defaults.coffee

@@ -15,7 +15,7 @@ httpAuthUsers[httpAuthUser] = httpAuthPass
 
 sessionSecret = "secret-please-change"
 
-module.exports =
+module.exports = settings =
 	# File storage
 	# ------------
 	#

services/web/public/stylesheets/components/navbar.less

@@ -381,13 +381,15 @@
   padding: 1rem 2rem;
 
   .navbar-brand {
+    position: absolute;
+    top: 5px;
+    bottom: 5px;
+    width: 135px;
+    padding: 0;
     background-image: url('/img/logo.png');
-    background-size: 135px 16px;
+    background-size: contain;
     background-repeat: no-repeat;
-    height: 16px;
-    margin-top: 10px;
-    padding: 0;
-    width: 135px;
+    background-position: left center;
   }
   @media
     only screen and (-webkit-min-device-pixel-ratio: 2),