Skip to content

Commit b20359f

Browse files
committed
fix: merge upstream master
2 parents 2c689cd + 7a50688 commit b20359f

16 files changed

Lines changed: 4581 additions & 4931 deletions

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ src/assets/scully-routes.json
5353
firebase-debug.log
5454

5555
scully.scully-plugins.config.js
56+
57+
scully.log
58+
.scully

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ This repository has the following available plugins for [scully](https://github.
99
| [mediumZoom](https://github.com/notiz-dev/scully-plugins/tree/master/plugins/medium-zoom#readme) | [![npm version](https://badge.fury.io/js/%40notiz%2Fscully-plugin-medium-zoom.svg)](https://www.npmjs.com/package/@notiz/scully-plugin-medium-zoom) |
1010
| [rss](https://github.com/notiz-dev/scully-plugins/tree/master/plugins/rss#readme) | [![npm version](https://badge.fury.io/js/%40notiz%2Fscully-plugin-rss.svg)](https://www.npmjs.com/package/@notiz/scully-plugin-rss) |
1111

12-
## Tailwindcss
12+
## Jamstack
1313

14-
How to configure [Angular with Tailwindcss](https://notiz.dev/blog/angular-10-with-tailwindcss)
14+
Use those plugins for your next [Jamstack: Angular + Scully + Tailwind CSS](https://notiz.dev/blog/jamstack-angular-scully-tailwind-css) application.

angular.json

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,8 @@
2424
"polyfills": "src/polyfills.ts",
2525
"tsConfig": "tsconfig.app.json",
2626
"aot": true,
27-
"assets": [
28-
"src/favicon.ico",
29-
"src/assets"
30-
],
31-
"styles": [
32-
"src/styles.scss"
33-
],
27+
"assets": ["src/favicon.ico", "src/assets"],
28+
"styles": ["src/styles.scss"],
3429
"scripts": []
3530
},
3631
"configurations": {
@@ -92,13 +87,8 @@
9287
"polyfills": "src/polyfills.ts",
9388
"tsConfig": "tsconfig.spec.json",
9489
"karmaConfig": "karma.conf.js",
95-
"assets": [
96-
"src/favicon.ico",
97-
"src/assets"
98-
],
99-
"styles": [
100-
"src/styles.scss"
101-
],
90+
"assets": ["src/favicon.ico", "src/assets"],
91+
"styles": ["src/styles.scss"],
10292
"scripts": []
10393
}
10494
},
@@ -110,9 +100,7 @@
110100
"tsconfig.spec.json",
111101
"e2e/tsconfig.json"
112102
],
113-
"exclude": [
114-
"**/node_modules/**"
115-
]
103+
"exclude": ["**/node_modules/**"]
116104
}
117105
},
118106
"e2e": {

0 commit comments

Comments
 (0)