From 71cb974ed78730e6965cbddc0d9800158a4f2fc7 Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Thu, 23 Jan 2025 13:35:31 +0100
Subject: [PATCH 1/5] Issue #1398 chore: Introduce config API overrides
---
src/Config/ConfigUibOverride.php | 41 ++++++++++++++++++++++++++++++++
uib_common_ui.services.yml | 5 ++++
2 files changed, 46 insertions(+)
create mode 100644 src/Config/ConfigUibOverride.php
create mode 100644 uib_common_ui.services.yml
diff --git a/src/Config/ConfigUibOverride.php b/src/Config/ConfigUibOverride.php
new file mode 100644
index 0000000..fb45e00
--- /dev/null
+++ b/src/Config/ConfigUibOverride.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\uib_common_ui\Config;
+
+use Drupal\Core\Config\ConfigFactoryOverrideInterface;
+use Drupal\Core\Config\StorageInterface;
+
+class ConfigUibOverride implements ConfigFactoryOverrideInterface {
+
+ /**
+ * @inheritDoc
+ */
+ public function loadOverrides($names): array {
+ if (in_array('gin_login.settings', $names, TRUE)) {
+ $overrides['gin_login.settings']['logo'] = ['path' => 'https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg'];
+ }
+ return $overrides ?? [];
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCacheSuffix() {
+ // TODO: Implement getCacheSuffix() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) {
+ // TODO: Implement createConfigObject() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCacheableMetadata($name) {
+ // TODO: Implement getCacheableMetadata() method.
+ }
+
+}
diff --git a/uib_common_ui.services.yml b/uib_common_ui.services.yml
new file mode 100644
index 0000000..e2a7a6e
--- /dev/null
+++ b/uib_common_ui.services.yml
@@ -0,0 +1,5 @@
+services:
+ uib_common_ui.overrider:
+ class: Drupal\uib_common_ui\Config\ConfigUibOverride
+ tags:
+ - {name: config.factory.override, priority: 5}
--
GitLab
From 7dc23c5401d1077e56e71c585660b4e5cc8794d8 Mon Sep 17 00:00:00 2001
From: Alvaro Martinez <alvaro@ramsalt.com>
Date: Tue, 28 Jan 2025 15:50:13 +0100
Subject: [PATCH 2/5] Issue #1398 chore: Add logo login file and change path in
config uib override.
---
public/image/uib_login_logo.svg | 3 +++
src/Config/ConfigUibOverride.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 public/image/uib_login_logo.svg
diff --git a/public/image/uib_login_logo.svg b/public/image/uib_login_logo.svg
new file mode 100644
index 0000000..39cba79
--- /dev/null
+++ b/public/image/uib_login_logo.svg
@@ -0,0 +1,3 @@
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M60 120C26.88 120 0 93.12 0 60C0 26.88 26.88 0 60 0C93.12 0 120 26.88 120 60C120 93.12 93.12 120 60 120ZM60 1.44C27.76 1.44 1.44 27.68 1.44 60C1.44 92.32 27.68 118.56 60 118.56C92.32 118.56 118.56 92.32 118.56 60C118.56 27.68 92.32 1.44 60 1.44ZM9.84 56.08C10.96 56.24 12.56 56.56 13.92 55.84C14.88 55.36 15.6 54.08 15.84 52.8C16 51.68 15.84 50.56 15.36 49.84C14.72 48.96 13.84 48.32 11.36 47.76C10.96 47.68 10.56 47.6 10.08 47.52C9.12 47.28 8.16 47.12 8.08 47.04C7.28 46.8 7.2 46.72 7.12 45.92C7.04 45.52 6.88 45.36 6.72 45.36C6.56 45.36 6.4 45.52 6.32 45.84C6.32 46 6.24 46.32 6.24 46.56C6.24 46.96 6.16 47.36 6.08 47.68C6 48 6 48.32 5.92 48.48C5.92 48.64 5.84 48.8 5.84 48.88C5.76 49.28 5.92 49.52 6.08 49.52C6.24 49.52 6.4 49.44 6.56 49.04C6.96 48 7.12 47.92 8.96 48.24C10 48.4 11.76 48.72 12.4 48.96C14.64 49.6 14.88 51.04 14.72 52.08C14.56 52.8 14.08 53.68 13.6 54C13.12 54.32 12.56 54.56 10.96 54.4C9.28 54.24 7.84 54 7.04 53.76C6.16 53.6 6.08 53.44 6 52.64C6 52.4 5.84 52.08 5.68 52C5.6 52 5.52 52 5.52 52.08C5.44 52.16 5.36 52.32 5.28 52.56C5.28 52.64 5.28 52.8 5.28 52.96C5.28 53.2 5.2 53.6 5.12 54.08C5.12 54.32 5.04 54.72 4.96 55.04C4.88 55.36 4.8 55.68 4.8 55.92C4.72 56.24 4.72 56.48 4.8 56.64C4.8 56.72 4.88 56.72 4.96 56.72C4.96 56.72 4.96 56.72 5.04 56.72C5.2 56.72 5.36 56.56 5.52 56.24C5.76 55.68 5.92 55.44 6.56 55.52H6.72C7.2 55.68 8.32 55.84 9.84 56.08ZM8.56 39.36C8.72 39.44 9.04 39.36 9.28 39.12C9.6 38.72 9.92 38.48 10.16 38.4C10.72 38.24 10.96 38.24 11.12 38.32C11.52 38.56 15.6 40.88 16.56 41.44C17.2 41.84 17.44 42.08 17.2 43.12C17.12 43.44 17.2 43.68 17.36 43.76H17.44C17.52 43.76 17.6 43.76 17.6 43.68C17.68 43.6 17.76 43.52 17.84 43.36C17.84 43.28 17.92 43.12 18 42.96C18.16 42.64 18.4 42.08 18.64 41.6C18.72 41.44 18.88 41.28 18.96 41.04C19.04 40.88 19.2 40.72 19.28 40.48C19.36 40.32 19.44 40.16 19.36 40C19.36 39.92 19.28 39.92 19.28 39.84C19.04 39.68 18.88 39.84 18.56 40.08C17.92 40.72 17.68 40.72 16.4 40.08C16 40 14.4 39.2 13.76 38.88C13.28 38.64 12.88 38.4 12.56 38.24C12.48 38.16 12.4 38.08 12.24 38.08C12.16 38 12.16 38 12.16 37.92C13.2 37.68 17.76 36.56 18.72 36.4C19.36 36.24 20.72 36 21.44 35.92C21.84 35.84 22.16 35.68 22.24 35.52C22.32 35.44 22.32 35.36 22.24 35.28C22.16 35.12 22 34.96 21.6 34.72C21.28 34.56 20.8 34.32 20.4 34.16C20 34 19.6 33.76 19.28 33.6C17.92 32.88 14.88 31.12 14.48 30.8C14.16 30.56 14.08 30.24 14.16 29.76C14.24 29.2 14.24 29.04 14.08 28.96C13.92 28.88 13.68 28.96 13.52 29.28C13.44 29.44 13.36 29.6 13.28 29.84C13.12 30.24 12.88 30.64 12.72 31.04C12.64 31.2 12.56 31.28 12.48 31.44C12.4 31.6 12.32 31.76 12.16 32.08C12 32.4 12 32.64 12.16 32.72C12.16 32.72 12.48 32.88 12.8 32.48C13.52 31.6 13.68 31.68 14.88 32.24H14.96C16.16 32.8 18.56 34.16 18.88 34.4V34.48C18.4 34.64 16.32 35.12 14.64 35.52C13.68 35.76 12.88 36 12.4 36.08C11.36 36.32 10.32 36.56 10 36.56C10 36.56 9.68 36.64 9.6 36.8C9.44 37.04 9.2 37.44 8.96 37.84C8.72 38.24 8.48 38.72 8.32 38.96C8.4 39.12 8.4 39.28 8.56 39.36ZM19.28 23.6C20.16 23.04 20.32 23.12 21.36 24.08L23.12 25.76C24.08 26.72 25.6 28.24 25.84 28.48C26 28.72 26.08 28.88 25.68 29.68C25.6 29.92 25.52 30.16 25.68 30.32C25.68 30.32 25.76 30.4 25.84 30.4C26 30.4 26.16 30.32 26.24 30.16C26.32 30.08 26.48 29.84 26.64 29.68C26.88 29.36 27.2 29.04 27.44 28.72C27.68 28.48 28.16 28 28.48 27.68C28.64 27.52 28.8 27.36 28.88 27.36C28.96 27.28 29.12 27.04 29.12 26.88C29.12 26.8 29.12 26.72 29.04 26.72C28.96 26.64 28.8 26.56 28.4 26.8C27.6 27.36 27.36 27.36 26.72 26.8C26.72 26.8 26.64 26.72 26.48 26.64C26.16 26.32 25.6 25.76 24.56 24.88C24.4 24.72 24.16 24.48 23.92 24.24C23.2 23.52 22.32 22.72 22 22.4C21.44 21.76 21.36 21.6 21.84 20.8C21.92 20.64 22 20.4 21.84 20.24C21.68 20.08 21.44 20.16 21.28 20.32C21.12 20.48 21.04 20.64 20.88 20.8C20.64 21.04 20.4 21.36 20 21.76C19.68 22.08 19.36 22.4 19.12 22.56C18.96 22.72 18.8 22.8 18.72 22.96C18.56 23.12 18.48 23.28 18.48 23.44C18.48 23.52 18.48 23.52 18.56 23.6C18.8 23.76 18.96 23.84 19.28 23.6ZM27.04 16.24C27.84 16 28 16.08 28.48 16.32C29.2 16.72 33.44 19.92 34.16 20.48C34.72 20.96 35.44 21.44 35.68 21.76C35.76 21.84 35.76 21.84 35.84 21.92C36 22 36.08 22.08 36.24 22.08C36.32 22.08 36.32 22.08 36.4 22.08C36.56 21.92 36.64 21.6 36.64 21.36C36.64 21.28 36.56 20.96 36.48 20.64C36.4 20.24 36.24 19.68 36.16 19.2C35.68 16.56 35.36 13.76 35.28 12.72C35.2 12 35.2 11.52 35.76 10.96C36 10.72 36.16 10.48 36.08 10.24C36.08 10.16 36 10.16 35.92 10.16C35.76 10.16 35.6 10.16 35.44 10.32C35.2 10.48 35.04 10.56 34.88 10.72C34.72 10.88 34.48 10.96 34.24 11.2C34 11.36 33.76 11.52 33.52 11.6C33.36 11.68 33.2 11.76 33.04 11.84C32.72 12.08 32.56 12.24 32.72 12.48C32.8 12.64 33.04 12.64 33.36 12.64C34.16 12.48 34.24 12.48 34.48 13.28C34.72 14.32 35.2 17.36 35.44 19.12V19.2H35.36C34.88 19.04 30.72 15.84 30.32 15.44C30 15.12 30.08 14.96 30.32 14.64C30.56 14.4 30.64 14.16 30.56 14C30.48 13.92 30.4 13.84 30.32 13.84C30.16 13.84 30.08 13.84 29.92 14C29.76 14.08 29.52 14.24 29.36 14.4C29.12 14.56 28.88 14.72 28.56 14.88C28.32 15.04 28 15.2 27.68 15.36C27.44 15.52 27.12 15.68 26.88 15.76C26.72 15.84 26.56 16 26.56 16.16C26.56 16.24 26.56 16.32 26.56 16.32C26.4 16.24 26.64 16.32 27.04 16.24ZM42.24 8.24C42.8 8.24 43.12 8.32 43.28 8.72C43.36 8.96 44 11.04 44.72 13.68C44.96 14.72 45.12 15.12 45.2 15.6C45.28 16.16 45.2 16.32 44.24 16.88C43.92 17.04 43.76 17.28 43.84 17.52C43.84 17.6 43.92 17.68 44.08 17.68C44.16 17.68 44.32 17.68 44.48 17.6C44.8 17.52 45.2 17.36 45.68 17.28C46.24 17.12 46.8 16.88 47.36 16.8C49.36 16.24 50.24 16.08 50.72 15.92C50.96 15.84 51.12 15.84 51.36 15.76C51.44 15.76 51.76 15.52 51.84 15.28C51.84 15.28 52 14.24 52 13.68C52 13.44 51.92 13.12 51.76 13.04C51.68 13.04 51.6 12.96 51.6 13.04C51.44 13.12 51.36 13.28 51.2 13.68C51.2 13.76 51.12 13.76 51.12 13.84C50.96 14.4 50.8 14.8 50.4 15.04C50.08 15.2 49.84 15.36 49.28 15.52C47.92 15.92 47.52 15.68 47.44 15.68C47.36 15.68 47.2 15.44 47.04 14.96V14.88C46.96 14.56 46.72 13.92 46.4 12.72C46.4 12.56 46.4 12.4 46.4 12.32C47.12 12.16 47.52 12 48.16 11.92C48.48 11.84 48.64 12 48.88 12.32C49.12 12.64 49.28 12.72 49.44 12.64C49.52 12.64 49.6 12.56 49.6 12.48C49.68 12.4 49.68 12.24 49.6 11.92C49.52 11.68 49.36 11.2 49.28 10.88C49.2 10.64 49.2 10.4 49.12 10.16V10.08C49.04 9.76 48.96 9.6 48.88 9.52C48.8 9.52 48.72 9.44 48.64 9.52C48.48 9.6 48.4 9.76 48.32 10.08C48.24 10.56 48.16 10.8 47.12 11.12C46.88 11.2 46.24 11.36 46.08 11.36C46 11.36 45.92 11.2 45.84 11.04C45.52 9.92 45.2 8.56 45.12 8.08C45.12 8 45.2 7.84 45.2 7.84C45.28 7.84 45.44 7.76 45.68 7.68C46.16 7.52 46.88 7.28 47.52 7.12C47.6 7.12 47.84 7.12 48.24 7.52C48.72 8.08 48.96 8.24 49.2 8.24C49.36 8.16 49.44 7.92 49.36 7.68C49.28 7.36 48.8 6.24 48.64 6.08C48.48 6 48.4 5.92 48.16 6C48.08 6 48 6.08 47.92 6.08C47.6 6.16 47.04 6.4 46 6.64L44.32 7.12C43.6 7.28 42.96 7.44 42.48 7.52C42.24 7.6 42.08 7.6 42 7.6C41.76 7.68 41.52 7.84 41.6 8C41.6 8.16 41.84 8.24 42.08 8.24C42.08 8.24 42.16 8.24 42.24 8.24ZM60.24 14.96C60.56 14.96 60.88 14.8 60.88 14.64C60.88 14.4 60.72 14.32 60.4 14.24C59.68 14 59.44 13.84 59.44 13.28C59.36 12.72 59.36 12 59.44 10.56C59.44 10.48 59.52 10.32 59.6 10.32C60.08 10.32 60.48 10.4 60.8 10.88C60.88 10.96 60.96 11.12 61.04 11.28C61.44 11.92 62.08 12.88 62.56 13.52C63.68 15.12 64.72 15.28 65.6 15.28C65.76 15.28 65.92 15.28 66.16 15.2C66.48 15.12 66.56 14.96 66.56 14.8C66.56 14.72 66.48 14.56 66.32 14.48C65.68 14.32 65.28 14.08 64.48 13.2C63.76 12.32 62.64 10.56 62.4 10.08C62.32 10 62.4 9.84 62.4 9.84C62.56 9.76 63.28 9.36 63.44 9.2C63.92 8.8 64.24 8.08 64.24 7.44C64.24 6.56 63.92 5.92 63.2 5.36C62.8 5.04 62.16 4.72 60.72 4.64C60.24 4.64 59.84 4.64 59.52 4.64C59.2 4.64 58.8 4.64 58.48 4.64H57.04C56.88 4.64 56.72 4.64 56.56 4.72C56.4 4.8 56.32 4.88 56.32 5.04C56.32 5.2 56.56 5.36 56.8 5.44C57.36 5.52 57.6 5.76 57.68 6.08C57.68 6.48 57.76 7.04 57.68 9.04C57.6 12 57.6 12.48 57.6 13.12C57.52 13.92 57.36 14 56.72 14.16C56.4 14.24 56.24 14.4 56.24 14.56C56.24 14.8 56.48 14.88 56.88 14.88C57.2 14.88 57.44 14.88 57.68 14.88C57.92 14.88 58.08 14.88 58.32 14.88C58.64 14.88 59.04 14.88 59.44 14.96C59.76 14.96 60.08 14.96 60.24 14.96ZM60.24 5.36C60.96 5.36 61.6 5.6 61.92 6C62.24 6.4 62.4 6.88 62.4 7.52C62.4 8.24 62.08 8.8 61.84 8.96C61.52 9.2 60.64 9.52 60.4 9.52C60 9.52 59.76 9.44 59.44 9.36C59.36 9.36 59.36 9.28 59.36 9.2C59.36 8.4 59.36 6.64 59.36 5.76C59.36 5.6 59.44 5.52 59.52 5.44C59.76 5.44 60.08 5.36 60.24 5.36ZM75.04 17.44C75.36 17.44 75.68 17.44 76 17.36C76.72 17.2 77.68 16.56 77.92 15.6C78.4 14 77.52 12.88 76.32 11.52C75.28 10.32 75.04 9.76 75.28 8.88C75.44 8.48 75.68 8.24 76 8C76.4 7.84 76.8 7.76 77.2 7.92C78.16 8.24 78.64 8.96 78.64 10.08C78.64 10.16 78.64 10.56 78.8 10.56C79.04 10.64 79.28 10.48 79.44 10.08C79.52 9.92 79.52 9.68 79.6 9.44C79.68 9.2 79.68 8.96 79.76 8.88C79.84 8.72 79.84 8.4 79.68 8.32C79.6 8.24 79.52 8.16 79.36 8.16C78.88 7.84 78.4 7.52 77.76 7.36C77.04 7.12 76.24 7.04 75.6 7.2C75.04 7.36 74 7.76 73.6 8.96C73.12 10.48 73.92 11.76 74.8 12.72C76.16 14.32 76.32 14.96 76.08 15.6C75.76 16.64 74.72 16.8 74.08 16.64C73.6 16.48 72.48 15.92 72.24 14.08V14C72.16 13.76 72.16 13.52 71.92 13.44C71.84 13.44 71.76 13.44 71.76 13.44C71.6 13.52 71.52 13.68 71.44 13.92C71.28 14.32 71.2 14.96 71.2 15.44C71.2 15.68 71.28 15.76 71.36 15.84C71.6 16.24 72.72 16.88 73.52 17.12C73.92 17.36 74.48 17.44 75.04 17.44ZM90.32 14.48C90.48 14.56 90.72 14.56 90.8 14.4C90.88 14.32 90.88 14.24 90.8 14.16C90.8 14 90.72 13.92 90.56 13.84C90.4 13.76 90.24 13.68 90 13.52C89.68 13.36 89.36 13.12 88.88 12.88C88.48 12.64 88.16 12.4 87.84 12.24C87.68 12.08 87.52 12 87.44 11.92C87.28 11.76 86.88 11.76 86.8 11.92C86.72 12.08 86.72 12.24 86.96 12.48C87.68 13.2 87.68 13.36 86.96 14.56L85.68 16.64C84.96 17.76 83.76 19.6 83.6 19.84C83.36 20.08 83.2 20.16 82.4 20C82.16 19.92 81.84 20 81.76 20.16C81.76 20.24 81.76 20.24 81.76 20.32C81.76 20.48 81.92 20.56 82.08 20.72C82.16 20.8 82.4 20.88 82.64 21.04C82.96 21.2 83.44 21.44 83.76 21.6C84.08 21.76 84.64 22.16 85.04 22.4C85.2 22.56 85.36 22.64 85.44 22.64C85.52 22.72 85.68 22.8 85.84 22.8C85.92 22.8 86.08 22.8 86.08 22.64C86.16 22.56 86.16 22.4 85.92 22.08C85.2 21.36 85.2 21.12 85.52 20.48C85.52 20.4 85.6 20.32 85.68 20.16C85.92 19.76 86.32 19.12 86.96 18C87.12 17.76 87.28 17.52 87.44 17.2C87.92 16.32 88.56 15.36 88.88 14.96C89.28 14.32 89.36 14.16 90.32 14.48ZM92 28.16C92.24 28.4 92.48 28.64 92.88 29.04C93.36 29.6 93.92 30.24 94.24 30.64C94.4 30.8 94.48 30.88 94.48 30.96C94.64 31.12 94.8 31.2 94.96 31.2C95.04 31.2 95.12 31.2 95.12 31.12C95.28 30.96 95.2 30.72 95.04 30.4L94.96 30.32C94.64 29.6 94.56 29.36 95.36 28.56C95.84 28 96.72 27.2 97.44 26.56C97.6 26.4 97.68 26.32 97.84 26.24C98.64 25.52 100.16 24.16 100.48 23.92C100.56 23.84 100.72 23.92 100.72 23.92C101.76 25.12 102.16 25.52 102.24 25.68C102.48 26.08 102.64 26.32 102 27.28C101.92 27.44 101.84 27.68 101.92 27.84C102.08 28 102.4 28 102.64 27.76C103.28 27.2 103.92 26.8 104.16 26.56C104.24 26.48 104.32 26.48 104.32 26.4C104.4 26.32 104.4 25.92 104.32 25.84C104.24 25.76 104.08 25.76 103.92 25.76H103.84C103.68 25.76 103.44 25.6 102.8 24.88L99.04 20.8C98.72 20.48 98.72 20.48 98.56 20.24L98.4 20C98.08 19.6 98 19.44 98 19.12C98 18.96 97.92 18.88 97.92 18.8C97.84 18.72 97.68 18.72 97.6 18.72C97.52 18.72 97.44 18.72 97.44 18.8C97.12 19.2 96.72 19.44 96.32 19.68C96.16 19.84 96 19.92 95.84 20.08C95.6 20.24 95.52 20.4 95.52 20.56C95.52 20.64 95.52 20.72 95.6 20.8C95.68 20.88 95.92 20.88 96.24 20.8C97.04 20.48 97.6 20.48 97.84 20.8C97.92 20.88 98.16 21.12 98.4 21.44C98.72 21.84 99.12 22.24 99.28 22.4C99.28 22.4 99.28 22.64 99.12 22.72L97.52 24.24C96.24 25.44 95.2 26.32 94.64 26.88C94.4 27.12 94.24 27.2 94.16 27.28C93.36 28 93.12 27.84 92.16 27.28C91.84 27.12 91.6 27.04 91.52 27.2C91.36 27.36 91.36 27.6 91.6 27.84C91.68 27.84 91.84 28 92 28.16ZM100.8 36.8C100.32 36.8 99.92 36.64 99.44 36.08C99.12 35.76 98.96 35.76 98.8 35.84C98.64 35.92 98.64 36.16 98.8 36.48C98.96 36.8 99.04 37.04 99.2 37.2C99.28 37.36 99.44 37.6 99.52 37.84C99.68 38.08 99.76 38.48 99.92 38.72C100 38.88 100 39.04 100.08 39.04C100.24 39.44 100.56 39.52 100.72 39.44C100.88 39.36 100.88 39.12 100.88 38.96C100.8 38.16 100.96 38.08 101.12 38C101.36 37.84 102.48 37.76 103.12 37.68H103.28C103.36 37.68 103.52 37.76 103.6 37.84C103.84 38.24 104.48 39.6 104.72 40.16L104.8 40.32C104.88 40.48 104.8 40.72 104.8 40.8C104.32 41.28 103.68 41.92 103.36 42.24C102.96 42.56 102.8 42.64 102.32 42.08C102.08 41.76 101.84 41.84 101.76 41.92C101.68 41.92 101.68 42 101.68 42.08C101.6 42.24 101.68 42.4 101.76 42.56C101.84 42.8 101.92 42.88 102 43.04C102.08 43.2 102.16 43.36 102.32 43.68C102.48 44.08 102.64 44.4 102.8 44.8C102.96 45.12 103.12 45.52 103.28 45.92C103.36 46.16 103.52 46.24 103.6 46.24H103.68C103.76 46.16 104 46.08 103.92 45.52C103.84 44.64 103.84 44.48 104.48 43.76C106.64 41.52 108.48 39.6 109.68 38.4C109.92 38.16 110.16 38 110.32 37.84C110.8 37.44 110.96 37.28 110.88 37.12C110.88 37.04 110.72 36.88 110.56 36.88C110.32 36.8 110 36.56 109.84 36.48C109.76 36.48 109.68 36.4 109.6 36.48C109.52 36.56 109.36 36.56 109.12 36.56C106.8 36.72 102.56 36.96 101.2 36.96C100.88 36.8 100.88 36.8 100.8 36.8ZM104.56 37.6C104.56 37.52 104.56 37.52 104.56 37.52L104.64 37.44C105.76 37.36 107.2 37.2 108.08 37.12C108.08 37.12 108.16 37.12 108.16 37.2V37.28C108 37.52 106.4 39.2 105.76 39.76H105.68H105.6C105.36 39.52 104.64 37.92 104.56 37.6ZM115.12 52.96C115.04 52.24 114.72 51.44 114.32 50.96C113.92 50.48 113.12 49.76 111.84 49.92C110.24 50.16 109.52 51.44 108.96 52.64C108.08 54.56 107.6 54.96 106.96 55.04C105.84 55.2 105.28 54.32 105.2 53.68C105.04 52.64 105.6 51.6 106.64 50.96L106.72 50.88C106.88 50.72 107.12 50.64 107.04 50.4C107.04 50.32 106.96 50.32 106.96 50.24C106.88 50.16 106.64 50.08 106.4 50.16C106.08 50.24 105.36 50.32 104.88 50.64C104.72 50.72 104.64 50.88 104.56 50.96C104.32 51.36 104.24 52.64 104.32 53.52C104.4 54.24 104.8 55.2 105.28 55.76C105.76 56.32 106.48 56.8 107.36 56.8C107.44 56.8 107.6 56.8 107.68 56.8C109.36 56.56 110 55.28 110.64 53.6C111.28 52.08 111.68 51.68 112.56 51.52C113.44 51.36 114.16 52.08 114.32 52.88C114.48 53.84 114 54.64 113.04 55.12C112.96 55.2 112.64 55.28 112.64 55.52C112.64 55.68 112.72 55.76 112.88 55.84C112.96 55.92 113.2 55.92 113.36 55.92C113.52 55.92 113.76 55.84 114 55.76C114.24 55.68 114.48 55.68 114.56 55.68C114.72 55.68 115.04 55.52 115.04 55.36C115.04 55.2 115.04 55.12 115.12 55.04C115.2 54.24 115.28 53.6 115.12 52.96ZM14.24 79.52C14.24 79.44 14.32 79.44 14.32 79.36C14.56 79.6 15.04 80 15.2 80C15.68 80.16 16.16 80.16 16.72 80C17.36 79.76 17.92 79.2 18.08 78.48C18.32 77.84 18.16 76.88 17.84 75.92C17.6 75.28 17.36 74.72 17.12 74.24C16.96 73.92 16.8 73.6 16.72 73.36L16.4 72.48C16.24 72.08 16.08 71.92 15.84 72C15.68 72.08 15.6 72.32 15.6 72.56C15.76 73.44 15.68 73.6 15.2 73.84C14.8 74.08 13.28 74.64 12.4 74.96C9.44 76.08 9.04 76.16 8.8 76.24H8.72C7.92 76.48 7.76 76.24 7.36 75.6C7.12 75.28 6.96 75.04 6.72 75.12C6.48 75.2 6.48 75.52 6.64 75.76C6.64 75.84 6.72 76 6.8 76.16C6.88 76.4 7.04 76.64 7.12 76.96C7.2 77.2 7.28 77.44 7.36 77.68C7.52 78.16 7.68 78.8 7.92 79.44C8.24 80.24 8.64 80.96 9.04 81.44C9.44 81.92 10.24 82.56 11.36 82.56C11.68 82.56 12 82.48 12.4 82.4C13.92 81.92 14.24 80.56 14.24 79.52ZM14.24 78.4C14.08 78.24 13.6 77.68 13.36 76.88C13.28 76.72 13.28 76.48 13.36 76.4C13.6 76.24 15.36 75.6 16.4 75.28H16.48C16.56 75.28 16.64 75.28 16.64 75.36C16.72 75.44 16.8 75.6 16.88 75.76C17.12 76.4 17.12 77.04 16.96 77.52C16.8 77.92 16.4 78.24 15.92 78.48C15.04 78.8 14.4 78.48 14.24 78.4ZM11.76 80.64C11.36 80.8 10.96 80.8 10.4 80.8C10.08 80.8 9.2 80.24 8.88 79.52C8.8 79.28 8.8 78.32 9.28 78C9.76 77.68 11.76 76.96 12.08 76.88C12.08 76.88 12.16 76.88 12.24 76.88C12.4 76.88 12.48 76.96 12.56 76.96C12.64 77.04 12.8 77.36 12.88 77.6C13.28 78.72 13.2 80.08 11.76 80.64ZM26.32 90.48C26.4 90.32 26.32 90.16 26.16 90.08C26.08 90 26.08 89.92 26 89.92C25.76 89.68 25.44 89.28 24.72 88.32L23.68 86.96C23.28 86.4 22.88 85.84 22.56 85.44C22.4 85.28 22.32 85.12 22.24 85.04C22.16 84.88 22 84.8 21.84 84.8C21.76 84.8 21.68 84.8 21.68 84.88C21.6 84.96 21.52 85.2 21.68 85.52C22 86.16 22 86.48 21.68 86.8C21.52 86.96 19.76 88.4 17.68 90C16.88 90.64 16.48 90.88 16.08 91.2C15.6 91.52 15.36 91.52 14.48 90.8C14.16 90.56 13.92 90.48 13.76 90.64L13.68 90.72C13.68 90.88 13.76 91.04 13.92 91.28C14.08 91.52 14.4 91.84 14.72 92.24C15.12 92.64 15.52 93.12 15.84 93.6C17.12 95.2 17.6 95.92 17.92 96.4C18.08 96.56 18.16 96.72 18.32 96.88C18.4 96.96 18.64 97.12 18.88 97.12H18.96C18.96 97.12 20 96.88 20.48 96.64C20.72 96.56 20.96 96.32 21.04 96.16C21.04 96.08 21.04 96 21.04 96C20.88 95.84 20.72 95.84 20.32 95.92C20.24 95.92 20.16 95.92 20.16 95.92C19.52 96 19.12 95.92 18.8 95.68C18.48 95.44 18.32 95.28 17.92 94.8C17.04 93.68 17.04 93.2 17.04 93.12C17.04 93.04 17.2 92.8 17.6 92.48L17.68 92.4C17.92 92.16 18.4 91.76 19.44 90.96C19.6 90.88 19.84 90.8 19.84 90.8C20.32 91.36 20.56 91.68 20.88 92.24C21.04 92.48 21.04 92.72 20.72 93.12C20.56 93.44 20.56 93.68 20.64 93.76C20.64 93.84 20.72 93.84 20.8 93.84C20.88 93.84 21.04 93.84 21.28 93.6C21.44 93.44 21.84 93.12 22.08 92.88C22.32 92.72 22.48 92.56 22.64 92.48L22.72 92.4C22.96 92.24 23.12 92.08 23.12 91.92C23.12 91.84 23.12 91.76 23.04 91.68C22.96 91.52 22.72 91.52 22.4 91.6C21.92 91.76 21.68 91.68 20.96 90.96C20.8 90.8 20.4 90.24 20.32 90.08C20.32 90.08 20.32 90.08 20.32 90C20.32 89.92 20.48 89.76 20.56 89.68C21.44 88.96 22.56 88.08 22.96 87.84C23.04 87.84 23.2 87.76 23.2 87.76C23.28 87.84 23.36 87.92 23.52 88.16C23.84 88.56 24.32 89.12 24.72 89.68C24.8 89.76 24.88 90 24.64 90.48C24.32 91.2 24.24 91.44 24.4 91.6C24.48 91.76 24.8 91.68 24.96 91.52C25.36 91.52 26.24 90.64 26.32 90.48ZM34.72 97.36C34.32 97.12 34 96.88 33.68 96.72C33.36 96.56 33.12 96.4 32.8 96.16L31.6 95.36C31.44 95.28 31.28 95.2 31.2 95.12C31.04 95.12 30.96 95.12 30.88 95.28C30.8 95.44 30.88 95.68 31.12 95.92C31.52 96.32 31.68 96.64 31.52 96.88C31.36 97.2 31.04 97.76 29.92 99.36C28.32 101.84 28 102.24 27.68 102.72C27.2 103.36 27.04 103.36 26.32 103.12C26 103.04 25.76 103.04 25.68 103.2C25.6 103.28 25.6 103.36 25.68 103.52C25.76 103.6 25.84 103.76 26 103.84C26.24 104 26.48 104.16 26.72 104.24C26.88 104.32 27.12 104.48 27.28 104.56C27.52 104.72 27.84 104.96 28.16 105.2C28.4 105.36 28.64 105.52 28.8 105.68C28.96 105.76 29.2 105.84 29.36 105.84C29.44 105.84 29.52 105.76 29.52 105.76C29.68 105.6 29.52 105.36 29.36 105.12C28.88 104.48 28.8 104.24 29.12 103.76C29.44 103.28 29.76 102.64 30.56 101.52C30.56 101.44 30.72 101.36 30.8 101.44C31.2 101.76 31.52 101.92 31.52 102.56C31.52 102.64 31.52 102.88 31.52 103.04C31.52 103.76 31.52 104.96 31.6 105.76C31.76 107.68 32.48 108.4 33.2 108.88C33.36 108.96 33.76 109.2 34 109.2H34.08C34.16 109.2 34.24 109.12 34.24 109.12C34.32 109.04 34.32 108.88 34.16 108.72C33.76 108.24 33.52 107.76 33.28 106.64C33.12 105.52 33.2 103.44 33.28 102.88C33.28 102.8 33.36 102.72 33.44 102.72C33.68 102.72 34.4 102.8 34.64 102.72C35.28 102.64 35.92 102.24 36.32 101.68C36.8 100.96 36.88 100.16 36.64 99.36C36.32 98.88 36 98.24 34.72 97.36ZM34.64 100.8C34.24 101.36 33.68 101.68 33.36 101.68C32.96 101.76 32.08 101.52 31.84 101.36C31.52 101.2 31.28 100.96 31.12 100.72C31.12 100.64 31.12 100.64 31.12 100.56C32 99.12 32.64 98.16 33.04 97.68C33.12 97.6 33.2 97.52 33.28 97.52C33.44 97.52 33.76 97.68 33.92 97.76C35.12 98.56 35.36 99.68 34.64 100.8ZM46 105.04C46.88 104.32 48 104.16 49.12 104.48C50 104.72 50.8 105.28 51.2 106C51.52 106.48 51.6 106.88 51.76 107.28C51.84 107.6 51.92 107.76 52.16 107.84C52.24 107.84 52.4 107.84 52.48 107.68C52.56 107.6 52.64 107.52 52.64 107.36C52.8 106.72 52.72 105.68 52.72 105.36C52.72 105.12 52.64 105.04 52.4 104.88C52.32 104.8 52.24 104.8 52.16 104.8C52 104.72 51.92 104.72 51.68 104.56L51.6 104.48C51.04 104.16 50.48 103.84 49.52 103.6C48.16 103.28 46.48 103.28 45.36 103.84C43.76 104.48 42.72 105.68 42.32 107.2C42 108.4 42.08 109.6 42.48 110.64C42.88 111.6 43.92 113.28 46.88 114C47.68 114.24 48.48 114.24 49.04 114.24C49.12 114.24 49.2 114.24 49.2 114.24C49.6 114.24 49.76 114.16 50 114.16C50.16 114.16 50.24 114.08 50.4 114.08C50.56 114.08 50.72 113.92 50.72 113.84C50.72 113.76 50.8 113.68 50.8 113.52V113.44C50.8 113.28 50.88 112.88 51.04 112.24C51.12 111.92 51.28 111.44 51.36 111.04C51.44 110.8 51.52 110.64 52.08 110.64C52.48 110.56 52.64 110.48 52.72 110.4C52.8 110.16 52.64 110 52.32 109.92C52.16 109.84 51.92 109.84 51.6 109.76C51.2 109.68 50.8 109.6 50.56 109.52C50.32 109.44 50 109.36 49.84 109.28C49.6 109.2 49.44 109.12 49.2 109.12C48.8 109.04 48.56 109.12 48.56 109.28C48.48 109.52 48.56 109.68 49.12 109.92C49.68 110.16 49.76 110.32 49.68 110.56C49.6 110.8 49.44 111.6 49.28 112.24C49.12 112.8 48.72 113.2 48.64 113.2C48.24 113.36 47.52 113.28 47.28 113.2C44.96 112.56 43.6 110.16 44.32 107.6C44.56 106.64 45.12 105.68 46 105.04ZM68.16 112.4C67.92 112.4 67.84 112.64 67.68 112.96C67.68 113.04 67.6 113.04 67.6 113.12C67.28 113.68 67.04 114 66.64 114.16C66.32 114.32 66.08 114.32 65.44 114.4C64 114.48 63.68 114.24 63.6 114.24C63.52 114.24 63.44 113.92 63.36 113.44V113.36C63.28 112.96 63.2 112.4 63.12 111.12C63.12 110.96 63.12 110.8 63.2 110.72C63.92 110.64 64.32 110.64 65.04 110.64C65.36 110.64 65.52 110.8 65.68 111.2C65.84 111.52 66 111.68 66.16 111.68C66.24 111.68 66.32 111.6 66.32 111.6C66.4 111.52 66.48 111.36 66.4 111.12C66.32 110.88 66.32 110.4 66.32 110.08C66.32 109.84 66.32 109.52 66.32 109.36V109.28C66.32 108.96 66.24 108.8 66.16 108.64C66.08 108.56 66 108.56 65.92 108.56C65.76 108.56 65.6 108.72 65.52 109.04C65.36 109.52 65.2 109.76 64.16 109.84C63.92 109.84 63.28 109.92 63.12 109.92C63.04 109.92 62.96 109.68 62.96 109.52C62.88 108.4 62.8 106.96 62.8 106.48C62.8 106.4 62.88 106.24 62.96 106.24C63.04 106.24 63.2 106.24 63.52 106.16C64 106.08 64.8 106 65.44 106C65.52 106 65.76 106.08 66 106.48C66.4 107.12 66.56 107.36 66.8 107.36C66.88 107.36 66.96 107.36 66.96 107.28C67.04 107.2 67.12 107.04 67.12 106.88C67.12 106.56 66.88 105.36 66.72 105.2C66.64 105.04 66.48 105.04 66.32 105.04C66.24 105.04 66.16 105.04 66.08 105.04C65.76 105.12 65.2 105.12 64.08 105.2L62.4 105.36C61.68 105.44 60.96 105.44 60.56 105.44C60.32 105.44 60.16 105.44 60.08 105.44C59.84 105.44 59.6 105.6 59.6 105.76C59.6 105.92 59.76 106.08 60.08 106.08C60.8 106.16 61.04 106.32 61.12 106.8C61.2 107.04 61.36 109.28 61.6 111.92C61.68 112.96 61.68 113.36 61.68 113.84C61.68 114.4 61.52 114.56 60.48 114.96C60.16 115.04 59.92 115.28 59.92 115.52C59.92 115.6 60 115.76 60.4 115.76C60.48 115.76 60.56 115.76 60.56 115.76C60.88 115.76 61.28 115.68 61.76 115.6C62.32 115.52 62.96 115.44 63.52 115.44C65.6 115.28 66.48 115.28 67.04 115.28C67.28 115.28 67.44 115.28 67.68 115.28C67.76 115.28 68.16 115.12 68.24 114.88C68.24 114.8 68.56 113.92 68.64 113.36C68.64 113.12 68.64 112.8 68.56 112.64C68.24 112.4 68.24 112.4 68.16 112.4ZM85.6 107.2C85.44 106.8 85.2 106.4 85.12 106.08C84.48 104.64 83.2 101.44 83.04 100.96C82.96 100.64 83.04 100.32 83.44 99.92C83.84 99.52 83.92 99.36 83.84 99.2C83.84 99.12 83.76 99.12 83.68 99.04C83.52 98.96 83.36 99.04 83.2 99.12C83.04 99.2 82.88 99.28 82.64 99.44C82.32 99.6 81.84 99.84 81.52 100C81.36 100.08 81.28 100.08 81.12 100.16C80.96 100.24 80.8 100.24 80.48 100.4C80.16 100.56 80 100.8 80.08 100.88C80.08 100.88 80.24 101.2 80.72 101.04C81.84 100.8 81.92 100.96 82.48 102.16V102.24C83.12 103.36 84.16 106 84.24 106.32C84.24 106.4 84.24 106.4 84.16 106.4C83.68 106.24 81.68 105.36 80.16 104.64C79.28 104.24 78.48 103.92 78.08 103.68C77.12 103.28 76.16 102.8 75.84 102.56C75.84 102.56 75.52 102.48 75.36 102.48C75.12 102.56 74.72 102.72 74.24 102.88C73.76 103.04 73.28 103.2 72.96 103.36C72.72 103.44 72.64 103.6 72.72 103.76C72.8 103.92 73.12 104.08 73.44 104C73.92 103.92 74.32 103.92 74.56 104C75.12 104.16 75.28 104.4 75.36 104.56C75.52 105.04 77.28 109.28 77.68 110.4C77.92 111.12 77.92 111.44 77.12 112.08C76.88 112.32 76.8 112.48 76.88 112.72C76.96 112.8 77.04 112.88 77.12 112.88C77.2 112.88 77.36 112.88 77.52 112.8C77.6 112.8 77.76 112.72 77.92 112.56C78.24 112.4 78.8 112.08 79.28 111.92C79.44 111.84 79.68 111.76 79.84 111.68C80 111.6 80.24 111.52 80.48 111.44C80.64 111.36 80.8 111.28 80.88 111.12C80.88 111.04 80.88 110.96 80.88 110.96C80.8 110.72 80.56 110.72 80.16 110.72C79.28 110.8 79.12 110.72 78.48 109.44C78.32 109.04 77.52 107.44 77.2 106.72C76.96 106.24 76.8 105.76 76.72 105.44C76.64 105.36 76.64 105.2 76.64 105.12C76.64 105.04 76.64 104.96 76.64 104.96C76.64 104.96 76.64 104.96 76.72 104.96C77.68 105.36 81.92 107.36 82.88 107.76C83.52 108 84.72 108.64 85.36 109.04C85.68 109.2 86.08 109.28 86.24 109.2C86.48 109.12 86.48 108.8 86.24 108.24C86 108.08 85.76 107.68 85.6 107.2ZM93.44 96.4C91.84 96.72 91.2 96.64 90.64 95.92C90.08 95.2 90.24 94.24 90.8 93.76C91.52 93.12 92.4 93.04 93.36 93.6C93.44 93.68 93.76 93.84 93.84 93.68C94 93.52 94 93.2 93.76 92.96C93.68 92.88 93.44 92.64 93.28 92.48C93.12 92.32 92.96 92.16 92.88 92.08C92.8 91.92 92.48 91.76 92.4 91.84C92.32 91.92 92.16 91.92 92.08 92C91.6 92.24 91.04 92.56 90.56 92.96C90 93.44 89.52 94.16 89.36 94.8C89.2 95.36 89.04 96.48 89.92 97.44C91.04 98.64 92.48 98.56 93.76 98.32C95.84 97.92 96.4 98.08 96.88 98.64C97.6 99.44 97.28 100.48 96.8 100.88C96.4 101.2 95.36 101.92 93.68 101.2H93.6C93.36 101.12 93.2 101.04 92.96 101.2C92.88 101.28 92.88 101.6 93.12 101.92C93.36 102.16 93.84 102.64 94.32 102.88C94.48 102.96 94.56 102.96 94.64 102.96H94.72C95.2 102.88 96.32 102.32 96.96 101.76C97.52 101.28 98.08 100.4 98.24 99.76C98.4 99.04 98.4 97.92 97.68 97.2C96.64 95.84 95.2 96 93.44 96.4ZM106.8 88.48C106.08 89.2 105.84 89.2 105.2 88.8C105.12 88.8 105.04 88.72 104.88 88.64C104.48 88.4 103.84 87.92 102.72 87.2C102.48 87.04 102.24 86.88 102 86.72C101.12 86.16 100.16 85.52 99.76 85.2C99.12 84.72 98.96 84.56 99.28 83.68C99.36 83.52 99.36 83.28 99.2 83.12C99.12 83.04 99.04 83.04 98.96 83.12C98.88 83.12 98.72 83.2 98.64 83.36C98.56 83.52 98.4 83.68 98.32 83.92C98.16 84.24 97.92 84.56 97.6 85.04C97.36 85.44 97.12 85.76 96.88 86C96.72 86.16 96.64 86.32 96.56 86.4C96.48 86.56 96.32 86.96 96.48 87.04C96.56 87.12 96.8 87.12 97.04 86.88C97.84 86.16 97.92 86.16 99.12 86.96L101.2 88.32C102.32 89.04 104.08 90.32 104.32 90.56C104.56 90.8 104.64 90.96 104.4 91.76C104.32 92 104.32 92.24 104.48 92.4H104.56H104.64C104.8 92.4 104.96 92.24 105.04 92.08C105.12 92 105.2 91.76 105.36 91.52C105.52 91.2 105.84 90.72 106 90.48C106.16 90.16 106.64 89.6 106.88 89.28C107.04 89.12 107.12 88.96 107.2 88.88C107.28 88.72 107.44 88.32 107.2 88.16C107.28 88.24 107.12 88.16 106.8 88.48ZM111.12 73.92C109.52 73.36 108.4 74.24 107.04 75.52C105.84 76.56 105.2 76.8 104.32 76.48C104 76.32 103.68 76.08 103.44 75.76C103.28 75.36 103.2 74.96 103.36 74.56C103.68 73.6 104.4 73.2 105.44 73.2H105.52C105.68 73.2 106 73.2 106 73.04C106.08 72.8 105.92 72.56 105.52 72.4C105.36 72.32 105.12 72.32 104.88 72.24C104.64 72.16 104.4 72.16 104.32 72.08C104.16 72 103.84 72 103.76 72.16C103.68 72.24 103.6 72.32 103.52 72.48C103.2 72.96 102.88 73.44 102.64 74.08C102.4 74.8 102.32 75.6 102.48 76.24C102.64 76.8 103.04 77.84 104.24 78.24C105.76 78.8 107.04 77.92 108 77.12C109.6 75.76 110.24 75.6 110.88 75.84C111.44 76 111.76 76.48 111.84 76.72C112 77.04 112 77.52 111.84 77.84C111.52 78.88 110.56 79.52 109.28 79.6H109.2C108.96 79.68 108.72 79.68 108.64 79.92C108.64 80 108.64 80.08 108.64 80.08C108.72 80.24 108.88 80.32 109.12 80.4C109.44 80.48 110 80.64 110.48 80.64C110.56 80.64 110.64 80.64 110.64 80.64C110.88 80.64 110.96 80.56 111.04 80.48C111.44 80.24 112.08 79.12 112.4 78.32C112.64 77.6 112.72 76.56 112.56 75.92C112.64 75.12 112.08 74.24 111.12 73.92ZM50.4 91.36L52.08 92.56L55.12 90.32L47.52 84.72C44.56 82.56 40.48 82.56 37.6 84.72L31.84 88.96C33.76 90.8 35.84 92.48 38.08 93.92C38.72 93.44 40.32 92.32 40.96 91.84C43.36 89.6 47.52 89.2 50.4 91.36ZM65.36 36C65.92 36.4 66.64 36.48 67.28 36.16C67.92 35.84 68.4 35.2 68.4 34.48C68.4 33.92 67.84 33.52 67.84 33.84C67.76 34.4 67.52 34.96 66.96 35.2C66.4 35.44 65.76 35.36 65.28 34.96C64.96 34.8 64.72 35.52 65.36 36ZM54.72 36C55.28 35.52 55.12 34.8 54.88 35.04C54.4 35.44 53.76 35.52 53.2 35.28C52.64 35.04 52.32 34.48 52.32 33.92C52.32 33.6 51.76 34 51.76 34.56C51.76 35.28 52.16 35.92 52.88 36.24C53.44 36.4 54.16 36.4 54.72 36ZM45.04 62.56C45.84 67.6 48.24 75.04 48.4 75.68C48.48 76.08 48 77.04 47.68 78.88C47.6 79.44 47.6 79.92 47.68 80.4C47.52 80.48 47.28 80.64 47.12 80.72L45.12 82.16C47.36 82.64 51.28 86.08 53.2 87.36L56.24 89.6C56.48 89.44 56.72 89.36 56.96 89.28C59.36 88.16 62.4 88.4 64.56 90C64.88 90.24 67.76 92.32 68.08 92.64C68.16 92.56 69.92 91.28 69.92 91.36C69.52 91.04 62.88 86.16 58.8 83.12C59.04 82.64 59.28 82.16 59.28 81.52C59.36 79.6 58.88 78.64 59.04 78.4C59.12 78.24 59.36 78.64 59.68 79.2C59.92 79.76 60.08 79.68 60.08 79.68C60.08 79.68 60.16 79.76 60.48 79.2C60.8 78.56 61.04 78.24 61.12 78.4C61.28 78.64 60.8 79.6 60.88 81.52C60.88 82 60.96 82.4 61.12 82.8C61.2 82.96 61.2 83.04 61.28 83.12L61.2 83.2C62 83.76 66.24 86.88 66.88 87.36C68.8 86.08 72.64 82.64 74.96 82.16L72.96 80.72C72.8 80.56 72.64 80.48 72.4 80.4C72.48 79.92 72.48 79.44 72.32 78.88C72.08 77.12 71.52 76.08 71.6 75.68C71.76 75.04 74.16 67.6 74.96 62.56C76.16 55.12 76.72 48.8 76.72 48.8C76.72 48.8 77.44 47.92 77.28 46.96C77.12 46 76.24 45.36 76.24 45.36C76.24 45.36 75.44 43.76 75.12 41.36C74.8 38.96 74.32 37.12 74.32 37.12C74.32 37.12 74.56 35.52 74.48 33.76C74.32 31.52 73.04 29.36 73.12 28.56C73.28 27.12 73.84 27.28 74.24 24.8C74.48 22.72 73.28 21.28 73.28 21.28C73.28 21.28 72.88 23.04 72.08 23.36C71.2 23.68 70.88 23.44 69.92 23.52C69.44 23.52 68.64 23.6 67.68 24.08C66 23.12 65.52 23.2 64.08 23.28C62.64 23.36 62.56 23.28 61.28 22.96C61.12 22.96 60.56 22.8 60 22.8C59.44 22.8 58.88 22.96 58.72 22.96C57.44 23.28 57.36 23.36 55.92 23.28C54.48 23.2 54 23.12 52.32 24.08C51.28 23.6 50.56 23.52 50.08 23.52C49.12 23.44 48.72 23.68 47.92 23.36C47.04 23.04 46.72 21.28 46.72 21.28C46.72 21.28 45.52 22.72 45.76 24.8C46.08 27.28 46.72 27.12 46.88 28.56C46.96 29.36 45.76 31.52 45.52 33.76C45.36 35.52 45.68 37.12 45.68 37.12C45.68 37.12 45.2 38.96 44.88 41.36C44.56 43.76 43.76 45.36 43.76 45.36C43.76 45.36 42.88 46 42.72 46.96C42.56 47.92 43.28 48.8 43.28 48.8C43.28 48.8 43.84 55.12 45.04 62.56ZM51.52 82.48C51.36 82.56 50.56 82.16 50.32 82C49.44 81.44 49.2 80.96 49.12 80.24C48.96 79.04 49.28 77.52 49.52 76.88C50.08 76.32 50.24 76.24 50.88 76.08C50.48 76.72 50.96 79.2 50.64 79.84C50.08 81.2 50.96 81.84 51.52 82.48ZM49.2 36.24C50.08 38.48 54 39.92 56.24 38.4C56.56 38.16 56.48 38.64 56.48 38.64C56.48 38.64 55.92 40.4 55.44 40.64C54.08 41.28 48.32 39.76 47.2 37.2C46.56 35.68 47.2 29.84 49.04 28.48C49.2 28.32 50.16 28.64 50.4 28.8C50.56 28.96 50.56 29.44 50.56 29.76C50.56 30.16 48 32.96 49.2 36.24ZM50.96 33.28C51.44 31.76 53.12 30.96 54.64 31.44C56.16 31.92 56.72 33.68 56.16 35.2C55.68 36.72 54.08 37.52 52.56 36.96C51.12 36.48 50.48 34.8 50.96 33.28ZM54.32 47.6C55.68 46.32 56.16 44.96 56.32 44.64C56.48 44.32 56.8 44.24 56.88 44.56C56.96 44.88 56.48 48.08 54.72 50C53.04 51.84 51.36 51.04 50.72 50C50 48.8 50.88 47.44 52.48 46.4C53.6 45.68 54.16 44.8 54.4 44.96C54.8 45.12 54.16 46.4 53.52 47.12C52.48 48 53.12 48.72 54.32 47.6ZM50.88 56.88C52.24 55.76 53.12 54.8 53.84 53.92C54.16 53.52 54.4 54.72 53.6 56.16C52.8 57.6 53.68 57.6 54.56 56.56C55.6 55.28 56.16 53.28 56.72 53.52C57.04 53.6 56.24 59.28 53.6 60.96C50.72 62.64 48.8 58.64 50.88 56.88ZM54.16 79.28C54.32 80 54.24 80.24 54.08 80.56C53.44 82.32 54.4 83.52 54.4 83.52V83.6C54.08 83.52 52.08 82.64 51.84 80.24C51.68 78.72 51.68 75.76 52.72 75.2C53.36 74.88 54.16 74.96 54.48 75.12C53.76 76.4 53.84 78.32 54.16 79.28ZM57.44 81.92C57.2 82.56 56.24 83.52 55.52 83.76L55.44 83.68C55.44 83.68 56.4 82.32 55.52 80.64C54.64 79.12 55.76 78.08 55.52 75.44C55.52 75.44 56.08 75.52 56.32 75.6C56.48 75.68 56.32 75.52 57.04 76.64C57.84 77.84 57.92 80.64 57.44 81.92ZM56.4 68.48C55.12 70 53.28 70.96 52.16 69.68C51.2 68.56 51.44 66.96 53.12 65.92C55.28 64.64 55.6 63.6 56 63.36C56.08 63.28 56.16 63.36 56.16 63.52C56.32 65.44 54.24 66.4 54.8 66.96C55.28 67.44 57.28 65.52 57.76 63.84C57.84 63.52 58 63.68 58 63.92C57.92 65.36 57.52 67.04 56.4 68.48ZM60 50.32C61.04 50.32 60.56 47.36 60.56 47.2C60.56 46.96 60.72 46.72 60.72 46.72C60.72 46.72 62 48 62.08 50.4C62.16 51.92 61.44 53.28 60.08 53.28C58.72 53.28 58 51.92 58.08 50.4C58.16 48 59.44 46.72 59.44 46.72C59.44 46.72 59.6 46.88 59.6 47.2C59.44 47.36 58.96 50.32 60 50.32ZM61.84 39.6C61.68 40.48 61.04 42.32 60.08 43.04C59.12 42.32 58.48 40.48 58.32 39.6C58.08 38.56 57.76 36.48 58.4 35.92C59.04 35.36 59.6 35.36 59.6 35.44C59.76 36 59.52 37.52 60.16 37.52C60.72 37.52 60.56 36 60.72 35.44C60.72 35.36 61.28 35.36 61.92 35.92C62.32 36.48 62 38.64 61.84 39.6ZM59.2 55.68C59.2 55.68 59.36 55.92 59.36 56.16C59.36 56.32 59.2 59.44 60 59.44C60.8 59.44 60.64 56.32 60.64 56.16C60.64 55.92 60.8 55.68 60.8 55.68C60.8 55.68 62.08 57.12 62.24 59.68C62.32 61.28 61.52 62.72 60.08 62.72C58.64 62.72 57.84 61.28 57.92 59.68C57.92 57.12 59.2 55.68 59.2 55.68ZM60 74.16C58.64 74.16 57.92 72.48 58 71.04C58.08 68.72 59.44 67.84 59.44 67.84C59.44 67.84 59.6 68 59.6 68.24C59.6 68.4 59.12 71.2 60 71.2C60.88 71.2 60.48 68.4 60.4 68.24C60.4 68 60.56 67.84 60.56 67.84C60.56 67.84 61.92 68.72 62 71.04C62.08 72.48 61.36 74.16 60 74.16ZM64.56 83.68C63.76 83.52 62.8 82.48 62.56 81.92C62.08 80.64 62.16 77.84 62.96 76.64C63.68 75.52 63.52 75.68 63.68 75.6C63.84 75.52 64.48 75.44 64.48 75.44C64.24 78.08 65.36 79.12 64.48 80.64C63.6 82.24 64.56 83.68 64.56 83.68ZM68.24 80.24C67.92 82.56 66 83.52 65.68 83.6V83.52C65.68 83.52 66.64 82.32 66 80.56C65.92 80.24 65.76 80 65.92 79.28C66.16 78.32 66.32 76.4 65.6 75.12C65.92 74.96 66.72 74.88 67.36 75.2C68.4 75.84 68.48 78.72 68.24 80.24ZM67.84 69.68C66.72 70.96 64.88 70 63.6 68.48C62.48 67.04 62 65.36 62 63.92C62 63.68 62.16 63.6 62.24 63.84C62.72 65.52 64.64 67.44 65.2 66.96C65.68 66.48 63.6 65.52 63.84 63.52C63.84 63.36 63.92 63.28 64 63.36C64.4 63.6 64.72 64.64 66.88 65.92C68.64 66.96 68.88 68.56 67.84 69.68ZM63.76 38.48C66 40 70 38.56 70.8 36.32C72 33.04 69.44 30.16 69.36 29.84C69.36 29.52 69.44 29.04 69.52 28.88C69.68 28.64 70.64 28.4 70.88 28.56C72.72 29.84 73.44 35.68 72.72 37.28C71.76 39.36 65.84 41.36 64.48 40.72C64 40.48 63.44 38.72 63.44 38.72C63.44 38.72 63.44 38.24 63.76 38.48ZM65.44 31.44C66.96 30.96 68.56 31.76 69.12 33.28C69.6 34.8 68.96 36.48 67.44 37.04C65.92 37.52 64.4 36.8 63.84 35.28C63.36 33.68 63.92 31.92 65.44 31.44ZM66.4 56.16C65.6 54.72 65.84 53.6 66.16 53.92C66.88 54.8 67.76 55.76 69.12 56.88C71.28 58.64 69.28 62.64 66.48 60.88C63.84 59.28 63.04 53.6 63.36 53.44C63.92 53.28 64.4 55.2 65.52 56.48C66.32 57.6 67.28 57.52 66.4 56.16ZM63.68 44.64C63.84 44.96 64.32 46.32 65.68 47.6C66.88 48.72 67.52 48 66.56 47.04C65.92 46.32 65.28 45.12 65.68 44.88C65.92 44.72 66.48 45.6 67.6 46.32C69.12 47.36 70.08 48.8 69.36 49.92C68.72 50.96 67.04 51.76 65.36 49.92C63.6 48 63.2 44.88 63.2 44.48C63.2 44.24 63.52 44.24 63.68 44.64ZM70.88 80.24C70.8 80.88 70.56 81.36 69.68 82C69.36 82.16 68.64 82.56 68.48 82.48V82.4C69.04 81.76 70 81.2 69.36 79.76C69.04 79.12 69.52 76.64 69.12 76C69.76 76.08 69.92 76.24 70.48 76.8C70.72 77.52 71.04 79.12 70.88 80.24ZM73.28 40.96C73.52 41.28 74.56 43.76 74.32 44.88C74.32 46.4 75.52 46.8 75.52 46.8C75.6 47.04 75.44 47.84 74.96 48.16C74.8 48.24 74.24 48 73.6 47.6C73.44 47.44 72.88 48.64 73.28 49.04C74.08 49.76 74.88 49.76 74.88 49.76C74.88 49.76 74 65.12 70.16 74.8C70 74.96 69.44 74.08 69.04 73.36C69.28 72.48 73.36 58.56 71.28 48.08C70.72 45.2 70.64 42.64 70.72 42.4C70.88 41.84 73.04 40.56 73.28 40.96ZM60.72 25.04C61.04 24.24 62 23.84 62.96 24.16C63.92 24.48 64.4 25.44 64.16 26.24C63.84 27.04 63.44 25.92 62.48 25.6C61.52 25.2 60.48 25.84 60.72 25.04ZM61.84 28.16C61.84 29.04 61.04 28.08 60 28.08C58.96 28.08 58.16 29.04 58.16 28.16C58.16 27.28 58.96 26.56 60 26.56C61.04 26.56 61.84 27.28 61.84 28.16ZM57.04 24.16C58 23.84 58.96 24.24 59.28 25.04C59.6 25.84 58.48 25.2 57.52 25.52C56.56 25.84 56.16 27.04 55.84 26.16C55.6 25.44 56.08 24.48 57.04 24.16ZM46.64 23.2C46.8 22.96 46.8 24.32 48.32 24.64C49.12 24.8 50.16 24.48 51.36 24.96C53.2 25.6 56.48 31.04 60.08 31.04C63.6 31.04 66.96 25.68 68.8 24.96C70 24.56 70.96 24.8 71.84 24.64C73.36 24.32 73.36 22.96 73.52 23.2C74 24.08 72.96 26.08 70.32 26.56C68.56 26.88 67.28 29.52 66.88 29.52C66.72 29.52 65.68 29.28 64.24 30.16C62.8 30.96 62.48 32.08 62.08 32.24C61.68 32.4 60.88 32.56 60.16 32.56C59.44 32.56 58.64 32.4 58.24 32.24C57.84 32.08 57.44 30.96 56.08 30.16C54.64 29.28 53.52 29.52 53.44 29.52C53.04 29.52 51.76 26.96 50 26.56C47.2 26 46.24 24.08 46.64 23.2ZM44.56 46.72C44.56 46.72 45.68 46.4 45.76 44.8C45.52 43.76 46.56 41.28 46.8 40.88C47.04 40.56 49.2 41.84 49.36 42.24C49.52 42.48 49.36 45.04 48.8 47.92C46.8 58.4 50.8 72.32 51.04 73.2C50.64 73.92 50.08 74.8 49.92 74.64C46.08 64.96 45.2 49.6 45.2 49.6C45.2 49.6 45.92 49.52 46.8 48.88C47.2 48.48 46.72 47.28 46.48 47.44C45.84 47.92 45.28 48.08 45.12 48C44.64 47.76 44.4 46.96 44.56 46.72ZM41.52 93.04C40.96 93.52 39.68 94.4 39.04 94.8C40.88 95.92 42.8 96.88 44.8 97.68C45.28 97.84 45.76 98.08 46.24 98.24C46.32 98.24 46.4 98.32 46.4 98.32C50.32 99.76 54.4 100.48 58.72 100.56C59.28 100.56 59.92 100.64 60.48 100.56L49.6 92.48C47.12 90.64 43.76 91.04 41.52 93.04ZM77.12 92.08C75.04 90.88 72.4 91.04 70.48 92.48L69.2 93.44C70.88 94.64 73.44 96.56 75.04 97.76C77.12 96.96 79.12 96 80.96 94.8C80.56 94.48 78.08 92.72 77.76 92.48C77.52 92.32 77.36 92.16 77.12 92.08ZM82.56 84.8C80.72 83.44 78.48 82.96 76.32 83.28C75.04 83.44 73.76 84 72.64 84.8L68 88.24L70.96 90.48L71.12 90.64C73.36 89.6 76.16 89.84 78.24 91.28C79.04 91.84 81.36 93.6 82.16 94.16C84.4 92.72 86.48 91.04 88.4 89.2L82.56 84.8ZM58 90.24C57.76 90.32 57.6 90.4 57.36 90.48C56.64 90.8 53.84 92.96 53.12 93.44C54.4 94.4 62.4 100.24 62.8 100.48C66.48 100.24 70.08 99.52 73.52 98.24C73.04 97.92 63.68 90.96 63.68 90.96C62.08 89.92 59.92 89.52 58 90.24Z" fill="black"/>
+</svg>
diff --git a/src/Config/ConfigUibOverride.php b/src/Config/ConfigUibOverride.php
index fb45e00..1577232 100644
--- a/src/Config/ConfigUibOverride.php
+++ b/src/Config/ConfigUibOverride.php
@@ -12,7 +12,7 @@ class ConfigUibOverride implements ConfigFactoryOverrideInterface {
*/
public function loadOverrides($names): array {
if (in_array('gin_login.settings', $names, TRUE)) {
- $overrides['gin_login.settings']['logo'] = ['path' => 'https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg'];
+ $overrides['gin_login.settings']['logo'] = ['path' => 'modules/custom/uib_common_ui/public/image/uib_login_logo.svg'];
}
return $overrides ?? [];
}
--
GitLab
From 268e7901966922691e2109d045a61411b4fd477f Mon Sep 17 00:00:00 2001
From: Alvaro Martinez <alvaro@ramsalt.com>
Date: Wed, 29 Jan 2025 11:28:14 +0100
Subject: [PATCH 3/5] Issue #1398 chore: Fix coding standards
---
src/Config/ConfigUibOverride.php | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/Config/ConfigUibOverride.php b/src/Config/ConfigUibOverride.php
index 1577232..9b3270e 100644
--- a/src/Config/ConfigUibOverride.php
+++ b/src/Config/ConfigUibOverride.php
@@ -5,10 +5,13 @@ namespace Drupal\uib_common_ui\Config;
use Drupal\Core\Config\ConfigFactoryOverrideInterface;
use Drupal\Core\Config\StorageInterface;
+/**
+ * Provides configuration overrides for the uib_common_ui module.
+ */
class ConfigUibOverride implements ConfigFactoryOverrideInterface {
/**
- * @inheritDoc
+ * {@inheritDoc}
*/
public function loadOverrides($names): array {
if (in_array('gin_login.settings', $names, TRUE)) {
@@ -18,24 +21,24 @@ class ConfigUibOverride implements ConfigFactoryOverrideInterface {
}
/**
- * @inheritDoc
+ * {@inheritDoc}
*/
public function getCacheSuffix() {
- // TODO: Implement getCacheSuffix() method.
+ // @todo Implement getCacheSuffix() method.
}
/**
- * @inheritDoc
+ * {@inheritDoc}
*/
public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) {
- // TODO: Implement createConfigObject() method.
+ // @todo Implement createConfigObject() method.
}
/**
* @inheritDoc
*/
public function getCacheableMetadata($name) {
- // TODO: Implement getCacheableMetadata() method.
+ // @todo Implement getCacheableMetadata() method.
}
}
--
GitLab
From 2ce00efe0b113a50dad060cc13f7e9b6bf24be4b Mon Sep 17 00:00:00 2001
From: Alvaro Martinez <alvaro@ramsalt.com>
Date: Wed, 29 Jan 2025 11:29:36 +0100
Subject: [PATCH 4/5] Issue #1398 chore: Fix coding standards
---
src/Config/ConfigUibOverride.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Config/ConfigUibOverride.php b/src/Config/ConfigUibOverride.php
index 9b3270e..dcf909a 100644
--- a/src/Config/ConfigUibOverride.php
+++ b/src/Config/ConfigUibOverride.php
@@ -35,7 +35,7 @@ class ConfigUibOverride implements ConfigFactoryOverrideInterface {
}
/**
- * @inheritDoc
+ * {@inheritDoc}
*/
public function getCacheableMetadata($name) {
// @todo Implement getCacheableMetadata() method.
--
GitLab
From 7853b941498c958149663420a6c58df7518fe5b5 Mon Sep 17 00:00:00 2001
From: Sven Berg Ryen <svenryen@gmail.com>
Date: Thu, 30 Jan 2025 09:21:31 +0100
Subject: [PATCH 5/5] WP3 #1398 Refactor: Inject module handler into
ConfigUibOverride.
Added dependency injection for the module handler service to
improve testability and adhere to Drupal's best practices.
Updated logo path resolution to use the dynamically obtained module path.
---
src/Config/ConfigUibOverride.php | 25 ++++++++++++++++++++++++-
uib_common_ui.services.yml | 1 +
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/Config/ConfigUibOverride.php b/src/Config/ConfigUibOverride.php
index dcf909a..1691174 100644
--- a/src/Config/ConfigUibOverride.php
+++ b/src/Config/ConfigUibOverride.php
@@ -4,19 +4,42 @@ namespace Drupal\uib_common_ui\Config;
use Drupal\Core\Config\ConfigFactoryOverrideInterface;
use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
/**
* Provides configuration overrides for the uib_common_ui module.
*/
class ConfigUibOverride implements ConfigFactoryOverrideInterface {
+ /**
+ * The module handler service.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
+ */
+ protected $moduleHandler;
+
+ /**
+ * Constructs a ConfigUibOverride object.
+ *
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * The module handler service.
+ */
+ public function __construct(ModuleHandlerInterface $module_handler) {
+ $this->moduleHandler = $module_handler;
+ }
+
/**
* {@inheritDoc}
*/
public function loadOverrides($names): array {
if (in_array('gin_login.settings', $names, TRUE)) {
- $overrides['gin_login.settings']['logo'] = ['path' => 'modules/custom/uib_common_ui/public/image/uib_login_logo.svg'];
+ // Get the absolute path to the module and append the relative logo path.
+ $module_path = $this->moduleHandler->getModule('uib_common_ui')->getPath();
+ $logo_path = $module_path . '/public/image/uib_login_logo.svg';
+
+ $overrides['gin_login.settings']['logo'] = ['path' => $logo_path];
}
+
return $overrides ?? [];
}
diff --git a/uib_common_ui.services.yml b/uib_common_ui.services.yml
index e2a7a6e..f599c40 100644
--- a/uib_common_ui.services.yml
+++ b/uib_common_ui.services.yml
@@ -1,5 +1,6 @@
services:
uib_common_ui.overrider:
class: Drupal\uib_common_ui\Config\ConfigUibOverride
+ arguments: ['@module_handler']
tags:
- {name: config.factory.override, priority: 5}
--
GitLab