From 1210f381d6cead8e34303a4c356f051cf50c59f9 Mon Sep 17 00:00:00 2001
From: Lorenzo <ste.pigozzi@gmail.com>
Date: Tue, 12 Sep 2017 11:07:10 +0200
Subject: [PATCH] Add UTdC logo to the navbar

---
 static/style.css  | 11 +++++++++++
 templates/nav.htm | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/static/style.css b/static/style.css
index 64179dc..6729ba0 100644
--- a/static/style.css
+++ b/static/style.css
@@ -13,6 +13,17 @@
   margin-right: 16px;
 }
 
+.navbar-brand
+{
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+
+.navbar-brand img
+{
+    height: 100%;
+}
+
 body
 {
   padding-top: 70px; /*Per la navbar*/
diff --git a/templates/nav.htm b/templates/nav.htm
index 2e3c14e..6782bcd 100644
--- a/templates/nav.htm
+++ b/templates/nav.htm
@@ -1,10 +1,10 @@
-<nav class="navbar navbar-inverse navbar-fixed-top">
+<nav class="navbar navbar-default navbar-fixed-top">
     <div class="container-fluid">
         <div class="navbar-header">
             {% if user %}
-                <a class="navbar-brand" href="/dashboard">Inventario</a>
+                <a class="navbar-brand" href="/dashboard"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
             {% else %}
-                <a class="navbar-brand active" href="/login">Inventario</a>
+                <a class="navbar-brand" href="/login"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
             {% endif %}
         </div>
         {% if user %}
@@ -17,9 +17,9 @@
             <li class="{% if type is equalto "user" %}active{% endif %}"><a href="/user_list">Utenti</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <p class="navbar-text">
+                <li class="navbar-text">
                     {{user}}
-                </p>
+                </li>
                 <a href="/login" class="btn btn-danger navbar-btn btn-right">Logout</a>
             </ul>
       {% endif %}