From cee649a6463e5349035cecc4b94dd1ccafacde93 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Mon, 21 Oct 2013 16:28:09 -0700 Subject: [PATCH] update --- bower.json | 2 +- sphinx_rtd_theme/layout.html | 1 - sphinx_rtd_theme/sass/_nav.sass | 2 ++ sphinx_rtd_theme/static/theme.css | 4 +++ sphinx_rtd_theme/versions.html | 59 +++++++++++++------------------ 5 files changed, 31 insertions(+), 37 deletions(-) diff --git a/bower.json b/bower.json index 71c4cb30..117e7634 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,7 @@ "tests" ], "dependencies": { - "wyrm": "~0.0.3" + "wyrm": "~0.0.4" } } diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html index d581f0b2..f682ba5c 100644 --- a/sphinx_rtd_theme/layout.html +++ b/sphinx_rtd_theme/layout.html @@ -123,7 +123,6 @@ - {% block footer %}{% endblock %} diff --git a/sphinx_rtd_theme/sass/_nav.sass b/sphinx_rtd_theme/sass/_nav.sass index f4316b13..228e984f 100644 --- a/sphinx_rtd_theme/sass/_nav.sass +++ b/sphinx_rtd_theme/sass/_nav.sass @@ -204,6 +204,8 @@ .wy-nav-content padding: $gutter $gutter * 2 height: 100% + max-width: 800px + margin: auto .wy-body-mask position: fixed diff --git a/sphinx_rtd_theme/static/theme.css b/sphinx_rtd_theme/static/theme.css index d91382ec..d72aad71 100644 --- a/sphinx_rtd_theme/static/theme.css +++ b/sphinx_rtd_theme/static/theme.css @@ -4268,6 +4268,7 @@ body .redactor_toolbar li a.redactor_btn_pre { width: 300px; color: #fcfcfc; background: #1f1d1d; + border-top: solid 10px #343131; } .rst-versions .rst-current-version { padding: 12px; @@ -4277,6 +4278,7 @@ body .redactor_toolbar li a.redactor_btn_pre { font-size: 90%; cursor: pointer; color: #27ae60; + z-index: 400; *zoom: 1; } .rst-versions .rst-current-version:before, .rst-versions .rst-current-version:after { @@ -5016,6 +5018,8 @@ pre.literal-block:after, .literal-block.redactor_format_pre:after { .wy-nav-content { padding: 1.618em 3.236em; height: 100%; + max-width: 800px; + margin: auto; } .wy-body-mask, #redactor_modal_overlay { diff --git a/sphinx_rtd_theme/versions.html b/sphinx_rtd_theme/versions.html index 7ceb65e7..de1d513a 100644 --- a/sphinx_rtd_theme/versions.html +++ b/sphinx_rtd_theme/versions.html @@ -1,37 +1,26 @@ -
- - Read the Docs - v: {{ current_version }} - {% if current_version != "latest" %}(old) {% endif %} - - -
-
-
Version
- {% for slug, url in versions %} -
{{ slug }}
- {% endfor %} -
-
-
Downloads
-
PDF
-
Epub
-
Zip
-
-
- Free document hosting and versioning provided by Read the Docs. -
-
- -{# -{% if versions %} -
- {{ project }} -
- {% for slug, url in versions %} -
{{ slug }}
- {% endfor %} -
+{% if READTHEDOCS %} +
+ + Read the Docs + v: {{ current_version }} + {% if current_version != "latest" %}(old) {% endif %} + + +
+
+
Version
+ {% for slug, url in versions %} +
{{ slug }}
+ {% endfor %} +
+
+
Downloads
+
PDF
+
Epub
+
Zip
+
+
+ Free document hosting and versioning provided by Read the Docs. +
{% endif %} -#}