Merge branch 'update-web' into 'master'

[web] Update web dependencies

See merge request ogs/ogs!4103

web/.gitignore

@@ -6,6 +6,7 @@ test.md
 test.jpg
 npm-debug.log
 yarn-error.log
+yarn.lock
 resources/
 
 # Generated by other tools

web/layouts/_default/baseof.html

@@ -22,7 +22,7 @@
     <div class="{{ if $subsection }}flex overflow-hidden{{ end }}">
 
       {{ if $subsection }}
-      <div class="hidden md:flex md:flex-shrink-0">
+      <div class="hidden md:flex md:shrink-0">
         <nav class="flex flex-col w-64 lg:w-72 pl-2 pr-4 mt-1 text-sm lg:text-base">
           {{ $currentMenu := index .Site.Menus $section }}
           {{ range $currentMenu }}

web/layouts/partials/components/news.html

@@ -34,7 +34,7 @@
           class="text-l lg:text-xl font-bold leading-7 text-blue-800 underline mt-3 line-clamp-1 lg:line-clamp-2">
         </h3>
         <div class="mt-2 flex items-center">
-          <div class="flex-shrink-0">
+          <div class="shrink-0">
             <img class="h-10 w-10 rounded-full" x-bind:src="getUserAvatar(topic)" alt="author avatar">
           </div>
           <div class="ml-3">
@@ -68,7 +68,7 @@
         </div>
       </a>
   </template>
-  <button class="hidden py-2 px-4 rounded bg-blue-500 text-white flex-grow-0" type="button" x-on:click="reload()">
+  <button class="hidden py-2 px-4 rounded bg-blue-500 text-white grow-0" type="button" x-on:click="reload()">
     Reload
   </button>
 </div>

web/layouts/section/releases.html

 {{ define "main" }}
 <div class="flex overflow-hidden">
 
-  <div class="hidden md:flex md:flex-shrink-0">
+  <div class="hidden md:flex md:shrink-0">
     <nav class="flex flex-col w-56 lg:w-64 pl-2 pr-4 mt-1 text-sm lg:text-base text-gray-700">
       <div class="mb-2 border-b-2 mr-2 text-gray-500">Table of contents</div>
       <div class="mb-2 hover:text-gray-900">

web/package.json

 {
   "private": true,
   "scripts": {
-    "build": "npx tailwindcss -o static/css/all.css --jit -i assets/css/main.css -m && hugo",
-    "build-with-nb": "find ../Tests/Notebooks -type f -iname '*.ipynb' -not -path \"*.ipynb_checkpoints*\" | xargs -n1 nb2hugo --site-dir . --section docs/benchmarks/notebooks --template ../Tests/Notebooks/nbconvert_templates/collapsed.md.j2 && npx tailwindcss -o static/css/all.css --jit -i assets/css/main.css -m && hugo",
+    "build": "npx tailwindcss -o static/css/all.css -i assets/css/main.css -m && hugo",
+    "build-with-nb": "find ../Tests/Notebooks -type f -iname '*.ipynb' -not -path \"*.ipynb_checkpoints*\" | xargs -n1 nb2hugo --site-dir . --section docs/benchmarks/notebooks --template ../Tests/Notebooks/nbconvert_templates/collapsed.md.j2 && npx tailwindcss -o static/css/all.css -i assets/css/main.css -m && hugo",
     "server": "hugo server",
     "index": "hugo-algolia -toml",
     "upload-index": "hugo-algolia --toml -s"
   },
   "devDependencies": {
-    "@tailwindcss/line-clamp": "^0.2.1",
-    "@tailwindcss/typography": "^0.4.1",
-    "hugo-algolia": "^1.2.13",
-    "tailwindcss": "^2.2.15"
+    "@tailwindcss/line-clamp": "=0.3.1",
+    "@tailwindcss/typography": "=0.5.2",
+    "hugo-algolia": "=1.2.14",
+    "tailwindcss": "=3.0.24"
   }
 }

web/tailwind.config.js

 const defaultTheme = require('tailwindcss/defaultTheme')
+const colors = require('tailwindcss/colors')
 
 module.exports = {
-  purge: [
+  content: [
     './layouts/**/*.html',
   ],
   theme: {
@@ -31,6 +32,9 @@ module.exports = {
           800: '#072350',
           900: '#051735',
         },
+        green: colors.emerald,
+        yellow: colors.amber,
+        purple: colors.violet
       }
     },
   },