ui: Update logo

jpmckinney · jpmckinney · commit 4e1041646a3f · 2025-01-29T10:58:20.000-05:00
diff --git a/common-requirements.in b/common-requirements.in
@@ -2,7 +2,7 @@ linkify-it-py
 myst-parser
 ocds-babel
 Sphinx
--e git+https://github.com/open-contracting/standard_theme.git@open_contracting#egg=standard_theme
+git+https://github.com/open-contracting/standard_theme.git@open_contracting#egg=standard_theme
 
 # Profile
 ocdsextensionregistry
diff --git a/common-requirements.txt b/common-requirements.txt
@@ -1,11 +1,5 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile common-requirements.in
-#
--e git+https://github.com/open-contracting/standard_theme.git@open_contracting#egg=standard_theme
-    # via -r common-requirements.in
+# This file was autogenerated by uv via the following command:
+#    uv pip compile common-requirements.in -o common-requirements.txt
 alabaster==0.7.12
     # via sphinx
 async-generator==1.10
@@ -50,7 +44,7 @@ docutils==0.18
     #   sphinx
 elastic-transport==8.4.0
     # via elasticsearch
-elasticsearch[requests]==8.6.2
+elasticsearch==8.6.2
     # via ocdsindex
 exceptiongroup==1.0.0
     # via pytest
@@ -65,7 +59,7 @@ imagesize==1.4.1
     # via sphinx
 iniconfig==1.1.1
     # via pytest
-jinja2==3.1.2
+jinja2==3.1.5
     # via
     #   myst-parser
     #   sphinx
@@ -104,6 +98,8 @@ packaging==21.3
     #   build
     #   pytest
     #   sphinx
+pip==25.0
+    # via pip-tools
 pip-tools==6.13.0
     # via -r common-requirements.in
 pluggy==0.13.1
@@ -136,6 +132,10 @@ requests-cache==0.5.2
     # via ocdsextensionregistry
 selenium==4.1.3
     # via -r common-requirements.in
+setuptools==75.8.0
+    # via
+    #   pip-tools
+    #   sphinx-intl
 six==1.15.0
     # via livereload
 sniffio==1.2.0
@@ -166,6 +166,8 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
+standard-theme @ git+https://github.com/open-contracting/standard_theme.git@d56505d69fceeb43535a3387172b2024eead536e#egg=standard_theme
+    # via -r common-requirements.in
 tomli==2.0.1
     # via
     #   build
@@ -183,7 +185,7 @@ typing-extensions==4.4.0
     # via myst-parser
 uc-micro-py==1.0.1
     # via linkify-it-py
-urllib3[secure,socks]==1.26.5
+urllib3==1.26.5
     # via
     #   elastic-transport
     #   requests
@@ -192,7 +194,3 @@ wheel==0.38.4
     # via pip-tools
 wsproto==1.1.0
     # via trio-websocket
-
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
diff --git a/docs/_static/basic.css b/docs/_static/basic.css
@@ -1,3 +1,12 @@
+.wy-side-nav-search {
+  margin: 0;
+  padding: 0;
+}
+.wy-side-nav-search > a, .wy-side-nav-search .wy-dropdown > a {
+  margin: 0;
+  padding: 0 6px;
+}
+
 #build-your-data-pipeline li {
   margin-bottom: 1em;
 }
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -4,19 +4,15 @@
 
 {% block mobile_nav %}
 <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-<a href="{{ pathto(master_doc) }}">{% trans %} Open Contracting {% endtrans %} {% trans %} Data Standard {% endtrans %} <small>v{{ version }}</small></a>
+<a href="{{ pathto(master_doc) }}">{% trans %}Open Contracting Data Standard{% endtrans %} <small>v{{ version }}</small></a>
 {% endblock %}
 
 {% block sidebartitle %}
