From b3b61258c8e0c00a33beb720791a99cccc3a3185 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 25 Jan 2023 12:47:47 +0000
Subject: [PATCH] Adjustments to link rels and Dockerfile

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 static/Dockerfile           |  4 +++-
 static/board.html           | 12 +++++++-----
 static/conf/nginx.conf      |  4 +++-
 static/styles/find-code.css |  5 ++---
 static/styles/main.css      |  6 ++++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/static/Dockerfile b/static/Dockerfile
index e650692..91b32d1 100644
--- a/static/Dockerfile
+++ b/static/Dockerfile
@@ -4,7 +4,9 @@ RUN npm i uglifyjs-folder uglifycss html-minifier-terser -g
 COPY . /data/in
 RUN bash /data/in/conf/deploy.sh
 
-FROM nginx:mainline-alpine-slim
+FROM fholzer/nginx-brotli:latest
 RUN rm /etc/nginx/nginx.conf
+RUN apk update
+RUN apk add --upgrade libxml2 libxslt
 COPY ./conf/nginx.conf /etc/nginx/nginx.conf
 COPY --from=compressor /data/out/ /site-static/
\ No newline at end of file
diff --git a/static/board.html b/static/board.html
index 09c17c5..79414ff 100644
--- a/static/board.html
+++ b/static/board.html
@@ -104,11 +104,13 @@
       </div>
 
       <div id="footer">
-        <picture id="nre_logo">
-          <source srcset="./images/nre/nre-powered_400w.jxl" type="image/jxl">
-          <source srcset="./images/nre/nre-powered_400w.webp" type="image/webp">
-          <img src="./images/nre/nre-powered_400w.png" alt="Powered by National Rail Enquiries">
-        </picture>
+        <a href="https://nationalrail.co.uk" target="_blank" rel="nofollow external noreferrer noopener">
+          <picture id="nre_logo">
+            <source srcset="./images/nre/nre-powered_400w.jxl" type="image/jxl">
+            <source srcset="./images/nre/nre-powered_400w.webp" type="image/webp">
+            <img src="./images/nre/nre-powered_400w.png" alt="Powered by National Rail Enquiries">
+          </picture>
+        </a>
         <a href="/">
           <picture id="owlboard_logo">
             <source srcset="./images/logo/mono-logo.svg" type="image/svg+xml">
diff --git a/static/conf/nginx.conf b/static/conf/nginx.conf
index 7202e3b..86d091b 100644
--- a/static/conf/nginx.conf
+++ b/static/conf/nginx.conf
@@ -19,7 +19,6 @@ http {
     access_log  /var/log/nginx/access.log main;
     sendfile        on;
     keepalive_timeout  65;
-    gzip  on;
 
     proxy_cache_path /var/cache/nginx keys_zone=owl_cache:20m inactive=24h;
 
@@ -32,6 +31,7 @@ http {
             root /site-static/;
             index index.html;
             gzip_static on;
+            brotli_static on;
         }
 
         location /api/ {
@@ -39,6 +39,8 @@ http {
             proxy_cache_key $scheme://$host$uri$is_args$query_string;
             proxy_ignore_headers Cache-Control;
             proxy_cache_valid 200 20m;  # Change to 1m for release.
+            gzip on;
+            brotli on;
         }
 
         location /api/v1/list/ {
diff --git a/static/styles/find-code.css b/static/styles/find-code.css
index 2e05eea..46bf36e 100644
--- a/static/styles/find-code.css
+++ b/static/styles/find-code.css
@@ -1,8 +1,7 @@
 /*Overrides*/
 .titleimg{
-    min-width: 100px;
-    max-width: 200px;
-    width: 30%;
+    height: 200px;
+    width: 234.38px;
     padding-bottom: 0px;
 }
 .small-lookup-box{
diff --git a/static/styles/main.css b/static/styles/main.css
index a1fbfff..fdce122 100644
--- a/static/styles/main.css
+++ b/static/styles/main.css
@@ -110,10 +110,12 @@ body a:visited {color:var(--link-visited-color)}
   width: 45%;
   padding-top: 20px;
   padding-bottom: 20px;
-  max-width: 360px;
-  min-width: 200px;
+  width: 200px;
+  height: 171.5px;
   transition: 0.2s;
 }
+@media only screen and (min-height: 740px) {.titleimg{width: 250px;height:214.375px;}}
+
 .lookup-box {
   text-align: center;
   border: black;