Merge branch 'master' into style_fix

Author: bnmnetp

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

@@ -774,11 +774,11 @@ div.flash {
     height:50px
 }
 
-.relations-next {
+#relations-next {
     right: 35px;
 }
 
-.relations-prev {
+#relations-prev {
     left: 35px;
 }
 
@@ -788,35 +788,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>