From 608cfc606c1d92676781d2c1d8f13d0360936aea Mon Sep 17 00:00:00 2001 From: Dusan Vuckovic Date: Mon, 25 Sep 2023 11:52:14 +0100 Subject: [PATCH 1/5] Maintenance: Make sidebar headers different across documentation repos. --- conf.py | 4 ++-- images/zammad_logo_70x61@2x.png | Bin 0 -> 4067 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/zammad_logo_70x61@2x.png diff --git a/conf.py b/conf.py index bd76fc76..ec31fce4 100644 --- a/conf.py +++ b/conf.py @@ -3,9 +3,9 @@ import time import sphinx_rtd_theme -html_logo = "images/zammad_logo_70x61.png" +html_logo = "images/zammad_logo_70x61@2x.png" html_favicon = "images/favicon.ico" -project = u'Zammad (for Users)' +project = u'Zammad User Documentation' copyright = u'%s, The Zammad Foundation' % time.strftime("%Y") author = u'The Zammad Foundation' diff --git a/images/zammad_logo_70x61@2x.png b/images/zammad_logo_70x61@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..67dc1d26caa8833d711cbeefc21eec8142c21f90 GIT binary patch literal 4067 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 literal 0 HcmV?d00001 From a9a747a4373141d5466e7419127fe16001b3e62f Mon Sep 17 00:00:00 2001 From: Dusan Vuckovic Date: Mon, 25 Sep 2023 11:52:19 +0100 Subject: [PATCH 2/5] chore: Update translation catalog. --- locale/user-docs.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/user-docs.pot b/locale/user-docs.pot index 556a1b51..32b675dc 100644 --- a/locale/user-docs.pot +++ b/locale/user-docs.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) 2023, The Zammad Foundation -# This file is distributed under the same license as the Zammad (for Users) package. +# This file is distributed under the same license as the Zammad User Documentation package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Zammad (for Users) pre-release\n" +"Project-Id-Version: Zammad User Documentation pre-release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-25 11:47+0200\n" +"POT-Creation-Date: 2023-09-25 14:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 020ea6e1596c01c70df505b88c6ef101967f2ea0 Mon Sep 17 00:00:00 2001 From: Dusan Vuckovic Date: Mon, 25 Sep 2023 11:53:40 +0100 Subject: [PATCH 3/5] fix: Add missing image size override. --- _static/theme/theme_overrides.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_static/theme/theme_overrides.css b/_static/theme/theme_overrides.css index e30c87f4..bce0c48d 100644 --- a/_static/theme/theme_overrides.css +++ b/_static/theme/theme_overrides.css @@ -104,3 +104,8 @@ article ul li ul { .wy-menu-vertical li.current a { color: #404040; } + +.wy-side-nav-search > a img.logo { + width: 70px; + height: 61px; +} From b98e90f2d8e0e4cb48eeda73d14d632410599a7b Mon Sep 17 00:00:00 2001 From: Dusan Vuckovic Date: Mon, 25 Sep 2023 14:14:32 +0100 Subject: [PATCH 4/5] fix: Add missing max-width style override. --- _static/theme/theme_overrides.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_static/theme/theme_overrides.css b/_static/theme/theme_overrides.css index bce0c48d..2ff732f3 100644 --- a/_static/theme/theme_overrides.css +++ b/_static/theme/theme_overrides.css @@ -1,3 +1,7 @@ +.wy-nav-content { + max-width: 1050px; +} + .wy-side-nav-search { background-color: #19191a; } From 9ba86af51d08725a51bd13aa5b7c06906691f8eb Mon Sep 17 00:00:00 2001 From: Dusan Vuckovic Date: Mon, 25 Sep 2023 14:19:07 +0100 Subject: [PATCH 5/5] fix: Drop superfluous image file. --- images/zammad_logo_70x61.png | Bin 3735 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/zammad_logo_70x61.png diff --git a/images/zammad_logo_70x61.png b/images/zammad_logo_70x61.png deleted file mode 100644 index b135305805e3e5a960549cb67745b1f14e525d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3735 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 B^Y8!w