Better accessibility

CHANGES.rst

@@ -2,6 +2,11 @@
 Changes
 =======
 
+3.0.2 (*2023-09-27*)
+====================
+
+- Improve accessibility
+
 3.0.1 (*2023-08-17*)
 ====================
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "sphinx_nervproject_theme"
-version = "3.0.1"
+version = "3.0.2"
 requires-python = ">=3.8"
 dependencies = [
     "Sphinx>=7.0.0",

sphinx_nervproject_theme/layout.html

@@ -83,30 +83,8 @@
       {%- block header %}{%- include "util/navbar.html" %}{% endblock %}
 
       <div id="appflex">
-        {%- block sidebar %}
-        {% if builder=='html' %}
-          <div class="sidebar" id="sidebar">
-            {# sidebar navlinks displayed only on mobile #}
-            <nav class="nav-links can-hide">
-              {% block side_links %}
-                {%- include "util/navlinks.html" %}
-                {%- include "util/extlinks.html" %}
-              {% endblock %}
-            </nav>
-            {%- if sidebars != None %}
-              {%- for sidebartemplate in sidebars %}
-                {%- include sidebartemplate %}
-              {%- endfor %}
-            {%- endif %}
-          </div>
-        {% endif %}
-        {%- endblock %}
-
         <div class="page">
           {%- block document %}
-            {% block body_header %}
-              {%- include "util/bodyheader.html" %}
-            {%- endblock body_header %}
             <main class="content">
               {% block body %} {% endblock %}
                 {% if builder=='html' %}
@@ -141,9 +119,31 @@
                   </div>
                 {% endif %}
             </main>
+            {% block body_header %}
+              {%- include "util/bodyheader.html" %}
+            {%- endblock body_header %}
           {%- endblock %}
           {%- include "util/pagenav.html" %}
         </div>
+
+        {%- block sidebar %}
+        {% if builder=='html' %}
+          <div class="sidebar" id="sidebar">
+            {# sidebar navlinks displayed only on mobile #}
+            <nav class="nav-links can-hide">
+              {% block side_links %}
+                {%- include "util/navlinks.html" %}
+                {%- include "util/extlinks.html" %}
+              {% endblock %}
+            </nav>
+            {%- if sidebars != None %}
+              {%- for sidebartemplate in sidebars %}
+                {%- include sidebartemplate %}
+              {%- endfor %}
+            {%- endif %}
+          </div>
+        {% endif %}
+        {%- endblock %}
       </div>
 
 

ui/common.less

@@ -151,6 +151,7 @@ body {
     flex-grow: 1;
 
     .page {
+      order: 5;
       width: 100%;
     }
   }
@@ -182,7 +183,7 @@ body {
 a, a:visited {
   font-weight: 500;
   color: @AClr;
-  text-decoration: none;
+  text-decoration: underline;
 }
 
 p a code, p a:visited code {
@@ -254,6 +255,7 @@ a.header-anchor, a:visited.header-anchor {
   padding-right: 0.23em;
   margin-top: 0.125em;
   opacity: 0;
+  text-decoration: none;
   &:hover {
     text-decoration: none;
   }
@@ -808,7 +810,7 @@ ul.ablog-cloud li {
 }
 
 ul.ablog-cloud a, ul.ablog-cloud a:visited {
-  text-decoration: none;
+  text-decoration: underline;
   vertical-align: middle;
 }
 

ui/config.less

@@ -1,6 +1,6 @@
 // responsive breakpoints
-@MQNarrow: 95ex;
+@MQNarrow: 150ex;
-@MQMobile: 72ex;
+@MQMobile: 92ex;
 @MQMobileNarrow: 42ex;
 
 // Print header and footer