From 35453c590cae70e917bbafa61389044cb8ee7373 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Mon, 10 Aug 2020 15:33:21 +0200 Subject: Include version info --- Makefile | 3 ++- client/index.html | 1 + client/style.css | 11 +++++++---- config.mk | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 79dc190..52aa169 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,8 @@ server/assets/client.js: $(ELM_MESSAGES_SOURCE) $(ELM_SOURCES) cd client && elm make src/Client.elm --optimize --output=../$@ server/assets/client.html: client/index.html config.mk - sed "s@\$$CAFP_BASE@$(CAFP_BASE)@" $< >$@ + sed "s@\$$CAFP_BASE@$(CAFP_BASE)@" $< | \ + sed "s@\$$CAFP_VERSION@$(CAFP_VERSION)@" >$@ server/assets/style.css: client/style.css cp $< $@ diff --git a/client/index.html b/client/index.html index 007dc5c..274f533 100644 --- a/client/index.html +++ b/client/index.html @@ -46,5 +46,6 @@ connect(); + diff --git a/client/style.css b/client/style.css index ff25dd5..90e6a03 100644 --- a/client/style.css +++ b/client/style.css @@ -32,10 +32,8 @@ h1::after { } .main { - position: absolute; - top: 0px; - left: 286px; - right: 18px; + margin-left: 286px; + margin-right: 18px; } } @@ -119,3 +117,8 @@ button, input { .authors { margin-top: 6px; } + +footer { + font-size: 12px; + margin: 60px auto 60px auto; +} diff --git a/config.mk b/config.mk index 63235ac..c31f939 100644 --- a/config.mk +++ b/config.mk @@ -1,3 +1,4 @@ CAFP_HOSTNAME=0.0.0.0 CAFP_PORT=8002 CAFP_BASE=/cafp +CAFP_VERSION=$(shell git rev-parse HEAD | head -c8) -- cgit v1.2.3