diff options
| author | Pauli Virtanen <pav@iki.fi> | 2013-05-01 17:29:23 +0300 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2013-05-01 17:29:23 +0300 |
| commit | ac97ca48fe9b7cb4704a2c50ab08845800369a69 (patch) | |
| tree | 4687ea734a9e2e2764f0c11d768db4b8977545f2 | |
| parent | 4180ab31c647efc9499c553b4a22bf1857e04293 (diff) | |
| download | scipy-sphinx-theme-ac97ca48fe9b7cb4704a2c50ab08845800369a69.tar.gz | |
Move top navbar to a better location
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | _theme/scipy/layout.html | 28 | ||||
| -rw-r--r-- | _theme/scipy/static/scipy.css_t | 7 |
3 files changed, 24 insertions, 15 deletions
@@ -28,6 +28,10 @@ configuration variable: The following blocks are defined: +.. attribute:: layout.html:header + + Block at the top of the page, for logo etc. + .. attribute:: searchbox.html:edit_link Edit link HTML code to paste in the left sidebar, if `edit_link` is diff --git a/_theme/scipy/layout.html b/_theme/scipy/layout.html index a3b1d8d..e979121 100644 --- a/_theme/scipy/layout.html +++ b/_theme/scipy/layout.html @@ -19,12 +19,6 @@ {%- set titlesuffix = "" %} {%- endif %} -{%- if top_logo %} -<div class="top-logo"> - <img class="top-logo" src="{{ pathto('_static/' + top_logo, 1) }}"/> -</div> -{%- endif %} - {%- macro relbar_top() %} <ul class="nav nav-pills pull-left"> {%- for link in theme_rootlinks %} @@ -40,7 +34,7 @@ </ul> {%- endmacro %} -{%- macro relbar_bottom() %} +{%- macro relbar_top_right() %} <ul class="nav nav-pills pull-right"> {%- for rellink in rellinks %} <li class="active"> @@ -51,6 +45,9 @@ </ul> {%- endmacro %} +{%- macro relbar_bottom() %} +{%- endmacro %} + {%- macro sidebar() %} <div class="spc-rightsidebar span3"> <div class="sphinxsidebarwrapper"> @@ -164,17 +161,20 @@ </head> <body> {%- block header %}{% endblock %} - <div class="container"> - <div class="header"> - <div class="spc-navbar"> - {{ relbar_top() }} - </div> - </div> - </div> {%- block content %} <div class="container"> <div class="main"> +{%- block navbar %} + <div class="row-fluid"> + <div class="span12"> + <div class="spc-navbar"> + {{ relbar_top() }} + {{ relbar_top_right() }} + </div> + </div> + </div> +{% endblock %} <div class="row-fluid"> {%- if theme_sidebar == 'left' -%} {{ sidebar() }} diff --git a/_theme/scipy/static/scipy.css_t b/_theme/scipy/static/scipy.css_t index 3f197e1..4320a3c 100644 --- a/_theme/scipy/static/scipy.css_t +++ b/_theme/scipy/static/scipy.css_t @@ -1,4 +1,5 @@ -/* +/* -*- css -*- + * * sphinxdoc.css_t * ~~~~~~~~~~~~~~~ * @@ -22,6 +23,10 @@ div.container-navbar-bottom div.spc-navbar { margin-top: 0; } +div.spc-navbar { + margin: 0; +} + tt { color: inherit; font: inherit; |