diff --git a/website/Dockerfile b/website/Dockerfile index 5f3a133bc..ec9fe6307 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -60,7 +60,7 @@ COPY --chown=sculpin:sculpin src src RUN sculpin generate --env prod --output-dir /output/html COPY --chown=sculpin:sculpin . . -COPY --chown=sculpin:sculpin --from=assets /app/source/build /build +COPY --chown=sculpin:sculpin --from=assets /app/build /build ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] diff --git a/website/assets/esbuild.config.js b/website/assets/esbuild.config.js index 5afa1bd9e..915c23f23 100644 --- a/website/assets/esbuild.config.js +++ b/website/assets/esbuild.config.js @@ -20,7 +20,7 @@ console.log(watch); esbuild.build({ entryPoints: ["./js/app.js"], - outfile: "../source/build/app.js", + outfile: "/app/build/app.js", bundle: true, minify: minify, sourcemap: sourcemap, diff --git a/website/assets/tailwind.config.js b/website/assets/tailwind.config.js index 32263981b..d72f70e5d 100644 --- a/website/assets/tailwind.config.js +++ b/website/assets/tailwind.config.js @@ -1,68 +1,65 @@ -const colors = require('./tools/tailwindcss/colours') -const defaultTheme = require('tailwindcss/defaultTheme') -const { fontFamily } = defaultTheme +const colors = require("./tailwindcss/colours"); +const defaultTheme = require("tailwindcss/defaultTheme"); +const { fontFamily } = defaultTheme; module.exports = { - mode: 'jit', - darkMode: 'media', + mode: "jit", + darkMode: "media", important: true, purge: { - content: [ - 'tools/tailwindcss/safelist-classes.txt', - 'source/**/*.{md,twig}', - ], + content: ["./tailwindcss/safelist-classes.txt", "../source/**/*.{md,twig}"], }, theme: { outline: { - black: '1px solid black', - white: '1px solid white' + black: "1px solid black", + white: "1px solid white", }, extend: { typography: (theme) => ({ DEFAULT: { css: { p: { - lineHeight: 400 - } - } - } + lineHeight: 400, + }, + }, + }, }), colors, fontFamily: { sans: [ - 'Roboto Condensed', - 'Arial', - 'Helvetica Neue', - 'Helvetica', - 'sans-serif', + "Roboto Condensed", + "Arial", + "Helvetica Neue", + "Helvetica", + "sans-serif", ], mono: [ - 'ui-monospace', - 'SFMono-Regular', - 'SF Mono', - 'Consolas', - 'Liberation Mono', - ...fontFamily.mono - ] + "ui-monospace", + "SFMono-Regular", + "SF Mono", + "Consolas", + "Liberation Mono", + ...fontFamily.mono, + ], }, spacing: { - '2px': '2px' + "2px": "2px", }, borderWidth: { - 3: '3px' + 3: "3px", }, width: { - 96: '24rem' - } - } + 96: "24rem", + }, + }, }, corePlugins: { - container: false + container: false, }, plugins: [ - require('./tools/tailwindcss/plugins/focus-visible'), - require('@tailwindcss/aspect-ratio'), - require('@tailwindcss/forms'), - require('@tailwindcss/typography') - ] -} + require("./tailwindcss/plugins/focus-visible"), + require("@tailwindcss/aspect-ratio"), + require("@tailwindcss/forms"), + require("@tailwindcss/typography"), + ], +}; diff --git a/website/tools/tailwindcss/colours.js b/website/assets/tailwindcss/colours.js similarity index 100% rename from website/tools/tailwindcss/colours.js rename to website/assets/tailwindcss/colours.js diff --git a/website/tools/tailwindcss/plugins/focus-visible.js b/website/assets/tailwindcss/plugins/focus-visible.js similarity index 100% rename from website/tools/tailwindcss/plugins/focus-visible.js rename to website/assets/tailwindcss/plugins/focus-visible.js diff --git a/website/tools/tailwindcss/safelist-classes.txt b/website/assets/tailwindcss/safelist-classes.txt similarity index 100% rename from website/tools/tailwindcss/safelist-classes.txt rename to website/assets/tailwindcss/safelist-classes.txt diff --git a/website/run b/website/run index 6a6eebf65..8c9f8e2d6 100755 --- a/website/run +++ b/website/run @@ -88,7 +88,7 @@ function yarn:build:css { tailwindcss --postcss \ -i css/tailwind.pcss \ - -o source/build/app.css "${args[@]}" + -o /app/build/app.css "${args[@]}" } function yarn:build:js {