Skip to content

Commit

Permalink
Fix bootstrap navbar size issue.
Browse files Browse the repository at this point in the history
Also replace logo with cropped version to take up less space.
Refs #9521
  • Loading branch information
martyngigg committed May 28, 2014
1 parent 20815b8 commit 1525932
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
5 changes: 0 additions & 5 deletions Code/Mantid/docs/source/_static/custom.css
Expand Up @@ -5,11 +5,6 @@
/*-------------------- $NAV --------------------*/

.navbar-version { display: none; }
.navbar-brand {
margin-bottom: 15px;
width: 190px;
height: 100px;
}

/*-------------------- $LINKS --------------------*/

Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/docs/source/_templates/layout.html
@@ -1,3 +1,4 @@
{% extends "!layout.html" %}

{# Custom CSS overrides #}
{% set bootswatch_css_custom = ['_static/custom.css'] %}
8 changes: 8 additions & 0 deletions 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 -%}

4 changes: 2 additions & 2 deletions Code/Mantid/docs/source/conf.py
Expand Up @@ -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.
Expand All @@ -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,
Expand Down

0 comments on commit 1525932

Please sign in to comment.