Skip to content

Commit

Permalink
Merge pull request #717 from p-l-/fix-doc
Browse files Browse the repository at this point in the history
Doc: change theme
  • Loading branch information
p-l- committed Jul 5, 2019
2 parents eea71be + 371828e commit 76d7fc8
Show file tree
Hide file tree
Showing 66 changed files with 7,634 additions and 3,294 deletions.
35 changes: 33 additions & 2 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,7 @@ web/static/doc/_sources/usage/index.rst.txt
web/static/doc/_sources/usage/passive.rst.txt
web/static/doc/_sources/usage/use-cases.rst.txt
web/static/doc/_sources/usage/web-ui.rst.txt
web/static/doc/_static/alabaster.css
web/static/doc/_static/basic.css
web/static/doc/_static/custom.css
web/static/doc/_static/doctools.js
web/static/doc/_static/documentation_options.js
web/static/doc/_static/file.png
Expand All @@ -207,6 +205,39 @@ web/static/doc/_static/pygments.css
web/static/doc/_static/searchtools.js
web/static/doc/_static/underscore-1.3.1.js
web/static/doc/_static/underscore.js
web/static/doc/_static/css/badge_only.css
web/static/doc/_static/css/theme.css
web/static/doc/_static/fonts/fontawesome-webfont.eot
web/static/doc/_static/fonts/fontawesome-webfont.svg
web/static/doc/_static/fonts/fontawesome-webfont.ttf
web/static/doc/_static/fonts/fontawesome-webfont.woff
web/static/doc/_static/fonts/fontawesome-webfont.woff2
web/static/doc/_static/fonts/Lato/lato-bold.eot
web/static/doc/_static/fonts/Lato/lato-bold.ttf
web/static/doc/_static/fonts/Lato/lato-bold.woff
web/static/doc/_static/fonts/Lato/lato-bold.woff2
web/static/doc/_static/fonts/Lato/lato-bolditalic.eot
web/static/doc/_static/fonts/Lato/lato-bolditalic.ttf
web/static/doc/_static/fonts/Lato/lato-bolditalic.woff
web/static/doc/_static/fonts/Lato/lato-bolditalic.woff2
web/static/doc/_static/fonts/Lato/lato-italic.eot
web/static/doc/_static/fonts/Lato/lato-italic.ttf
web/static/doc/_static/fonts/Lato/lato-italic.woff
web/static/doc/_static/fonts/Lato/lato-italic.woff2
web/static/doc/_static/fonts/Lato/lato-regular.eot
web/static/doc/_static/fonts/Lato/lato-regular.ttf
web/static/doc/_static/fonts/Lato/lato-regular.woff
web/static/doc/_static/fonts/Lato/lato-regular.woff2
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
web/static/doc/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
web/static/doc/_static/js/modernizr.min.js
web/static/doc/_static/js/theme.js
web/static/doc/dev/index.html
web/static/doc/dev/tests.html
web/static/doc/dev/web-api.html
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'alabaster'
html_theme = 'sphinx_rtd_theme'

# 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,
Expand Down
4 changes: 2 additions & 2 deletions doc/install/fast-install-and-first-run.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ and `pymongo <https://pypi.python.org/pypi/pymongo/>`__), instead of

You might also want to adapt it to your needs, architecture, etc.

**For another way to run IVRE easily (probably more easily), see
:ref`Docker`:.**
For another way to run IVRE easily (probably even more easily), see
:ref:`install/docker:Docker`.

Install
-------
Expand Down
2 changes: 1 addition & 1 deletion pkg/builddocs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
# along with IVRE. If not, see <http://www.gnu.org/licenses/>.

cd `dirname $0`/../doc
make html && rm -rf ../web/doc && mv _build/html ../web/static/doc && rm -rf _build/
make html && rm -rf ../web/static/doc && mv _build/html ../web/static/doc && rm -rf _build/

20 changes: 20 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,26 @@ def run(self):
[os.path.join('web/static/doc/_static', x)
for x in os.listdir('web/static/doc/_static')
if x.endswith('.css') or x.endswith('.js') or x.endswith('.png')]),
('share/ivre/web/static/doc/_static/css',
[os.path.join('web/static/doc/_static/css', x)
for x in os.listdir('web/static/doc/_static/css')
if x.endswith('.css')]),
('share/ivre/web/static/doc/_static/fonts',
[os.path.join('web/static/doc/_static/fonts', x)
for x in os.listdir('web/static/doc/_static/fonts')
if x.startswith('fontawesome-webfont.')]),
('share/ivre/web/static/doc/_static/fonts/Lato',
[os.path.join('web/static/doc/_static/fonts/Lato', x)
for x in os.listdir('web/static/doc/_static/fonts/Lato')
if x.startswith('lato-')]),
('share/ivre/web/static/doc/_static/fonts/RobotoSlab',
[os.path.join('web/static/doc/_static/fonts/RobotoSlab', x)
for x in os.listdir('web/static/doc/_static/fonts/RobotoSlab')
if x.startswith('roboto-slab-v7-')]),
('share/ivre/web/static/doc/_static/js',
[os.path.join('web/static/doc/_static/js', x)
for x in os.listdir('web/static/doc/_static/js')
if x.endswith('.js')]),
('share/ivre/web/static/doc/_sources',
[os.path.join('web/static/doc/_sources', x)
for x in os.listdir('web/static/doc/_sources')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ and `pymongo <https://pypi.python.org/pypi/pymongo/>`__), instead of

You might also want to adapt it to your needs, architecture, etc.

**For another way to run IVRE easily (probably more easily), see
:ref`Docker`:.**
For another way to run IVRE easily (probably even more easily), see
:ref:`install/docker:Docker`.

Install
-------
Expand Down

0 comments on commit 76d7fc8

Please sign in to comment.