From 152593258835669b696fd677539b83033686d7a2 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Wed, 28 May 2014 15:05:39 +0100
Subject: [PATCH] Fix bootstrap navbar size issue.

Also replace logo with cropped version to take up less space.
Refs #9521
---
 Code/Mantid/docs/source/_static/custom.css     | 5 -----
 Code/Mantid/docs/source/_templates/layout.html | 1 +
 Code/Mantid/docs/source/_templates/navbar.html | 8 ++++++++
 Code/Mantid/docs/source/conf.py                | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 Code/Mantid/docs/source/_templates/navbar.html

diff --git a/Code/Mantid/docs/source/_static/custom.css b/Code/Mantid/docs/source/_static/custom.css
index 1ca764fa6eab..b21258686d13 100644
--- a/Code/Mantid/docs/source/_static/custom.css
+++ b/Code/Mantid/docs/source/_static/custom.css
@@ -5,11 +5,6 @@
 /*-------------------- $NAV --------------------*/
 
 .navbar-version { display: none; }
-.navbar-brand {
-  margin-bottom: 15px;
-  width: 190px;
-  height: 100px;
-}
 
 /*-------------------- $LINKS --------------------*/
 
diff --git a/Code/Mantid/docs/source/_templates/layout.html b/Code/Mantid/docs/source/_templates/layout.html
index e4f5bcfc89aa..6f66bf7ba4d5 100644
--- a/Code/Mantid/docs/source/_templates/layout.html
+++ b/Code/Mantid/docs/source/_templates/layout.html
@@ -1,3 +1,4 @@
 {% extends "!layout.html" %}
+
 {# Custom CSS overrides #}
 {% set bootswatch_css_custom = ['_static/custom.css'] %}
diff --git a/Code/Mantid/docs/source/_templates/navbar.html b/Code/Mantid/docs/source/_templates/navbar.html
new file mode 100644
index 000000000000..bf3b51f08e01
--- /dev/null
+++ b/Code/Mantid/docs/source/_templates/navbar.html
@@ -0,0 +1,8 @@
+{% extends "!navbar.html" %}
+
+{%- block sidebarlogo %}
+{%- if logo -%}
+  <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo" width=113 height=24/></a>
+{%- endif %}
+{%- endblock -%}
+
diff --git a/Code/Mantid/docs/source/conf.py b/Code/Mantid/docs/source/conf.py
index dc8828ce39c6..ea20dcc36f4a 100644
--- a/Code/Mantid/docs/source/conf.py
+++ b/Code/Mantid/docs/source/conf.py
@@ -60,7 +60,7 @@
 # custom.css rather than here.
 html_theme_options = {
     # Navigation bar title.
-    'navbar_title': " ",
+    'navbar_title': " ", # deliberate single space so it's not visible
     # Tab name for entire site.
     'navbar_site_name': "Mantid",
     # Add links to the nav bar. Second param of tuple is true to create absolute url.
@@ -87,7 +87,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = os.path.relpath('../../Images/Mantid_Logo_Transparent.png')
+html_logo = os.path.relpath('../../Images/Mantid_Logo_Transparent_Cropped.png')
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,