From 9bdbcef0ab8bd56533dba224c1a7542296bf0baa Mon Sep 17 00:00:00 2001
From: riggraz <riccardo.graziosi97@gmail.com>
Date: Tue, 24 Sep 2019 16:37:55 +0200
Subject: [PATCH] Improve navbar brand visualisation

---
 .../general/{_navbar.scss => _header.scss}            | 11 ++++++++---
 app/javascript/stylesheets/main.scss                  |  2 +-
 app/views/layouts/_header.html.erb                    |  8 +++++---
 3 files changed, 14 insertions(+), 7 deletions(-)
 rename app/javascript/stylesheets/general/{_navbar.scss => _header.scss} (87%)

diff --git a/app/javascript/stylesheets/general/_navbar.scss b/app/javascript/stylesheets/general/_header.scss
similarity index 87%
rename from app/javascript/stylesheets/general/_navbar.scss
rename to app/javascript/stylesheets/general/_header.scss
index 37ed79b9..d2fd8ff5 100644
--- a/app/javascript/stylesheets/general/_navbar.scss
+++ b/app/javascript/stylesheets/general/_header.scss
@@ -16,10 +16,15 @@
   .navbar-brand {
     font-size: 18pt;
     font-weight: 700;
-  }
 
-  .logo img {
-    width: 48px;
+    .logo {
+      @extend
+        .d-inline-block,
+        .align-top,
+        .mr-2;
+
+      width: 36px;
+    }
   }
 
   .boardsNav {
diff --git a/app/javascript/stylesheets/main.scss b/app/javascript/stylesheets/main.scss
index d76f2ed2..c6bfe320 100644
--- a/app/javascript/stylesheets/main.scss
+++ b/app/javascript/stylesheets/main.scss
@@ -5,9 +5,9 @@
 @import 'general/components';
 @import 'general/custom_texts';
 @import 'general/form';
+@import 'general/header';
 @import 'general/icons';
 @import 'general/index';
-@import 'general/navbar';
 
 /* Components */
 @import 'components/Board';
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index bb34729e..1ac2366d 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,11 +1,13 @@
 <nav class="navbar navbar-expand-md navbar-light">
   <div class="container">
     <%=
-      if Rails.application.show_logo?
-        link_to image_tag(asset_pack_path('media/images/logo.png')), root_path, class: 'logo navbar-brand'
+      link_to root_path, class: 'navbar-brand' do
+        app_name = content_tag :span, Rails.application.name
+        logo = image_tag(asset_pack_path('media/images/logo.png'), class: 'logo')
+
+        Rails.application.show_logo? ? logo + app_name : app_name
       end
     %>
-    <%= link_to Rails.application.name, root_path, class: 'navbar-brand' %>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>