-<a title="v{{release}}" class="oc-logo" href="{{ pathto(master_doc) }}">
-  <svg>
-    <use xlink:href="#ocp-logo-only" />
+<a href="{{ pathto(master_doc) }}">
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 330.7 163.07" style="enable-background:new 0 0 330.7 163.07; width: 100%" xml:space="preserve">
+    <title>{% trans %}Open Contracting Data Standard{% endtrans %}</title>
+    <style>.st0{fill:#c8d419}.st1{fill:#fff}</style><g id="Layer_1"><path class="st0" d="M77.07 45.97c0 8.36-6.27 13.87-14.17 13.87s-14.17-5.51-14.17-13.87S55 32.1 62.9 32.1s14.17 5.52 14.17 13.87zm-20.74 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.76.01-6.57 2.51-6.57 6.65z"/><path class="st1" d="M101.36 42.06c0 5.36-3.19 9.38-10.79 9.38h-3.15v7.83H80.2v-26.6h10.37c7.59.01 10.79 4.03 10.79 9.39zm-7.45 0c0-2.01-1.44-3-3.53-3h-2.96v6h2.96c2.08 0 3.53-.99 3.53-3zm27.7 10.6v6.61h-17.52v-26.6h16.95v6.61h-9.73v3.15h8.55v6.27h-8.55v3.95h10.3zm29.14 6.61h-5.62l-12.54-14.29h-.08v14.29h-7.22v-26.6h5.62l12.54 14.29h.08V32.68h7.22v26.59zM24.2 79.83c0-8.81 6.38-13.87 14.63-13.87 4.22 0 7.48 1.29 9.84 2.93l-3.8 6.19c-1.82-1.25-3.5-2.01-5.81-2.01-3.91 0-7.26 2.36-7.26 6.76 0 4.41 3.34 6.76 7.26 6.76 2.32 0 3.99-.76 5.81-2.01l3.8 6.19a17.03 17.03 0 0 1-9.84 2.93c-8.25 0-14.63-5.05-14.63-13.87z"/><path class="st0" d="M77.09 79.83c0 8.36-6.27 13.87-14.17 13.87s-14.17-5.51-14.17-13.87 6.27-13.87 14.17-13.87 14.17 5.51 14.17 13.87zm-20.75 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.75 0-6.57 2.51-6.57 6.65z"/><path class="st1" d="M105.66 93.13h-5.62L87.5 78.85h-.08v14.29H80.2v-26.6h5.62l12.54 14.29h.08v-14.3h7.22v26.6zm23.26-19.98h-6.65v19.98h-7.22V73.15h-6.65v-6.61h20.52v6.61zm16.8 19.98-6.84-9.88v9.88h-7.22v-26.6h11.36c7.03 0 10.03 4.14 10.03 8.74 0 3.53-1.79 6.69-5.7 7.98l7.37 9.88h-9zm-6.84-20.21v5.7h3.15c2.2 0 3.53-.91 3.53-2.89s-1.33-2.81-3.53-2.81h-3.15zm36.18 15.23h-9.08l-1.63 4.98h-7.98l10.3-26.6h7.71l10.3 26.6h-7.98l-1.64-4.98zm-1.82-5.7-2.7-8.32-2.74 8.32h5.44zm10.95-2.62c0-8.81 6.38-13.87 14.63-13.87 4.22 0 7.49 1.29 9.84 2.93l-3.8 6.19c-1.82-1.25-3.5-2.01-5.81-2.01-3.91 0-7.26 2.36-7.26 6.76 0 4.41 3.34 6.76 7.26 6.76 2.32 0 3.99-.76 5.81-2.01l3.8 6.19a17.03 17.03 0 0 1-9.84 2.93c-8.25 0-14.63-5.05-14.63-13.87zm46.82-6.68h-6.65v19.98h-7.22V73.15h-6.65v-6.61h20.52v6.61zm9.96 19.98h-7.22v-26.6h7.22v26.6zm30.09 0h-5.62L252.9 78.85h-.08v14.29h-7.22v-26.6h5.62l12.54 14.29h.08v-14.3h7.22v26.6zm30.51-12.88c0 7.79-4.48 13.45-12.96 13.45-8.66 0-14.44-5.66-14.44-13.91 0-7.9 5.32-13.83 14.82-13.83 4.29 0 7.6 1.22 10.64 3.42l-4.41 5.93a9.9 9.9 0 0 0-6.46-2.43c-4.37 0-6.99 2.85-6.99 6.95 0 3.88 2.36 6.95 7.18 6.95 3.42 0 5.05-1.52 5.36-3.34h-6.57v-6.08h13.72c.08 1.03.11 2.13.11 2.89zM62.8 107.94l-6.19 19h-7.98l10.3-26.6h7.71l10.3 26.6h-7.98l-6.16-19z"/></g><path class="st1" d="M49.59 113.61c0 8.28-5.55 13.3-14.48 13.3h-9.08v-26.6h9.08c9.01 0 14.48 5.01 14.48 13.3zm-16.34-6.84v13.68h1.9c4.1 0 6.84-2.28 6.84-6.84s-2.74-6.84-6.84-6.84h-1.9zm60.88-.12h-6.65v19.99h-7.22v-19.99h-6.65v-6.61h20.52v6.61zm14.52 15.28h-9.08l-1.63 4.98h-7.98l10.3-26.6h7.71l10.3 26.6h-7.98l-1.64-4.98zm-1.82-5.7-2.7-8.32-2.74 8.32h5.44zm37.24-14.25-3.12 6.42a12.66 12.66 0 0 0-6.5-2.13c-1.14 0-1.63.3-1.63.99 0 .49.3.87 1.41 1.44l5.47 2.81c2.81 1.44 4.94 3.34 4.94 7.52 0 5.47-3.65 8.44-10.45 8.44-3.95 0-7.64-.99-11.25-3l3.31-6.92c3.15 2.24 5.74 3.27 8.32 3.27 1.41 0 2.24-.3 2.24-1.18 0-.65-.46-.99-1.29-1.41l-5.81-2.92a8.05 8.05 0 0 1-4.71-7.52c0-4.75 3.31-8.05 9.99-8.05 2.77 0 5.66.57 9.08 2.24zm21.34 4.94h-6.65v19.99h-7.22v-19.99h-6.65v-6.61h20.52v6.61zm13.91 15.01h-9.08l-1.63 4.98h-7.98l10.3-26.6h7.71l10.3 26.6h-7.98l-1.64-4.98zm-1.83-5.7-2.7-8.32-2.74 8.32h5.44zm38.29 10.67h-5.62l-12.54-14.29h-.08v14.29h-7.22v-26.6h5.62l12.54 14.29h.08V100.3h7.22v26.6zm25.8-13.29c0 8.28-5.55 13.3-14.48 13.3h-9.08v-26.6h9.08c9.01 0 14.48 5.01 14.48 13.3zm-16.33-6.84v13.68h1.9c4.1 0 6.84-2.28 6.84-6.84s-2.74-6.84-6.84-6.84h-1.9zm32.14 15.16h-9.08l-1.63 4.98h-7.98l10.3-26.6h7.71l10.3 26.6h-7.98l-1.64-4.98zm-1.82-5.7-2.7-8.32-2.74 8.32h5.44zm26.89 10.67-6.84-9.88v9.88h-7.22v-26.6h11.36c7.03 0 10.03 4.14 10.03 8.74 0 3.53-1.79 6.69-5.7 7.98l7.37 9.88h-9zm-6.84-20.21v5.7h3.15c2.2 0 3.53-.91 3.53-2.89s-1.33-2.81-3.53-2.81h-3.15zm41.75 6.92c0 8.28-5.55 13.3-14.48 13.3h-9.08v-26.6h9.08c9 0 14.48 5.01 14.48 13.3zm-16.34-6.84v13.68h1.9c4.1 0 6.84-2.28 6.84-6.84s-2.74-6.84-6.84-6.84h-1.9z" id="Layer_2"/><path class="st1" d="M164.29 47.61c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.76 0-6.57 2.51-6.57 6.65zm22.95 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.76 0-6.57 2.51-6.57 6.65zm22.94 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.76 0-6.57 2.51-6.57 6.65zm45.89 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.75 0-6.57 2.51-6.57 6.65zm-22.94 0c0 4.14 2.81 6.65 6.57 6.65 3.76 0 6.57-2.51 6.57-6.65 0-4.14-2.81-6.65-6.57-6.65-3.76 0-6.57 2.51-6.57 6.65zm42.56 0c0 6.24 4.24 10.02 9.9 10.02 5.67 0 9.9-3.78 9.9-10.02s-4.24-10.02-9.9-10.02-9.9 3.78-9.9 10.02z" id="Layer_3"/>
   </svg>
-  <div class="oc-heading">
-    <h2>{% trans %} Open Contracting {% endtrans %}</h2>
-    <h2>{% trans %} Data Standard {% endtrans %}</h2>
-  </div>
-  <span>v{{version}}</span>
 </a>
 {% endblock %}
 
diff --git a/include/common.mk b/include/common.mk
@@ -159,7 +159,6 @@ $(LANGUAGES:.%=pdf.%): pdf.%: FORCE
 		--javascript-delay $(PDF_DELAY) \
 		--disable-smart-shrinking \
 		--print-media-type \
-		--header-html include/header.html \
 		toc https://standard.open-contracting.org$(PDF_ROOT)/$*/$(PDF_PAGES) $*.pdf
 
 .PHONY: pdf
diff --git a/include/header.html b/include/header.html
diff --git a/script/update b/script/update
@@ -4,7 +4,7 @@ set -euo pipefail
 function main {
     mkdir -p script include tests
 
-    for f in Makefile common-requirements.in common-requirements.txt .github/workflows/lint.yml .github/workflows/shell.yml docs/_static/favicon-16x16.ico include/common.mk include/prologue.mk include/header.html script/diff script/update tests/conftest.py tests/test_common.py; do
+    for f in Makefile common-requirements.in common-requirements.txt .github/workflows/lint.yml .github/workflows/shell.yml docs/_static/favicon-16x16.ico include/common.mk include/prologue.mk script/diff script/update tests/conftest.py tests/test_common.py; do
         curl -sS -o $f https://raw.githubusercontent.com/open-contracting/standard_profile_template/latest/$f
     done
 
