Adding upstream version 7.3.7.upstream/7.3.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 27 insertions, 25 deletions

diff --git a/sphinx/themes/agogo/layout.html b/sphinx/themes/agogo/layout.html
index 75c21c2..5b46819 100644
--- a/sphinx/themes/agogo/layout.html
+++ b/sphinx/themes/agogo/layout.html
@@ -5,7 +5,7 @@
     Sphinx layout template for the agogo theme, originally written
     by Andi Albrecht.
 
-    :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
 {%- extends "basic/layout.html" %}
@@ -39,13 +39,13 @@
           {{ toctree(includehidden=True) }}
           {%- endblock %}
           {%- block sidebarsearch %}
-          <div role="search">
+          <search role="search">
             <h3 style="margin-top: 1.5em;">{{ _('Search') }}</h3>
             <form class="search" action="{{ pathto('search') }}" method="get">
                 <input type="text" name="q" />
                 <input type="submit" value="{{ _('Go') }}" />
             </form>
-          </div>
+          </search>
           {%- endblock %}
 {% endmacro %}
 
@@ -76,7 +76,7 @@
     <div class="footer-wrapper">
       <div class="footer">
         <div class="left">
-          <div role="navigation" aria-label="related navigaton">
+          <div role="navigation" aria-label="related navigation">
             {%- for rellink in rellinks|reverse %}
             <a href="{{ pathto(rellink[0])|e }}" title="{{ rellink[1]|striptags|e }}"
               {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index e885d8c..3b7a1d0 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- agogo theme.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
diff --git a/sphinx/themes/agogo/theme.conf b/sphinx/themes/agogo/theme.conf
deleted file mode 100644
index 6a4457e..0000000
--- a/sphinx/themes/agogo/theme.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = agogo.css
-pygments_style = tango
-
-[options]
-bodyfont = "Verdana", Arial, sans-serif
-headerfont = "Georgia", "Times New Roman", serif
-pagewidth = 70em
-documentwidth = 50em
-rightsidebar = true
-sidebarwidth = 20em
-bgcolor = #eeeeec
-headerbg = #555573 url(bgtop.png) top left repeat-x
-footerbg = url(bgfooter.png) top left repeat-x
-linkcolor = #ce5c00
-headercolor1 = #204a87
-headercolor2 = #3465a4
-headerlinkcolor = #fcaf3e
-textalign = justify
diff --git a/sphinx/themes/agogo/theme.toml b/sphinx/themes/agogo/theme.toml
new file mode 100644
index 0000000..ebb47ac
--- /dev/null
+++ b/sphinx/themes/agogo/theme.toml
@@ -0,0 +1,22 @@
+[theme]
+inherit = "basic"
+stylesheets = [
+    "agogo.css",
+]
+pygments_style = { default = "tango" }
+
+[options]
+bodyfont = "\"Verdana\", Arial, sans-serif"
+headerfont = "\"Georgia\", \"Times New Roman\", serif"
+pagewidth = "70em"
+documentwidth = "50em"
+rightsidebar = "true"
+sidebarwidth = "20em"
+bgcolor = "#eeeeec"
+headerbg = "#555573 url(bgtop.png) top left repeat-x"
+footerbg = "url(bgfooter.png) top left repeat-x"
+linkcolor = "#ce5c00"
+headercolor1 = "#204a87"
+headercolor2 = "#3465a4"
+headerlinkcolor = "#fcaf3e"
+textalign = "justify"