Merge branch 'master' into modernizing_package_dependencies

ceesvanegmond · web-flow · commit 16c94e32b7d3 · 2017-08-06T21:54:38.000+02:00
diff --git a/composer.json b/composer.json
@@ -36,5 +36,12 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Fedeisas\\LaravelMailCssInliner\\LaravelMailCssInlinerServiceProvider"
+            ]
+        }
     }
 }
diff --git a/config/css-inliner.php b/config/css-inliner.php
@@ -9,6 +9,7 @@
 	|
 	| Css file of your style for your emails
 	| The content of these files will be added directly into the inliner
+	| Use absolute paths, ie. public_path('css/main.css')
 	|
 	*/
 

Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,12 @@`
`36`	`36`	`},`
`37`	`37`	`"config": {`
`38`	`38`	`"sort-packages": true`
	`39`	`+ },`
	`40`	`+ "extra": {`
	`41`	`+ "laravel": {`
	`42`	`+ "providers": [`
	`43`	`+ "Fedeisas\\LaravelMailCssInliner\\LaravelMailCssInlinerServiceProvider"`
	`44`	`+ ]`
	`45`	`+ }`
`39`	`46`	`}`
`40`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`\|`
`10`	`10`	`\| Css file of your style for your emails`
`11`	`11`	`\| The content of these files will be added directly into the inliner`
	`12`	`+ \| Use absolute paths, ie. public_path('css/main.css')`
`12`	`13`	`\|`
`13`	`14`	`*/`
`14`	`15`