Skip to content

Commit

Permalink
Merge branch '2.x-dev' into new-asset-system
Browse files Browse the repository at this point in the history
  • Loading branch information
caendesilva committed Nov 17, 2024
2 parents cd2a400 + a4c41cb commit c2f76be
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion _media/app.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hyde/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"devDependencies": {
"@tailwindcss/typography": "^0.5.2",
"autoprefixer": "^10.4.5",
"hydefront": "^3.4.0",
"hydefront": "^3.4.1",
"laravel-mix": "^6.0.49",
"postcss": "^8.4.31",
"prettier": "3.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/hydefront/dist/app.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/hydefront/dist/hyde.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hydefront/dist/hyde.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/hydefront/hyde.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@
@use 'sass/markdown/blockquotes';
@use 'sass/markdown/codeblocks';
@use 'sass/utilities/alpine';
@use 'sass/patches/typography';
4 changes: 2 additions & 2 deletions packages/hydefront/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hydefront/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hydefront",
"version": "3.4.0",
"version": "3.4.1",
"description": "Frontend assets for HydePHP",
"scripts": {
"prod": "sass hyde.scss dist/hyde.css --style=compressed && php .github/scripts/post-build.php --inject-version",
Expand Down
4 changes: 0 additions & 4 deletions packages/hydefront/sass/patches/_typography.scss

This file was deleted.

0 comments on commit c2f76be

Please sign in to comment.