Skip to content

Commit

Permalink
replacing index.html hard-code with an rST page
Browse files Browse the repository at this point in the history
  • Loading branch information
choldgraf committed Jun 15, 2020
1 parent d4bc92c commit 5764aaf
Show file tree
Hide file tree
Showing 11 changed files with 243 additions and 228 deletions.
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ jobs:
- cache-pip
- run: pip install --user -e .
- run: pip install --user -r docs/doc-requirements.txt
- run: pip install --user sphinx_rtd_theme


# Cache some files for a speedup in subsequent builds
- save_cache:
key: cache-pip
Expand All @@ -25,7 +24,7 @@ jobs:
command: |
cd docs
make html
# Tell Circle to store the documentation output in a folder that we can access later
- store_artifacts:
path: docs/build/html/
Expand All @@ -36,4 +35,4 @@ workflows:
version: 2
default:
jobs:
- docs
- docs
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- stage: test-docs
install:
- pip install --upgrade pip sphinx
- pip install pydata_sphinx_theme recommonmark sphinx-intl
- pip install -r docs/doc-requirements.txt
script:
# Test build of HTML docs and English translation templates
- make -C docs html
Expand All @@ -17,7 +17,7 @@ jobs:
- stage: push-tx
install:
- pip install --upgrade pip sphinx
- pip install pydata_sphinx_theme recommonmark sphinx-intl
- pip install -r docs/doc-requirements.txt
script:
- cd docs
# Rebuild HTML again to test for merge problems
Expand Down
1 change: 1 addition & 0 deletions docs/doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ sphinx-intl
recommonmark==0.4.0
nbsphinx
pydata-sphinx-theme
sphinx-panels
25 changes: 25 additions & 0 deletions docs/source/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,28 @@ p.first.admonition-title {
color: #ffffff;
}


/* Front page table styling */

.front-page-table td > p {
margin-bottom: 0em;
}

.front-page-table td > p:last-child {
font-style: italic;
}

.front-page-table a.reference {
font-size: 1.3em;
}

.front-page-table.table td, .front-page-table.table th {
border: none;
padding-top: .3em;
padding-bottom: .3em;
}

div.card ul.simple {
list-style: none;
padding-left: 1em;
}
87 changes: 0 additions & 87 deletions docs/source/_templates/index.html

This file was deleted.

4 changes: 0 additions & 4 deletions docs/source/_templates/layout.html

This file was deleted.

45 changes: 0 additions & 45 deletions docs/source/_templates/navbar.html

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/_templates/sidebartoc.html

This file was deleted.

15 changes: 11 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.graphviz', # Add the graphviz extension
'recommonmark'
'recommonmark',
'sphinx_panels'
]

panels_add_boostrap_css = False

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand All @@ -43,7 +46,7 @@
#source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'contents'
master_doc = 'index'

# General information about the project.
project = 'Jupyter Documentation'
Expand Down Expand Up @@ -92,7 +95,7 @@

# Additional templates that should be rendered to pages, maps page names to
# template names.
html_additional_pages = {'index': 'index.html'}
html_additional_pages = {}

# Output file base name for HTML help builder.
htmlhelp_basename = 'Jupyter'
Expand Down Expand Up @@ -168,4 +171,8 @@
# -- Translation ----------------------------------------------------------

gettext_uuid = True
locale_dirs = ['locale/']
locale_dirs = ['locale/']


def setup(app):
app.add_css_file("custom.css")
81 changes: 0 additions & 81 deletions docs/source/contents.rst

This file was deleted.

Loading

0 comments on commit 5764aaf

Please sign in to comment.