Merge branch 'master' into peer_support

Author: bnmnetp

conf.py

@@ -32,7 +32,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     "sphinx.ext.mathjax",
-    "recommonmark",
+    "myst_parser",
     "sphinx.ext.intersphinx",
 ] + runestone_extensions()
 
@@ -322,7 +322,7 @@
 # It True, sets js files from Sphinx & Runestone to be loaded with defer attr
 # substantially speeding up page rendering. May cause issues with books that
 # have custom directives or raw html that assume jquery or another library
-# is loaded before body is parsed. 
+# is loaded before body is parsed.
 html_defer_js = True
 
 # Output file base name for HTML help builder.

requirements-dev.in

@@ -8,4 +8,5 @@ selenium>=2.53.6
 pyvirtualdisplay
 pytest
 pylint
-readme-renderer>24
+readme-renderer>24
+myst_parser

requirements-dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
@@ -8,8 +8,12 @@ alabaster==0.7.12
     # via sphinx
 astroid==2.6.5
     # via pylint
-attrs==21.2.0
+atomicwrites==1.4.0
     # via pytest
+attrs==21.2.0
+    # via
+    #   markdown-it-py
+    #   pytest
 babel==2.9.1
     # via sphinx
 bleach==3.3.1
@@ -18,7 +22,7 @@ certifi==2021.5.30
     # via requests
 charset-normalizer==2.0.3
     # via requests
-click==8.0.1
+click==7.1.2
     # via
     #   -r requirements.in
     #   pip-tools
@@ -27,10 +31,16 @@ codechat==1.8.8
 cogapp==3.0.0
     # via -r requirements.in
 colorama==0.4.4
-    # via twine
+    # via
+    #   pylint
+    #   pytest
+    #   sphinx
+    #   tqdm
+    #   twine
 docutils==0.16
     # via
     #   codechat
+    #   myst-parser
     #   readme-renderer
     #   sphinx
 easyprocess==0.3
@@ -50,17 +60,27 @@ iniconfig==1.1.1
 isort==5.9.3
     # via pylint
 jinja2==3.0.1
-    # via sphinx
+    # via
+    #   myst-parser
+    #   sphinx
 keyring==23.0.1
     # via twine
 lazy-object-proxy==1.6.0
     # via astroid
 lxml==4.6.3
     # via codechat
+markdown-it-py==1.1.0
+    # via
+    #   mdit-py-plugins
+    #   myst-parser
 markupsafe==2.0.1
     # via jinja2
 mccabe==0.6.1
     # via pylint
+mdit-py-plugins==0.2.8
+    # via myst-parser
+myst-parser==0.15.1
+    # via -r requirements-dev.in
 packaging==21.0
     # via
     #   bleach
@@ -95,17 +115,21 @@ pytz==2021.1
     # via babel
 pyvirtualdisplay==2.2
     # via -r requirements-dev.in
+pywin32-ctypes==0.2.0
+    # via keyring
+pyyaml==5.4.1
+    # via myst-parser
 readme-renderer==29.0
     # via
     #   -r requirements-dev.in
     #   twine
+requests-toolbelt==0.9.1
+    # via twine
 requests==2.26.0
     # via
     #   requests-toolbelt
     #   sphinx
     #   twine
-requests-toolbelt==0.9.1
-    # via twine
 rfc3986==1.5.0
     # via twine
 selenium==3.141.0
@@ -121,6 +145,7 @@ snowballstemmer==2.1.0
 sphinx==3.5.4
     # via
     #   -r requirements.in
+    #   myst-parser
     #   sphinxcontrib-paverutils
 sphinxcontrib-applehelp==1.0.2
     # via sphinx

requirements.in

@@ -1,7 +1,7 @@
 # *********
 # |docname|
 # *********
-click
+click<8.0
 Paver>=1.2.4
 six>1.12
 Sphinx<4.0.0

requirements.txt

@@ -12,7 +12,7 @@ certifi==2021.5.30
     # via requests
 charset-normalizer==2.0.3
     # via requests
-click==8.0.1
+click<8.0
     # via -r requirements.in
 codechat==1.8.8
     # via -r requirements.in

