Skip to content

Commit

Permalink
Merge pull request #2641 from lunkwill42/doc/remove-bundled-bootstrap
Browse files Browse the repository at this point in the history
Removed vendored-in Sphinx bootstrap theme
  • Loading branch information
lunkwill42 authored Sep 1, 2023
2 parents 197fa35 + ad6a443 commit a2772e1
Show file tree
Hide file tree
Showing 63 changed files with 6 additions and 11,471 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
!tools/**/*
!requirements.txt
!tests/requirements.txt
!doc/requirements.txt
!requirements/**/*
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/nav.conf
COPY requirements/ /requirements
COPY requirements.txt /
COPY tests/requirements.txt /test-requirements.txt
COPY doc/requirements.txt /doc-requirements.txt
# Since we used pip3 to install pip globally, pip should now be for Python 3
RUN pip-compile --resolver=backtracking --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt
RUN pip-compile --resolver=backtracking --output-file /requirements.txt.lock /requirements.txt /test-requirements.txt /doc-requirements.txt
RUN pip install -r /requirements.txt.lock

ARG CUSTOM_PIP=ipython
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.

import sphinx_bootstrap_theme
import sys, os

# If extensions (or modules to document with autodoc) are in another directory,
Expand Down Expand Up @@ -188,7 +188,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.
Expand Down
1 change: 1 addition & 0 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-r ../requirements/django32.txt
-r ../requirements/base.txt
sphinx-bootstrap-theme==0.8.1
21 changes: 0 additions & 21 deletions doc/templates/__init__.py

This file was deleted.

10 changes: 0 additions & 10 deletions doc/templates/bootstrap/globaltoc.html

This file was deleted.

107 changes: 0 additions & 107 deletions doc/templates/bootstrap/layout.html

This file was deleted.

1 change: 0 additions & 1 deletion doc/templates/bootstrap/localtoc.html

This file was deleted.

51 changes: 0 additions & 51 deletions doc/templates/bootstrap/navbar-2.html

This file was deleted.

49 changes: 0 additions & 49 deletions doc/templates/bootstrap/navbar.html

This file was deleted.

9 changes: 0 additions & 9 deletions doc/templates/bootstrap/navbarsearchbox.html

This file was deleted.

10 changes: 0 additions & 10 deletions doc/templates/bootstrap/navbartoc.html

This file was deleted.

19 changes: 0 additions & 19 deletions doc/templates/bootstrap/relations.html

This file was deleted.

70 changes: 0 additions & 70 deletions doc/templates/bootstrap/search.html

This file was deleted.

Loading

0 comments on commit a2772e1

Please sign in to comment.