Merge branch 'master' into 2.x-dev

hydephp · Apr 29, 2024 · 9a3422d · 9a3422d
2 parents b7027b7 + 7d3c202
commit 9a3422d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -181,7 +181,7 @@ jobs:
           add: '["_media/app.css", "packages/hydefront/dist/app.css"]'
           message: 'Compile TailwindCSS for production'
           new_branch: compile-tailwindcss
-          tag_push: '--force'
+          push: '--set-upstream origin compile-tailwindcss --force'
           # Todo create PR or just push to master?
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
         "watch": "mix watch"
     },
     "devDependencies": {
-        "@tailwindcss/typography": "^0.5.12",
+        "@tailwindcss/typography": "^0.5.13",
         "autoprefixer": "^10.4.19",
         "hydefront": "^3.3.0",
         "laravel-mix": "^6.0.49",