diff options
37 files changed, 23 insertions, 20 deletions
diff --git a/docs/submodules/apex b/docs/submodules/apex -Subproject 1abb8ac25c48d182bc267d23f618043fbd7e084 +Subproject 94ce44fe6e3450a1217ec3838a43049e53da9f6 diff --git a/docs/submodules/armband b/docs/submodules/armband -Subproject 0d7a1834aea3bde3e27892919ae731b5cdae556 +Subproject c1bc6ac41e9ea98a37c108a87859c1c113bc996 diff --git a/docs/submodules/auto b/docs/submodules/auto -Subproject 40e5d1ef5e5c389609ab145441375cd0a17af07 +Subproject a85a3366e4ca2094facf69b696e0c03e97ab45d diff --git a/docs/submodules/bottlenecks b/docs/submodules/bottlenecks -Subproject c4a33d033497629b5e0b2ef1b269742eb26b050 +Subproject 73bd5d30fb9d5ee3bc01d78b431282332a53b44 diff --git a/docs/submodules/clover b/docs/submodules/clover -Subproject 867c4309a10df56eeb5098a78956e5d6951b8ba +Subproject 6774a5be4f59b325af1d51af3b88d06edd9f76c diff --git a/docs/submodules/compass4nfv b/docs/submodules/compass4nfv -Subproject 3ede18e758c77b31e56ca9164dbeb8e06b0223b +Subproject 39d0f4c45d616f8c5bce7ca8db900a66705f439 diff --git a/docs/submodules/daisy b/docs/submodules/daisy -Subproject 6a7ee18538561c772b0bfbc48805e2a2de74a9c +Subproject afb9b05fc088fdb60168a2dd25dda90b5d3ab2d diff --git a/docs/submodules/doctor b/docs/submodules/doctor -Subproject f06386c6b436a0adce7b96c6a1d59b5d02ed31f +Subproject aeb2ff16a530c7c7af9a6e2d16ba5421dd074cf diff --git a/docs/submodules/dovetail b/docs/submodules/dovetail -Subproject 71ba21ff906d4104a81442d4712aac13cf4906d +Subproject 13877a00e5155ee93bb4255a81e104c1ebf1f11 diff --git a/docs/submodules/fuel b/docs/submodules/fuel -Subproject 2d2f59907d578d266e1aa19040314dc15b27c0c +Subproject cfc5988be48d1317244e71fd7919480db18745d diff --git a/docs/submodules/functest b/docs/submodules/functest -Subproject 920e8d3cd4386e4d9085b5557b0c381d5f04383 +Subproject 00b78ca96bef67166e0118a0dbdb5152f401a60 diff --git a/docs/submodules/ipv6 b/docs/submodules/ipv6 -Subproject dfcc0745ef76e684593c8284f9dcb81cca2f795 +Subproject a1f0778b5aa40e2d179d00b941853749b58ab6a diff --git a/docs/submodules/joid b/docs/submodules/joid -Subproject c0bc95b384aa0e5a398aa35a300081919898d1d +Subproject 6345ba5917f720c00b165530916436578bd4c32 diff --git a/docs/submodules/moon b/docs/submodules/moon -Subproject 85209d217c85ada8a55487f5c77fb2990ad0c20 +Subproject 18cc28cf6879cc3be6b68b2b752d03a4b66d4af diff --git a/docs/submodules/nfvbench b/docs/submodules/nfvbench -Subproject e456fff7801702f1cf672d9ebda54eabd5100ec +Subproject 3918ebaca624bf6d58559d602eed8e33881e7ce diff --git a/docs/submodules/pharos b/docs/submodules/pharos -Subproject a3c0456cc14a75e96808505e670d0cab37b30ab +Subproject c7034503e2bb8da20f2b5c678719c7c7fbe6e61 diff --git a/docs/submodules/qtip b/docs/submodules/qtip -Subproject 4dccf13a77e11b3a4cd9066eebc0e61d62e0909 +Subproject 879963d90e74a4fd003bb73e8d4e50e51679f92 diff --git a/docs/submodules/releng b/docs/submodules/releng -Subproject 7c0d98f1f5811ac15cdc043621530fa89f29761 +Subproject 198850dce3d103ce6f04d90f86a5c9dfca364a7 diff --git a/docs/submodules/releng-xci b/docs/submodules/releng-xci -Subproject 164e43f7e8f3b2c7767445969414457fb58030f +Subproject b9ce25cd8076d548f42b0f896577789e502400a diff --git a/docs/submodules/samplevnf b/docs/submodules/samplevnf -Subproject 3981ce6fed44db09af235100526ab8bc1666e38 +Subproject ca2085d3c7a630da6a1f28ee49b605d214d6b2e diff --git a/docs/submodules/sdnvpn b/docs/submodules/sdnvpn -Subproject fdabb0a5e92200c09e1476be01bf4353b0823e6 +Subproject 785cd7b2bfd56a0f157898335a27ecf4ca9de78 diff --git a/docs/submodules/sfc b/docs/submodules/sfc -Subproject 31177afd6821f65e2601cb2b928624ba8f3d021 +Subproject 9fc412714c038f69f959105e1f5dc8e8a670d0b diff --git a/docs/submodules/snaps b/docs/submodules/snaps -Subproject bf07de830d7517f7173a3e8a68e1fa6dac2539d +Subproject 0e11064b4b5f49ec792784d9032161cbb3b8b02 diff --git a/docs/submodules/storperf b/docs/submodules/storperf -Subproject fbdded2f8141d68c81c5d72a11ab3a9b121c318 +Subproject 64c8b3b561ccac6159241cd0485a3259887c6bb diff --git a/docs/submodules/vswitchperf b/docs/submodules/vswitchperf -Subproject be271aef854887fce72d821a8589dfd4ebbe8e1 +Subproject 7440717327dabe7ae37f99cb060bce43a787809 diff --git a/docs/submodules/yardstick b/docs/submodules/yardstick -Subproject f3f75ea39678b6da24e5ed6a61f77586f71d012 +Subproject 7e2c35c4c33563d2007398f19f924cef9055ef4 diff --git a/opnfv-theme/MANIFEST.in b/opnfv-theme/MANIFEST.in index a5886cd20..34bc06617 100644 --- a/opnfv-theme/MANIFEST.in +++ b/opnfv-theme/MANIFEST.in @@ -2,6 +2,6 @@ include *.txt include *.rst recursive-include sphinx_opnfv_theme * -recursive-include sphinx_opnfv_theme/opnfv * +recursive-include sphinx_opnfv_theme/static * global-exclude *.pyc diff --git a/opnfv-theme/README.rst b/opnfv-theme/README.rst index 484a7a793..c307768fb 100644 --- a/opnfv-theme/README.rst +++ b/opnfv-theme/README.rst @@ -12,21 +12,23 @@ Here's how to install the theme from PyPI_ To install and configure the theme do the following. -#. Install the theme from pypi:: +#. Install the theme from pypi: - $ pip install sphinx_opnfv_theme + .. code-block:: bash + + $ pip install sphinx_opnfv_theme #. Configure Sphinx to use the theme: -.. code-block:: python + .. code-block:: python - # conf.py - import sphinx_opnfv_theme + # conf.py + import sphinx_opnfv_theme - # ... + # ... - html_theme = 'opnfv' - html_theme_path = sphinx_opnfv_theme.get_html_theme_path() + html_theme = 'opnfv' + html_theme_path = sphinx_opnfv_theme.get_html_theme_path() Customization ------------- @@ -39,7 +41,7 @@ following options for the bootstrap theme:: html_theme_options = { 'bootswatch_theme': 'journal', - 'navbar_sidebarrel': false, + 'navbar_sidebarrel': False, 'navbar_title': '', } diff --git a/opnfv-theme/setup.py b/opnfv-theme/setup.py index 5375c0940..55f55bc92 100644 --- a/opnfv-theme/setup.py +++ b/opnfv-theme/setup.py @@ -2,29 +2,29 @@ from setuptools import setup, find_packages from sphinx_opnfv_theme import __version__ -with open('README.rst') as f: - readme_text = f.read() setup( name='sphinx_opnfv_theme', description="OPNFV Theme for Sphinx", - long_description=readme_text, + long_description=open('README.rst').read(), url='https://docs.opnfv.org/', author='Trevor Bramwell', author_email='tbramwell@linuxfoundation.org', version=__version__, - entry_points = { + entry_points={ 'sphinx.html_themes': [ 'opnfv = sphinx_opnfv_theme', ] }, packages=find_packages(), - install_requires = [ + install_requires=[ 'sphinx_bootstrap_theme', - 'sphinxcontrib.httpdomain', + 'sphinxcontrib-httpdomain', ], include_package_data=True, - package_data = { - 'sphinx_opnfv_theme': ['opnfv/**',] - }, + package_data={'sphinx_opnfv_theme': [ + 'theme.conf', + 'static/*', + '*.html', + ]}, ) diff --git a/opnfv-theme/sphinx_opnfv_theme/__init__.py b/opnfv-theme/sphinx_opnfv_theme/__init__.py index 007927521..2bf05c3ae 100644 --- a/opnfv-theme/sphinx_opnfv_theme/__init__.py +++ b/opnfv-theme/sphinx_opnfv_theme/__init__.py @@ -2,7 +2,7 @@ from os import path -__version__='0.1.1' +__version__ = '0.2.0' def get_html_theme_path(): @@ -10,6 +10,7 @@ def get_html_theme_path(): local_path = path.abspath(path.dirname(__file__)) return [local_path] + def setup(app): """Required by Sphinx to create the theme.""" app.add_html_theme('opnfv', path.abspath(path.dirname(__file__))) diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/layout.html b/opnfv-theme/sphinx_opnfv_theme/layout.html index ddd674cf1..ddd674cf1 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/layout.html +++ b/opnfv-theme/sphinx_opnfv_theme/layout.html diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/my_custom_sidebar.html b/opnfv-theme/sphinx_opnfv_theme/my_custom_sidebar.html index 6b259bc93..6b259bc93 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/my_custom_sidebar.html +++ b/opnfv-theme/sphinx_opnfv_theme/my_custom_sidebar.html diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/relations.html b/opnfv-theme/sphinx_opnfv_theme/relations.html index 5bad0b562..5bad0b562 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/relations.html +++ b/opnfv-theme/sphinx_opnfv_theme/relations.html diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/favicon.ico b/opnfv-theme/sphinx_opnfv_theme/static/favicon.ico Binary files differindex bbe55ab40..bbe55ab40 100755 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/favicon.ico +++ b/opnfv-theme/sphinx_opnfv_theme/static/favicon.ico diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/logo.png b/opnfv-theme/sphinx_opnfv_theme/static/logo.png Binary files differindex 1519503eb..1519503eb 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/logo.png +++ b/opnfv-theme/sphinx_opnfv_theme/static/logo.png diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/my-styles.css b/opnfv-theme/sphinx_opnfv_theme/static/my-styles.css index 8feb45bfd..8feb45bfd 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/static/my-styles.css +++ b/opnfv-theme/sphinx_opnfv_theme/static/my-styles.css diff --git a/opnfv-theme/sphinx_opnfv_theme/opnfv/theme.conf b/opnfv-theme/sphinx_opnfv_theme/theme.conf index 66424aa1f..66424aa1f 100644 --- a/opnfv-theme/sphinx_opnfv_theme/opnfv/theme.conf +++ b/opnfv-theme/sphinx_opnfv_theme/theme.conf |
