Skip to content

Commit 21040f5

Browse files
committed
Merge branch 'release/1.1.0'
2 parents 2a3edcf + 636e378 commit 21040f5

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ You should also install **Laravel Mix**, otherwise this plugin is pretty useless
2828

2929
In your `site/config/config.php` you can set two options to make this helper work with your specific setup:
3030

31-
### `diverently.laravel-mix-kirby.manifestPath`
31+
#### `diverently.laravel-mix-kirby.manifestPath`
3232

3333
This is where the helper function will look for the manifest created by Laravel Mix.
3434

3535
Default: `assets/mix-manifest.json`
3636

37-
### `diverently.laravel-mix-kirby.assetsDirectory`
37+
#### `diverently.laravel-mix-kirby.assetsDirectory`
3838

3939
This will be prepended to the individual file paths given to the `mix()` function when creating the final HTML tags.
4040

@@ -49,11 +49,11 @@ The `mix()` helper function reads the `mix-manifest.json` file and returns the r
4949
```php
5050
<html>
5151
<head>
52-
// ...
52+
<!-- ... -->
5353
<?php echo mix('/main.css') ?>
5454
</head>
5555
<body>
56-
// ...
56+
<!-- ... -->
5757
<?php echo mix('/main.js') ?>
5858
</body>
5959
</html>
@@ -71,16 +71,17 @@ After that you can start using Laravel Mix in your project.
7171

7272
### `webpack.mix.js`
7373

74-
See the [official document](https://laravel-mix.com/docs/4.0/basic-example) for more information.
74+
See the [official documentation](https://laravel-mix.com/docs/4.0/basic-example) for more information.
7575

7676
```js
77-
let mix = require('laravel-mix)
78-
mix.setPublicPath('assets')
79-
mix.browserSync('my-website.dev')
80-
mix.sourceMaps()
81-
.js('src/js/main.js', 'assets')
82-
.sass('src/css/main.scss', 'assets')
83-
.version();
77+
let mix = require("laravel-mix")
78+
mix.setPublicPath("assets")
79+
mix.browserSync("my-website.dev")
80+
mix
81+
.sourceMaps()
82+
.js("src/js/main.js", "assets")
83+
.sass("src/css/main.scss", "assets")
84+
.version()
8485
```
8586

8687
### NPM scripts
@@ -99,11 +100,12 @@ Add the following NPM scripts to your `package.json`:
99100

100101
## License
101102

102-
MIT
103+
[MIT](https://github.com/Diverently/laravel-mix-kirby/blob/master/LICENSE.md)
103104

104105
## Credits
105106

106107
[Robert Cordes](https://github.com/RobertCordes)
108+
107109
[Diverently](https://diverently.com)
108110

109111
> The idea behind this originally came from the `mix` Blade helper created for the Laravel framework. This is merely a "translation" for the Kirby CMS, only that it also generates the correct HTML tag depending on what file type you request.

0 commit comments

Comments
 (0)