diff --git a/Dockerfile b/Dockerfile index 8a04f87..3efa370 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,12 @@ WORKDIR /app/ COPY composer.json composer.lock ./ RUN composer install --ignore-platform-reqs --optimize-autoloader -FROM scratch AS tailwind +FROM alpine:3 AS tailwind +RUN apk --no-cache add libstdc++ WORKDIR /app/ -ADD --checksum=sha256:cd52e757cb0bd15238f0207a215198d924811234028d056b7be39fde70491296 --chmod=0755 \ - https://github.com/tailwindlabs/tailwindcss/releases/download/v3.2.4/tailwindcss-linux-x64 /usr/local/bin/tailwindcss -ENTRYPOINT ["tailwindcss"] +ADD --checksum=sha256:a04d34ceacc8f52cbe8920ad846cdeb61d3d0021dba32db0d1f77c9d9fad7a6c --chmod=0755 \ + https://github.com/tailwindlabs/tailwindcss/releases/download/v4.3.3/tailwindcss-linux-x64-musl /usr/local/bin/tailwindcss +ENTRYPOINT ["tailwindcss", "-i", "tailwind.css"] FROM php:8.1-apache AS build WORKDIR /app/ diff --git a/Makefile b/Makefile index e5812e4..80eff0e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ vendor: composer.json composer.lock composer install touch $@ -www/src/tailwind.min.css: www/_layouts/* www/_posts/* www/_talks/* www/*.html www/*.html.twig tailwind.config.js +www/src/tailwind.min.css: www/_layouts/* www/_posts/* www/_talks/* www/*.html www/*.html.twig tailwind.css docker compose run --rm --build tailwind -o $@ --minify touch $@ diff --git a/compose.yaml b/compose.yaml index 9da45b4..a9b6c5b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -34,7 +34,7 @@ services: stdin_open: true stop_signal: SIGKILL volumes: - - ./tailwind.config.js:/app/tailwind.config.js:ro + - ./tailwind.css:/app/tailwind.css:ro - ./www:/app/www:rw develop: watch: diff --git a/tailwind.config.js b/tailwind.config.js deleted file mode 100644 index 029976e..0000000 --- a/tailwind.config.js +++ /dev/null @@ -1,14 +0,0 @@ -/** @type {import('tailwindcss').Config} */ -module.exports = { - content: [ - "www/_layouts/*", - "www/_posts/*", - "www/_talks/*", - "www/*.html", - "www/*.html.twig" - ], - theme: { - extend: {}, - }, - plugins: [], -} diff --git a/tailwind.css b/tailwind.css new file mode 100644 index 0000000..bcdd56d --- /dev/null +++ b/tailwind.css @@ -0,0 +1,3 @@ +@import "tailwindcss/theme.css"; +@import "tailwindcss/preflight.css"; +@import "tailwindcss/utilities.css"; diff --git a/www/_layouts/default.html b/www/_layouts/default.html index c6835fd..9fa9b7d 100644 --- a/www/_layouts/default.html +++ b/www/_layouts/default.html @@ -33,7 +33,7 @@ Talks - + Professional Services diff --git a/www/contact.html b/www/contact.html index e72b787..2fb2d70 100644 --- a/www/contact.html +++ b/www/contact.html @@ -44,25 +44,25 @@
@@ -324,7 +324,7 @@
+
+