diff options
| author | Matthew Setter <matthew@matthewsetter.com> | 2018-05-02 13:06:32 +0300 |
|---|---|---|
| committer | Matthew Setter <matthew@matthewsetter.com> | 2018-05-02 22:40:49 +0300 |
| commit | 0ce287d96dff585b61da491b347e11694fbc64ad (patch) | |
| tree | 31067bf302befc02e9878a369ae3271ed09239ae | |
| parent | 5e13d519d9d597d0b14f198acc18ca0ea7de8015 (diff) | |
Use external theme in documentation
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/conf.py.in | 6 | ||||
| m--------- | doc/docs-themes | 0 |
4 files changed, 8 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index b233d3d56..3c7bbde42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,6 @@ [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt url = git://github.com/guruz/libcrashreporter-qt.git -[submodule "doc/_shared_assets"] - path = doc/_shared_assets - url = git://github.com/owncloud/docs-themes.git +[submodule "doc/docs-themes"] + path = doc/docs-themes + url = https://github.com/owncloud/docs-themes.git diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f88836828..8bab945b7 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -24,7 +24,7 @@ if(SPHINX_FOUND) add_custom_target(doc DEPENDS doc-html COMMENT "Building documentation...") endif(WITH_DOC) - if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/_shared_assets") + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc/docs-themes") add_dependencies(doc doc-html-org) add_dependencies(doc doc-html-com) endif() @@ -90,4 +90,4 @@ if(SPHINX_FOUND) ${SPHINX_HTMLHELP_DIR} ) add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd DEPENDS doc-chm-sphinx ) -endif(SPHINX_FOUND)
\ No newline at end of file +endif(SPHINX_FOUND) diff --git a/doc/conf.py.in b/doc/conf.py.in index 850609bf7..9a39bed10 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -28,7 +28,7 @@ import sys, os extensions = ['sphinx.ext.todo'] # Add any paths that contain templates here, relative to this directory. -templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_shared_assets/templates'] +templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/docs-themes/templates'] # The suffix of source filenames. source_suffix = '.rst' @@ -95,7 +95,7 @@ pygments_style = 'sphinx' #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_shared_assets/themes'] +html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/docs-themes/themes'] # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. @@ -120,7 +120,7 @@ html_short_title = "Client Manual" # 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 = ['@CMAKE_CURRENT_SOURCE_DIR@/_shared_assets/static'] +html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/docs-themes/static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/doc/docs-themes b/doc/docs-themes new file mode 160000 +Subproject 90bd26b1189de95eb7bf5e023b5f0de3691216d |