docs: Update styling of the navbar using a new version of the sphinx-…

…bootstrap-theme
mapproxy · Sep 28, 2015 · 5b8803f · 5b8803f
1 parent 2d90394
commit 5b8803f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/doc/_static/mapproxy.css b/doc/_static/mapproxy.css
@@ -36,7 +36,6 @@ code {
   top: 5px;
 }
 
-
 .bs-sidenav .nav > li > a {
   padding: 3px 20px;
 }
@@ -49,11 +48,6 @@ code {
   background-color: #F5F5F5;
 }
 
-
-.navbar-brand {
-  padding-top: 0px;
-}
-
 .navbar-default, .footer, .bs-sidenav {
   background-color: #ececec;
 }

diff --git a/doc/_templates/navbar.html b/doc/_templates/navbar.html
@@ -1,4 +1,4 @@
-<div id="navbar" class="{{ theme_navbar_class }} navbar-default {% if theme_navbar_fixed_top == 'true' -%} navbar-fixed-top{%- endif -%}">
+<div id="navbar" class="{{ theme_navbar_class }} navbar-default {% if theme_navbar_fixed_top|tobool -%} navbar-fixed-top{%- endif -%}">
   <div class="container">
     <div class="navbar-header">
       <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
@@ -7,12 +7,20 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ pathto(master_doc) }}">
-        {%- block sidebarlogo %}
+      {%- block sidebarlogo %}
+      <a href="{{ pathto(master_doc) }}" class="pull-left">
         {%- if logo %}<img src="{{ pathto('_static/' + logo, 1) }}" height="50">{%- endif %}
-        {%- endblock %}
-        {% if theme_navbar_title -%}{{ theme_navbar_title|e }}{%- else -%}{{ project|e }}{%- endif -%}
-        {{ release|e }}
+      </a>
+      {%- endblock %}
+      <a class="navbar-brand" href="{{ pathto(master_doc) }}">
+        <span>
+          {% if theme_navbar_title -%}
+            {{ theme_navbar_title|e }}
+          {%- else -%}
+            {{ project|e }}
+          {%- endif -%}
+        </span>
+        <span>{{ release|e }}</span>
       </a>
     </div>
     <div class="collapse navbar-collapse nav-collapse">

diff --git a/tox.ini b/tox.ini
@@ -25,7 +25,7 @@ setenv =
 changedir = doc
 deps =
     sphinx==1.2.2
-    sphinx-bootstrap-theme==0.4.0
+    sphinx-bootstrap-theme==0.4.7
 commands =
     sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
     sphinx-build -b latex -d {envtmpdir}/doctrees . {envtmpdir}/latex