runestone/common/css/runestone-custom-sphinx-bootstrap.css

@@ -688,11 +688,11 @@ div.flash {
     height:50px
 }
 
-.relations-next {
+#relations-next {
     right: 35px;
 }
 
-.relations-prev {
+#relations-prev {
     left: 35px;
 }
 
@@ -702,35 +702,16 @@ div.flash {
     height: 50px;
 }
 
-.nextprev-list-top {
-    display: none;
-}
-
 @media (max-width: 600px) {
-
-    .nextprev-list-top {
-        display: block;
-    }    
 
     .navLink {
         display: inline-block;
         bottom: auto;
         position: absolute;
     }
 
-    ul#top-relations-console,
-    ul#bottom-relations-console {
-        list-style: none;
-        text-align: center;
-        width: 100%;
-        margin: 0 auto;
-        padding: 40px 0 20px 0;
-    }
-
-    #top-relations-next,
-    #top-relations-prev,
-    #bottom-relations-next,
-    #bottom-relations-prev {
+    #relations-next,
+    #relations-prev {
         width: 25%;
         padding: 0 20px;
         display: inline;

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -293,11 +293,7 @@
 <div class="container" id="continue-reading"></div>
 
 <div class="container" id="main-content" role="main">
-
-  {% with place='top' %}
-    {% include "subchapter.html" %}
-  {% endwith %}
-
+  
 <!-- Ad Serving for Runestone Campaign -->
 {% if dynamic_pages == 'True' %}
     {% raw %}
@@ -319,9 +315,9 @@
   <div id="scprogresscontainer">
     You have attempted <span id="scprogresstotal"></span> of <span id="scprogressposs"></span> activities on this page <div id="subchapterprogress" aria-label="Page progress"></div>
   </div>
-  {% with place='bottom'%}
-    {% include "subchapter.html" %}
-  {% endwith %}
+
+  {% include "subchapter.html" %}
+  
 </div>
 {%- endblock %}
 

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/subchapter.html

@@ -1,14 +1,14 @@
-<ul role="navigation" class="nextprev-list nextprev-list-{{place}}" aria-label="Change page">
+<ul role="navigation" class="nextprev-list nextprev-list" aria-label="Change page">
 {%- if prev %}
-<li id="relations-prev-{{place}}" class="relations-prev navLink" title='Previous Section - {{ prev.title|extractText|extractTextII }}' data-toggle="tooltip">
+<li id="relations-prev" class="navLink" title='Previous Section - {{ prev.title|extractText|extractTextII }}' data-toggle="tooltip">
   <a href="{{ prev.link|e }}" aria-label="Previous - {{ prev.title|extractText|extractTextII }}">
     <i class='prevNav glyphicon glyphicon-chevron-left'  style="top:50%; transform:translateY(-50%)translateX(-50%); left: 50%; color:black;"></i>
   </a>
 </li>
 {% endif %}
 
 {%- if next %}
-  <li id="relations-next-{{place}}" class="relations-next navLink" title='Next Section - {{ next.title|extractText|extractTextII }}' data-toggle="tooltip" >
+  <li id="relations-next" class="navLink" title='Next Section - {{ next.title|extractText|extractTextII }}' data-toggle="tooltip" >
     <a href="{{ next.link|e }}" aria-label="Next - {{ next.title|extractText|extractTextII }}">
       <i id="relationsNextIcon" class='nextNav glyphicon glyphicon-chevron-right' style="top:50%; transform:translateY(-50%)translateX(-50%); left: 50%; color:black; "></i>
     </a>
@@ -18,7 +18,7 @@
 
 <script>
 window.addEventListener('load', (event) => {
-  $('#relations-prev-{{place}}').tooltip({'placement': 'right', 'delay': { show: 100, hide: 50}});
-  $('#relations-next-{{place}}').tooltip({'placement': 'left', 'delay': { show: 100, hide: 50}});
+  $('#relations-prev').tooltip({'placement': 'right', 'delay': { show: 100, hide: 50}});
+  $('#relations-next').tooltip({'placement': 'left', 'delay': { show: 100, hide: 50}});
 });
 </script>