From aa6fa036e8afa5374d294a9e5a6bfd41419bdc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Fri, 22 Jun 2018 18:51:51 +0000 Subject: [PATCH] Include logo in navbar, favicon and ogp image --- static/css/base.css | 12 ++++++++++++ templates/base.html | 24 +++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/static/css/base.css b/static/css/base.css index 6aa2dc2f..f6240970 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -35,6 +35,18 @@ footer a { border-radius: 0; } +/* Reduce the padding for the logo in the navbar-brand so the 32px-high logo + * is centered in the navbar */ +.navbar-brand { + padding-top: 9px; + padding-bottom: 9px; +} + +/* Display logo and site name side by side and not on top of each other */ +.navbar-brand img { + display: initial; +} + /* Add right colors for buttons in dropdown in navbar-inverse (else it is light * gray on white bg and white when hovered */ .navbar-inverse .dropdown-menu .btn-link { diff --git a/templates/base.html b/templates/base.html index d257464f..45c1e6a4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -33,12 +33,14 @@ with this program; if not, write to the Free Software Foundation, Inc., - - - - - - + + + + + + + + {# Load CSS and JavaScript #} {% bootstrap_css %} @@ -50,9 +52,10 @@ with this program; if not, write to the Free Software Foundation, Inc., - - + + + {{ site_name }} : {% block title %}Accueil{% endblock %} @@ -66,7 +69,10 @@ with this program; if not, write to the Free Software Foundation, Inc., - {{ site_name }} + + + {{ site_name }} +