Skip to content

Commit

Permalink
Merge pull request #13 from tkruse/fix_ros_theme
Browse files Browse the repository at this point in the history
proper usage of installed catkin-sphinx with ros theme
  • Loading branch information
dirk-thomas committed Dec 15, 2012
2 parents 0d48129 + e2d5f3d commit 6b4c2af
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions doc/conf.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# serve to show the default. # serve to show the default.


import sys, os import sys, os
import catkin_sphinx


import sys, os
sys.path.insert(0, '../src') sys.path.insert(0, '../src')
from xml.etree.ElementTree import ElementTree from xml.etree.ElementTree import ElementTree


Expand All @@ -28,7 +28,8 @@
#needs_sphinx = '1.0' #needs_sphinx = '1.0'


html_logo = 'ros.png' html_logo = 'ros.png'
html_theme_path = [os.path.join(os.path.expanduser('~'), 'sphinx'), 'themes'] html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__),
'theme')]


# Add any Sphinx extension module names here, as strings. They can be extensions # Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
Expand Down

0 comments on commit 6b4c2af

Please sign in to comment.