From ffcb4b87846b4e4a2d9eee8df4b7ec40365878b8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 5 Jun 2024 18:20:58 +0200
Subject: Merging upstream version 7.3.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 doc/_themes/sphinx13/layout.html             |  11 ++++++-----
 doc/_themes/sphinx13/static/sphinx-logo.svg  |   4 ++++
 doc/_themes/sphinx13/static/sphinx13.css     |  25 +++++++++++++++++++++++--
 doc/_themes/sphinx13/static/sphinxheader.png | Bin 11719 -> 0 bytes
 doc/_themes/sphinx13/theme.conf              |   4 ----
 doc/_themes/sphinx13/theme.toml              |   4 ++++
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 doc/_themes/sphinx13/static/sphinx-logo.svg
 delete mode 100644 doc/_themes/sphinx13/static/sphinxheader.png
 delete mode 100644 doc/_themes/sphinx13/theme.conf
 create mode 100644 doc/_themes/sphinx13/theme.toml

(limited to 'doc/_themes')

diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
index 86a7943..aae163a 100644
--- a/doc/_themes/sphinx13/layout.html
+++ b/doc/_themes/sphinx13/layout.html
@@ -3,16 +3,17 @@
 
 {% block extrahead %}
 {{ super() }}
-{%- if not embedded and pagename == 'index' %}
+{%- if not embedded and pagename == root_doc %}
 <style>.related { display: none; }</style>
 {%- endif %}
 {% endblock %}
 
 {% block header %}
 <div class="pageheader">
-<a href="{{ pathto('index') }}">
-  <img src="{{ pathto('_static/sphinxheader.png', 1) }}" alt="SPHINX" />
-</a>
+  <a href="{{ pathto(root_doc)|e }}">
+    <img src="{{ pathto('_static/sphinx-logo.svg', resource=True) }}" alt="logo" />
+  </a>
+  <h1>Sphinx</h1>
 </div>
 {% endblock %}
 
@@ -20,7 +21,7 @@
 <div class="related" role="navigation" aria-label="related navigation">
   <h3>{{ _('Navigation') }}</h3>
   <ul>
-    <li><a href="{{ pathto('index') }}">Documentation</a> &raquo;</li>
+    <li><a href="{{ pathto(root_doc)|e }}">Documentation</a> &raquo;</li>
     {%- for parent in parents %}
       <li class="nav-item nav-item-{{ loop.index }}"><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
     {%- endfor %}
diff --git a/doc/_themes/sphinx13/static/sphinx-logo.svg b/doc/_themes/sphinx13/static/sphinx-logo.svg
new file mode 100644
index 0000000..b2b83c7
--- /dev/null
+++ b/doc/_themes/sphinx13/static/sphinx-logo.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 7">
+<path d="M8.12 3.27c.45-.32 1.06-.46 1.78-.73l-.31-.7c-1.28.23-2.43-.53-3.68-.7C4 .75 2.24 1.9.36 2.04v.76c1.87.41 3.64 1.26 5.6 1.02-1.21 1.21-2.84 2.64-4.69 2.07C.63 5.77.35 4.87.96 4.6c.27 1.04 1.57.3 1-.52C1.57 3.6.54 3.82.24 4.3c-.87 1.65.84 2.56 2.31 2.32 1.86-.25 3.29-1.71 4.53-3.02-.02.61.18 1.96-.41 2.5l.01.9c.43-.34.8-1.07.92-1.56.16-.63.04-1.02.1-1.53.05-.23.1-.41.42-.64zM1.9 2.39c.77-.23 1.58-.58 2.39-.66-.42 1.38 1.81 1.54 1.56 0 .64.16 1 .3 1.94.7-2.06 1.02-4.05.56-5.89-.04z"/>
+<path d="M.36 1.81v-.8c.23 0 .84-.18 1.44-.35C2.8.36 4.05 0 4.95 0c1 0 2.05.34 2.82.58l.91.25c.62.07.98-.08.98-.08l.34.73c-.06.02-.56.24-1.41.15-.27-.03-.62-.14-1.06-.29C6.77 1.1 5.82.8 4.95.8c-.79 0-1.97.35-2.92.63-.74.21-1.32.38-1.67.38z"/>
+</svg>
diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css
index 674d211..3234a37 100644
--- a/doc/_themes/sphinx13/static/sphinx13.css
+++ b/doc/_themes/sphinx13/static/sphinx13.css
@@ -2,7 +2,7 @@
 
 /* Set master colours */
 :root {
-    --fonts-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+    --fonts-sans-serif: system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
     --colour-sphinx-blue: #0A507A;
     --colour-text: #333;
     --colour-links-light: #057;
@@ -15,8 +15,29 @@ body {
 }
 
 .pageheader {
+    display: flex;
+    column-gap: 1em;
+    align-items: center;
+    width: 100%;
     background-color: var(--colour-sphinx-blue);
-    padding: 10px 15px;
+    padding: 10px 20px;
+}
+
+.pageheader a {
+    width: 5%;
+}
+
+.pageheader img {
+    filter: invert(1) drop-shadow(1px 1px 2px black);
+}
+
+.pageheader h1{
+    color: white;
+    margin: 0;
+    font-weight: 600;
+    font-size: 3.5rem;
+    line-height: 1;
+    font-variant: small-caps;
 }
 
 div.document {
diff --git a/doc/_themes/sphinx13/static/sphinxheader.png b/doc/_themes/sphinx13/static/sphinxheader.png
deleted file mode 100644
index 845da4a..0000000
Binary files a/doc/_themes/sphinx13/static/sphinxheader.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/theme.conf b/doc/_themes/sphinx13/theme.conf
deleted file mode 100644
index 78bb78f..0000000
--- a/doc/_themes/sphinx13/theme.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[theme]
-inherit = basic
-pygments_style = default
-sidebars =
diff --git a/doc/_themes/sphinx13/theme.toml b/doc/_themes/sphinx13/theme.toml
new file mode 100644
index 0000000..ba4fb2b
--- /dev/null
+++ b/doc/_themes/sphinx13/theme.toml
@@ -0,0 +1,4 @@
+[theme]
+inherit = "basic"
+pygments_style = { default = "default" }
+sidebars = []
-- 
cgit v1.2.3