From 137681f1be361990c6a2d894abd5d215fe93dca6 Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Tue, 9 Jan 2024 13:47:46 -0500 Subject: [PATCH 1/6] Update layout.html Removed explicit py.svg references with theme_root_icon paths --- python_docs_theme/layout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html index 82b7ef4..5f893fc 100644 --- a/python_docs_theme/layout.html +++ b/python_docs_theme/layout.html @@ -14,7 +14,7 @@

{{ _('Navigation') }}

{%- endfor %} {%- block rootrellink %} -
  • python logo
    • +
  • python logo
  • {{theme_root_name}}{{ reldelim1 }}
  • @@ -100,7 +100,7 @@

    {{ _('Navigation') }}

    {%- if pagename != "search" and builder != "singlehtml" %} From 099019d948b7748b99779a42562308666411f1ef Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Wed, 10 Jan 2024 15:17:29 -0500 Subject: [PATCH 2/6] theme.conf root_icon and root_icon_alt_text variables interpolated in layout.html This fixes a partial integration of root_icon and adds the new variable root_icon_alt_text --- python_docs_theme/layout.html | 4 ++-- python_docs_theme/theme.conf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html index 5f893fc..1d5b5ee 100644 --- a/python_docs_theme/layout.html +++ b/python_docs_theme/layout.html @@ -14,7 +14,7 @@

    {{ _('Navigation') }}

    • {%- endfor %} {%- block rootrellink %} -
  • python logo
    • +
  • {{theme_root_icon_alt_text}}
  • {{theme_root_name}}{{ reldelim1 }}
  • @@ -100,7 +100,7 @@

    {{ _('Navigation') }}

    {%- if pagename != "search" and builder != "singlehtml" %} diff --git a/python_docs_theme/theme.conf b/python_docs_theme/theme.conf index 564c9c5..1cefe32 100644 --- a/python_docs_theme/theme.conf +++ b/python_docs_theme/theme.conf @@ -32,4 +32,5 @@ root_name = Python root_url = https://www.python.org/ root_icon = py.svg root_include_title = True +root_icon_alt_text = Python Logo copyright_url = From 47684e2a24ca937eb5087a554c8e803c2dcc6125 Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Wed, 10 Jan 2024 16:11:03 -0500 Subject: [PATCH 3/6] Apply suggestions from code review Capitalization fix Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- python_docs_theme/theme.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_docs_theme/theme.conf b/python_docs_theme/theme.conf index 1cefe32..2dec5db 100644 --- a/python_docs_theme/theme.conf +++ b/python_docs_theme/theme.conf @@ -32,5 +32,5 @@ root_name = Python root_url = https://www.python.org/ root_icon = py.svg root_include_title = True -root_icon_alt_text = Python Logo +root_icon_alt_text = Python logo copyright_url = From 0667e5998bb16ab096e3a0bd6c53e8d651f65b0b Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Thu, 11 Jan 2024 19:40:44 -0500 Subject: [PATCH 4/6] Options made adjacent in theme.conf for readability Co-authored-by: Ezio Melotti --- python_docs_theme/theme.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_docs_theme/theme.conf b/python_docs_theme/theme.conf index 2dec5db..e6008d9 100644 --- a/python_docs_theme/theme.conf +++ b/python_docs_theme/theme.conf @@ -31,6 +31,6 @@ license_url = root_name = Python root_url = https://www.python.org/ root_icon = py.svg -root_include_title = True root_icon_alt_text = Python logo +root_include_title = True copyright_url = From 5422219ca1a4c4aa74606d51edce8e2791d63ae2 Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Fri, 12 Jan 2024 12:31:15 -0500 Subject: [PATCH 5/6] Tildes instead of plus to concatenate strings in the new changes Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- python_docs_theme/layout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html index 1d5b5ee..69af688 100644 --- a/python_docs_theme/layout.html +++ b/python_docs_theme/layout.html @@ -14,7 +14,7 @@

    {{ _('Navigation') }}

    • {%- endfor %} {%- block rootrellink %} -
  • {{theme_root_icon_alt_text}}
    • +
  • {{ theme_root_icon_alt_text }}
  • {{theme_root_name}}{{ reldelim1 }}
  • @@ -100,7 +100,7 @@

    {{ _('Navigation') }}

    {%- if pagename != "search" and builder != "singlehtml" %} From 23abd2a184e631ebf6441bd3658e1f59eeeeabd3 Mon Sep 17 00:00:00 2001 From: Marko Budisic Date: Fri, 12 Jan 2024 12:33:16 -0500 Subject: [PATCH 6/6] Replaced + with ~ string concatenation everywhere in layout.html --- python_docs_theme/layout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html index 69af688..81433e0 100644 --- a/python_docs_theme/layout.html +++ b/python_docs_theme/layout.html @@ -71,7 +71,7 @@

    {{ _('Navigation') }}

    {%- block extrahead -%} - + {%- if builder != "htmlhelp" %} {%- if not embedded %} @@ -121,7 +121,7 @@

    {{ _('Navigation') }}

    {%- if logo %} {%- endif %}