Merge pull request #126 from choldgraf/theme

updating theme
jupyterhub · Jun 25, 2020 · 08b93db · 08b93db
2 parents 06d2828 + 8b28115
commit 08b93db
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -1,4 +1,4 @@
-{%- extends "alabaster_jupyterhub/layout.html" %}
+{%- extends "sphinx_book_theme/layout.html" %}
 
 <!-- Adding CSS to make the link generator wider -->
 {% block extrahead %}
@@ -12,10 +12,3 @@
 {% endif %}
 {{ super() }}
 {% endblock %}
-
-<!-- Don't include the "on this page" sidebar for the link generator -->
-{% block sidebar1 %}
-{% if pagename != 'link' %}
-{%- include "rightsidebar.html" %}
-{% endif %}
-{% endblock %}
diff --git a/docs/conf.py b/docs/conf.py
@@ -91,10 +91,7 @@ def setup(app):
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-import alabaster_jupyterhub
-
-html_theme = "alabaster_jupyterhub"
-html_theme_path = [alabaster_jupyterhub.get_html_theme_path()]
+html_theme = "sphinx_book_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -110,6 +107,12 @@ def setup(app):
     "source_suffix": source_suffix,
 }
 
+html_theme_options = {
+    "repository_url": "https://github.com/jupyterhub/nbgitpuller",
+    "use_issues_button": True,
+    "use_repository_button": True
+}
+
 # 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".

diff --git a/docs/doc-requirements.txt b/docs/doc-requirements.txt
@@ -3,8 +3,7 @@ sphinx_copybutton
 traitlets
 jupyterhub
 sphinx>=1.3.6,!=1.5.4
-alabaster
-alabaster_jupyterhub
+sphinx-book-theme
 memory_profiler
 pytest
-PyGitHub
+PyGitHub
diff --git a/docs/link.rst b/docs/link.rst
@@ -5,11 +5,11 @@ Use the following form to create your own ``nbgitpuller`` links.
 
 .. raw:: html
 
-   <div class="container">     
+   <div class="container full-width">
        <form id="linkgenerator" class="form needs-validation" onchange="onFormChange">
-   
+
            <div class="form-group">
-   
+
              <ul class="nav nav-tabs justify-content-end" role="tablist">
                <li class="nav-item">
                  <a class="nav-link active" id="tab-auth-default" data-toggle="tab" role="tab" href="#auth-default" aria-controls="auth-default">
@@ -22,7 +22,7 @@ Use the following form to create your own ``nbgitpuller`` links.
                  </a>
                </li>
              </ul>
-   
+
              <div class="tab-content">
                <div class="tab-pane fade show active" id="auth-default" role="tabpanel" aria-labelledby="tab-auth-default">
                  <input type="text" readonly class="form-control form-control" id="default-link" name="auth-default-link" placeholder="Generated link appears here...">
@@ -33,7 +33,7 @@ Use the following form to create your own ``nbgitpuller`` links.
              </div>
              </ul>
            </div>
-   
+
            <div class="form-group row">
              <label for="hub" class="col-sm-2 col-form-label">JupyterHub URL</label>
              <div class="col-sm-10">
@@ -43,12 +43,12 @@ Use the following form to create your own ``nbgitpuller`` links.
                  Must be a valid web URL
                </div>
                <small class="form-text text-muted">
-                 The JupyterHub to send users to. 
+                 The JupyterHub to send users to.
                  <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> must be installed in this hub.
                </small>
              </div>
            </div>
-   
+
            <div class="form-group row">
              <label for="repo" class="col-sm-2 col-form-label">Git Repository URL</label>
              <div class="col-sm-6">
@@ -67,7 +67,7 @@ Use the following form to create your own ``nbgitpuller`` links.
                </div>
              </div>
            </div>
-   
+
            <div class="form-group row" id="filepath-container">
              <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
              <div class="col-sm-10">
@@ -78,7 +78,7 @@ Use the following form to create your own ``nbgitpuller`` links.
                </small>
              </div>
            </div>
-   
+
            <div class="form-group row" id="app-container">
              <div class="col-sm-2 col-form-label">
                <label for="app" class=>Application to Open</label>
@@ -112,7 +112,7 @@ Use the following form to create your own ``nbgitpuller`` links.
                </div>
              </div>
            </div>
-   
+
        </form>
      </div>
      <br /><br /><br />
@@ -131,4 +131,4 @@ parameters **when accessing this page**:
 For example, the following URL will pre-populate the form with the
 UC Berkeley DataHub as the JupyterHub::
 
-    https://jupyterhub.github.io/nbgitpuller/link?hub=https://datahub.berkeley.edu
+    https://jupyterhub.github.io/nbgitpuller/link?hub=https://datahub.berkeley.edu