Browse Source

Merge remote-tracking branch 'origin/master'

feature/load_slices
Ruben Verweij 8 years ago
parent
commit
0accf20f68
3 changed files with 26 additions and 5 deletions
  1. +1
    -1
      docs
  2. +16
    -0
      sphinx/_templates/layout.html
  3. +9
    -4
      sphinx/conf.py

+ 1
- 1
docs

@ -1 +1 @@
Subproject commit 278a1a14a5df686eed396b15a0c8e73c13f1e00f
Subproject commit a53b0896b2212279b8bb3fa890a3711911548555

+ 16
- 0
sphinx/_templates/layout.html View File

@ -0,0 +1,16 @@
{% extends "!layout.html" %}
{% block footer %}
{{ super() }}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-56141646-1', 'auto');
ga('send', 'pageview');
</script>
{% endblock %}

+ 9
- 4
sphinx/conf.py View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sphinx_bootstrap_theme
from recommonmark.parser import CommonMarkParser from recommonmark.parser import CommonMarkParser
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------
@ -18,7 +18,7 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.napoleon'] 'sphinx.ext.napoleon']
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = []
templates_path = ['_templates']
# The suffix(es) of source filenames. # The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string: # You can specify multiple suffix as a list of string:
@ -71,13 +71,18 @@ todo_include_todos = True
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
# #
html_theme = 'classic'
html_theme = 'bootstrap'
html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the
# documentation. # documentation.
# #
# html_theme_options = {}
html_theme_options = {
'navbar_links': [
("Lighthacking Blog", "http://lighthacking.nl", True),
],
}
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,


Loading…
Cancel
Save