Merge branch '1294-update-docs-theme'

ckan · Nov 13, 2013 · 021988f · 021988f
2 parents a73ee7a + dde9901
commit 021988f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/doc/_static/ckanlogo.png b/doc/_static/ckanlogo.png
diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn
diff --git a/doc/conf.py b/doc/conf.py
@@ -152,15 +152,12 @@
 html_theme_path = ['_themes']
 html_theme = 'sphinx-theme-okfn'
 html_theme_options = {
-        'logo_icon': 'http://assets.okfn.org/p/opendatahandbook/img/data-wrench-inverted.png',
+        'logo_icon': 'ckanlogo.png',
         'show_version': True
     }
 
 html_sidebars = {
-    '**':  ['relations.html', 'globaltoc.html'],
-    # There's no point in showing the table of contents in the sidebar on the
-    # table of contents page! So:
-    'index': ['relations.html'],
+    '**':  ['globaltoc.html'],
 }
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
@@ -187,7 +184,7 @@
 # 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,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['.static']
+html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/doc/images/ckan_logo_box.png b/doc/images/ckan_logo_box.png
diff --git a/doc/index.rst b/doc/index.rst
@@ -33,6 +33,7 @@ advanced documentation last:
 ----
 
 .. toctree::
+   :hidden:
    :maxdepth: 2
 
    installing