Preparing 1.5.1 steps 7/16

techtonik · techtonik · commit d61bfbc73a72 · 2016-01-11T21:59:17.000+03:00
7. python setup.py build_doc

  * fix include of basic.css for rendering permalink anchors
  * make anchors less obtrusive
diff --git a/doc/_static/style.css b/doc/_static/style.css
@@ -107,3 +107,9 @@ table
   border-spacing: 1px;
   background-color: #fafafa;
 }
+
+a.headerlink {
+  font-size: 0.8em;
+  margin-left: 0.3em;
+  color: #c99;
+}
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -1,6 +1,14 @@
+{#
+    _templates/layout.html
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Custom layout template for Roundup.
+
+#}
+{%- block doctype -%}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
+{%- endblock %}
 {%- macro relbar(class) %}
     <div class="related {{ class }}">
       <ul>
@@ -65,6 +73,15 @@ <h3>{{ _('Quick search') }}</h3>
   {%- endblock %}
 {%- endmacro %}
 
+{%- macro css() %}
+    <link rel="stylesheet" href="{{ pathto('_static/basic.css', 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+    {%- for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+    {%- endfor %}
+{%- endmacro %}
+
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -80,8 +97,7 @@ <h3>{{ _('Quick search') }}</h3>
     <link rel="alternate" type="{{ type|e(true) }}" title="{{ title|e(true) }}" href="{{ link|e(true) }}" />
     {%- endfor %}
     {%- else %}
-    <link rel="stylesheet" href="{{ pathto('_static/style.css', 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+    {{ css() }}
     {%- endif %}
     {%- if builder != 'htmlhelp' %}
     <script type="text/javascript">
diff --git a/doc/conf.py b/doc/conf.py
@@ -126,7 +126,7 @@
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
 # given in html_static_path.
-html_style = 'default.css'
+html_style = 'style.css'
 
 #-- Sphinx 1.3
 # The theme to use for HTML and HTML Help pages.  See the documentation for
