diff --git a/.github/workflows/deploy_version.yaml b/.github/workflows/deploy_version.yaml index e37c27c..77910c0 100644 --- a/.github/workflows/deploy_version.yaml +++ b/.github/workflows/deploy_version.yaml @@ -26,6 +26,16 @@ jobs: shell: bash run: echo "BRANCH_NAME=${{ env.BRANCH_NAME }}" + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + + - name: Install dependencies + run: | + npm install + npm install -D postcss postcss-cli autoprefixer tailwindcss + - name: Setup Hugo uses: ./.github/actions/setup-hugo @@ -43,4 +53,4 @@ jobs: port: ${{ secrets.SFTP_PORT }} key: ${{ secrets.STAGE_ID }} uploads: | - ./public/ => ./ivoa-web-stage/v/${{ env.BRANCH_NAME }} + ./public/ => ./ivoa-web-stage/v/${{ env.BRANCH_NAME }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index c9e1376..7976c36 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,8 @@ hugo_stats.json # ignore PageFind in case you have installed it in the project directory /pagefind-bin/ /pagefind-bin_old/ -/pagefind*.tar.gz \ No newline at end of file +/pagefind*.tar.gz + +.idea +node_modules +/dist \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e69de29 diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css new file mode 100644 index 0000000..dc2e598 --- /dev/null +++ b/assets/css/tailwind.css @@ -0,0 +1,31 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + html { + font-family: "Inter", sans-serif; + } + a { + @apply text-secondary hover:text-secondary/80 hover:underline hover:decoration-1; + } + h1 { + @apply text-primary text-xl font-bold leading-tight mb-3 mt-3 text-center; + } + h3 { + @apply text-primary text-lg font-bold leading-tight mb-3 mt-3 text-center; + } + hr { + @apply border-primary; + } + p { + @apply text-justify mb-3; + } + ul { + @apply list-disc ml-6; + } + ul.menu { + @apply list-none; /* or directly use: list-style-type: none; */ + } +} + diff --git a/hugo.toml b/hugo.toml index 8ad1191..af84bee 100644 --- a/hugo.toml +++ b/hugo.toml @@ -2,3 +2,15 @@ baseURL = "https://webtest.ivoa.info" languageCode = "en-us" title = "International Virtual Observatory Alliance" author = "IVOA.net" + +[markup] + [markup.goldmark] + [markup.goldmark.renderer] + unsafe = true + +[build] + writeStats = true + useResourceCacheWhen = "fallback" + +[minify] + disableJS = true \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 2427a96..6e8598b 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,9 +2,9 @@ {{- partial "head.html" . -}} {{- .Scratch.Set "canBeIndexed" (or (or (eq .BundleType "branch") (hasPrefix .Type "_")) (or (eq .Kind "term") (eq .Kind "taxonomy"))) }} - + {{- partial "header.html" . -}} -
+
{{- block "main" . }}{{- end }}
{{- partial "sitemap.html" . -}} diff --git a/layouts/newsletter/single.html b/layouts/newsletter/single.html index e318027..85b8b19 100644 --- a/layouts/newsletter/single.html +++ b/layouts/newsletter/single.html @@ -2,9 +2,9 @@ {{- $pdf := printf "newsletter_pdf/%s.pdf" .File.BaseFileName }} -