Merge branch 'v0.20' into release

Fixed export style paths
2026-02-19 11:19:38 +03:00 · 2018-03-30 15:33:23 +01:00 · 2018-03-30 15:31:39 +01:00
2 changed files with 2 additions and 2 deletions
--- a/resources/views/books/export.blade.php
+++ b/resources/views/books/export.blade.php
@@ -6,7 +6,7 @@

    <style>
        @if (!app()->environment('testing'))
-        {!! file_get_contents(public_path('/css/export-styles.css')) !!}
+        {!! file_get_contents(public_path('/dist/export-styles.css')) !!}
        @endif
        .page-break {
            page-break-after: always;
--- a/resources/views/chapters/export.blade.php
+++ b/resources/views/chapters/export.blade.php
@@ -6,7 +6,7 @@

    <style>
        @if (!app()->environment('testing'))
-        {!! file_get_contents(public_path('/css/export-styles.css')) !!}
+        {!! file_get_contents(public_path('/dist/export-styles.css')) !!}
        @endif
        .page-break {
            page-break-after: always;
Author	SHA1	Message	Date
Dan Brown	a0381f76bf	Merge branch 'v0.20' into release	2018-03-30 15:33:23 +01:00
Dan Brown	3cd08382e9	Fixed export style paths	2018-03-30 15:31:39 +01:00