From babe6b9c14effe95ce2f8a6fd872be3a7a186681 Mon Sep 17 00:00:00 2001 From: Luke Parkinson Date: Mon, 25 Nov 2024 16:14:00 +1300 Subject: [PATCH 1/4] Add kowhaiwhai and red styling colours --- terriajs/Dockerfile | 2 +- terriajs/client_config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terriajs/Dockerfile b/terriajs/Dockerfile index c7ddaeb74..12f619485 100644 --- a/terriajs/Dockerfile +++ b/terriajs/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM ghcr.io/terriajs/terriamap:0.2.1 +FROM lparkinson/otakaro_terria_map:1.0 # Install envsubst dependencies USER root diff --git a/terriajs/client_config.json b/terriajs/client_config.json index a490be934..fd26096d7 100644 --- a/terriajs/client_config.json +++ b/terriajs/client_config.json @@ -7,6 +7,6 @@ "tabbedCatalog": true, "supportEmail": "luke.parkinson@canterbury.ac.nz", "cesiumIonAccessToken": "$CESIUM_ACCESS_TOKEN", - "brandBarElements": [] + "brandBarElements": [""] } } From ebf3a54cf2b1969cd8afa6b8564e270682f2007b Mon Sep 17 00:00:00 2001 From: Luke Parkinson Date: Tue, 26 Nov 2024 16:02:03 +1300 Subject: [PATCH 2/4] Add tiled kowhaiwhai and title --- terriajs/Dockerfile | 2 +- terriajs/client_config.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/terriajs/Dockerfile b/terriajs/Dockerfile index 12f619485..1e2284614 100644 --- a/terriajs/Dockerfile +++ b/terriajs/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM lparkinson/otakaro_terria_map:1.0 +FROM lparkinson/otakaro_terria_map:1.1 # Install envsubst dependencies USER root diff --git a/terriajs/client_config.json b/terriajs/client_config.json index fd26096d7..423966148 100644 --- a/terriajs/client_config.json +++ b/terriajs/client_config.json @@ -7,6 +7,8 @@ "tabbedCatalog": true, "supportEmail": "luke.parkinson@canterbury.ac.nz", "cesiumIonAccessToken": "$CESIUM_ACCESS_TOKEN", - "brandBarElements": [""] + "brandBarElements": [ + "

Ōtākaro Digital Twin

" + ] } } From 20ae0b8f7901899e5a246c2ebc2cc2961dbe2aec Mon Sep 17 00:00:00 2001 From: Luke Parkinson Date: Wed, 27 Nov 2024 08:59:03 +1300 Subject: [PATCH 3/4] Remove kowhaiwhai, set colours to avon green --- terriajs/Dockerfile | 2 +- terriajs/client_config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terriajs/Dockerfile b/terriajs/Dockerfile index 1e2284614..b855b0f00 100644 --- a/terriajs/Dockerfile +++ b/terriajs/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM lparkinson/otakaro_terria_map:1.1 +FROM lparkinson/otakaro_terria_map:1.3 # Install envsubst dependencies USER root diff --git a/terriajs/client_config.json b/terriajs/client_config.json index 423966148..f24a5ee1c 100644 --- a/terriajs/client_config.json +++ b/terriajs/client_config.json @@ -8,7 +8,7 @@ "supportEmail": "luke.parkinson@canterbury.ac.nz", "cesiumIonAccessToken": "$CESIUM_ACCESS_TOKEN", "brandBarElements": [ - "

Ōtākaro Digital Twin

" + "

Ōtākaro Digital Twin

" ] } } From 477bc7688bb016dc56d364286d864a398fec9691 Mon Sep 17 00:00:00 2001 From: Luke Parkinson Date: Wed, 27 Nov 2024 18:23:03 +1300 Subject: [PATCH 4/4] Fix styling issues found during testing --- terriajs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terriajs/Dockerfile b/terriajs/Dockerfile index b855b0f00..181b32e13 100644 --- a/terriajs/Dockerfile +++ b/terriajs/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM lparkinson/otakaro_terria_map:1.3 +FROM lparkinson/otakaro_terria_map:1.4 # Install envsubst dependencies USER root