diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-11-11 19:06:13 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-11-11 19:06:13 -0500 |
| commit | ef10c1dd4ea837e85a75a17550079534e137b71e (patch) | |
| tree | 886458d539427d7765c7e02d4554d64ab6d7d2f7 | |
| parent | dcfaf5f24e0802ad25611f901d89e06041af85ef (diff) | |
| download | external_python_mako-ef10c1dd4ea837e85a75a17550079534e137b71e.tar.gz external_python_mako-ef10c1dd4ea837e85a75a17550079534e137b71e.tar.bz2 external_python_mako-ef10c1dd4ea837e85a75a17550079534e137b71e.zip | |
- add webfont RTD isn't giving us yet
- try to get all our CSS in one place and above RTD so we get all their styles...
| -rw-r--r-- | doc/build/templates/base.mako | 8 | ||||
| -rw-r--r-- | doc/build/templates/layout.mako | 10 | ||||
| -rw-r--r-- | doc/build/templates/rtd_layout.mako | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/doc/build/templates/base.mako b/doc/build/templates/base.mako index 002266c..aaef7f2 100644 --- a/doc/build/templates/base.mako +++ b/doc/build/templates/base.mako @@ -3,9 +3,15 @@ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <head> <title><%block name="head_title">Mako Templates for Python</%block></title> + +<!-- begin iterate through sphinx environment css_files --> +% for cssfile in css_files: + <link rel="stylesheet" href="${pathto(cssfile, 1)}" type="text/css" /> +% endfor +<!-- end iterate through sphinx environment css_files --> + <%block name="headers"> </%block> -<link rel="stylesheet" href="${pathto('_static/site.css', 1)}"></link> </head> diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako index 51daf9e..fc014cd 100644 --- a/doc/build/templates/layout.mako +++ b/doc/build/templates/layout.mako @@ -2,6 +2,13 @@ <%! local_script_files = [] %> +<% + css_files[0:] = [ + '_static/pygments.css', + '_static/docs.css', + '_static/site.css' + ] +%> <%doc> Structural elements are all prefixed with "docs-" to prevent conflicts when the structure is integrated into the @@ -40,9 +47,6 @@ withsidebar = bool(toc) and current_page_name != 'index' <%block name="headers"> ${parent.headers()} - <link rel="stylesheet" href="${pathto('_static/pygments.css', 1)}" type="text/css" /> - <link rel="stylesheet" href="${pathto('_static/docs.css', 1)}" type="text/css" /> - <script type="text/javascript"> var DOCUMENTATION_OPTIONS = { URL_ROOT: '${pathto("", 1)}', diff --git a/doc/build/templates/rtd_layout.mako b/doc/build/templates/rtd_layout.mako index bd1c902..3fafd53 100644 --- a/doc/build/templates/rtd_layout.mako +++ b/doc/build/templates/rtd_layout.mako @@ -5,11 +5,7 @@ <%block name="headers"> -<!-- begin iterate through sphinx environment css_files --> -% for cssfile in css_files: - <link rel="stylesheet" href="${pathto(cssfile, 1)}" type="text/css" /> -% endfor -<!-- end iterate through sphinx environment css_files --> +<link href='http://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700' rel='stylesheet' type='text/css'> <!-- RTD <head> via mako adapter --> <script type="text/javascript"> |