Unverified Commit 9d30f4d0 authored by Glenn Walbran's avatar Glenn Walbran
Browse files

WIP, Make mahara theme inherit from sphinx:classic

This commit makes the mahara them inherit from sphinx:classic instead of
basicstrap. The basicstrap dependencies are also removed.

- theme.conf updated to:
  - change parent to `classic`
  - mahara.css is commented out as it prevents the sidebar from being rendered
    in the new theme. Rather than being commented out mahara.css should be made
    compatible with the new theme.
- layout.html has been removed as that has dependencies on basicstrap. This
  may need to be changed if layout changes are required. Hopefully any changes
  can be limited to css and theme config.
parent 7b34b80e
......@@ -45,7 +45,7 @@ figure_language_filename = "/images-translated/{language}{root}{ext}"
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.ifconfig', 'sphinxjp.themes.basicstrap']
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.ifconfig']
# Add support for showing ToDo list for the whole documentation.
todo_include_todos = False
......@@ -124,10 +124,7 @@ html_theme = 'mahara'
html_theme_options = {'googlewebfont': True, 'googlewebfont_url': 'https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i,800,800i', 'googlewebfont_style': "font-family: 'Open Sans', sans-serif",}
# Add any paths that contain custom themes here, relative to this directory.
# html_theme_path = ['.']
import sphinxjp.themes.basicstrap as basicstrap
html_theme_path = ['.', basicstrap.template_path]
html_theme_path = ['.']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
......
This diff is collapsed.
[theme]
inherit = basicstrap
stylesheet = mahara.css
inherit = classic
;stylesheet = mahara.css
[options]
short_title = Home
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment