Adjustments to link rels and Dockerfile

Signed-off-by: Fred Boniface <fred@fjla.uk>
This commit is contained in:
Fred Boniface 2023-01-25 12:47:47 +00:00
parent bd9e2e71dd
commit b3b61258c8
5 changed files with 19 additions and 12 deletions

View File

@ -4,7 +4,9 @@ RUN npm i uglifyjs-folder uglifycss html-minifier-terser -g
COPY . /data/in COPY . /data/in
RUN bash /data/in/conf/deploy.sh RUN bash /data/in/conf/deploy.sh
FROM nginx:mainline-alpine-slim FROM fholzer/nginx-brotli:latest
RUN rm /etc/nginx/nginx.conf RUN rm /etc/nginx/nginx.conf
RUN apk update
RUN apk add --upgrade libxml2 libxslt
COPY ./conf/nginx.conf /etc/nginx/nginx.conf COPY ./conf/nginx.conf /etc/nginx/nginx.conf
COPY --from=compressor /data/out/ /site-static/ COPY --from=compressor /data/out/ /site-static/

View File

@ -104,11 +104,13 @@
</div> </div>
<div id="footer"> <div id="footer">
<a href="https://nationalrail.co.uk" target="_blank" rel="nofollow external noreferrer noopener">
<picture id="nre_logo"> <picture id="nre_logo">
<source srcset="./images/nre/nre-powered_400w.jxl" type="image/jxl"> <source srcset="./images/nre/nre-powered_400w.jxl" type="image/jxl">
<source srcset="./images/nre/nre-powered_400w.webp" type="image/webp"> <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"> <img src="./images/nre/nre-powered_400w.png" alt="Powered by National Rail Enquiries">
</picture> </picture>
</a>
<a href="/"> <a href="/">
<picture id="owlboard_logo"> <picture id="owlboard_logo">
<source srcset="./images/logo/mono-logo.svg" type="image/svg+xml"> <source srcset="./images/logo/mono-logo.svg" type="image/svg+xml">

View File

@ -19,7 +19,6 @@ http {
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
sendfile on; sendfile on;
keepalive_timeout 65; keepalive_timeout 65;
gzip on;
proxy_cache_path /var/cache/nginx keys_zone=owl_cache:20m inactive=24h; proxy_cache_path /var/cache/nginx keys_zone=owl_cache:20m inactive=24h;
@ -32,6 +31,7 @@ http {
root /site-static/; root /site-static/;
index index.html; index index.html;
gzip_static on; gzip_static on;
brotli_static on;
} }
location /api/ { location /api/ {
@ -39,6 +39,8 @@ http {
proxy_cache_key $scheme://$host$uri$is_args$query_string; proxy_cache_key $scheme://$host$uri$is_args$query_string;
proxy_ignore_headers Cache-Control; proxy_ignore_headers Cache-Control;
proxy_cache_valid 200 20m; # Change to 1m for release. proxy_cache_valid 200 20m; # Change to 1m for release.
gzip on;
brotli on;
} }
location /api/v1/list/ { location /api/v1/list/ {

View File

@ -1,8 +1,7 @@
/*Overrides*/ /*Overrides*/
.titleimg{ .titleimg{
min-width: 100px; height: 200px;
max-width: 200px; width: 234.38px;
width: 30%;
padding-bottom: 0px; padding-bottom: 0px;
} }
.small-lookup-box{ .small-lookup-box{

View File

@ -110,10 +110,12 @@ body a:visited {color:var(--link-visited-color)}
width: 45%; width: 45%;
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
max-width: 360px; width: 200px;
min-width: 200px; height: 171.5px;
transition: 0.2s; transition: 0.2s;
} }
@media only screen and (min-height: 740px) {.titleimg{width: 250px;height:214.375px;}}
.lookup-box { .lookup-box {
text-align: center; text-align: center;
border: black; border: black;