Merge branch 'v0.20' to gain export fix
This commit is contained in:
		
						commit
						cfdf5b93d9
					
				| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <style>
 | 
					    <style>
 | 
				
			||||||
        @if (!app()->environment('testing'))
 | 
					        @if (!app()->environment('testing'))
 | 
				
			||||||
        {!! file_get_contents(public_path('/css/export-styles.css')) !!}
 | 
					        {!! file_get_contents(public_path('/dist/export-styles.css')) !!}
 | 
				
			||||||
        @endif
 | 
					        @endif
 | 
				
			||||||
        .page-break {
 | 
					        .page-break {
 | 
				
			||||||
            page-break-after: always;
 | 
					            page-break-after: always;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <style>
 | 
					    <style>
 | 
				
			||||||
        @if (!app()->environment('testing'))
 | 
					        @if (!app()->environment('testing'))
 | 
				
			||||||
        {!! file_get_contents(public_path('/css/export-styles.css')) !!}
 | 
					        {!! file_get_contents(public_path('/dist/export-styles.css')) !!}
 | 
				
			||||||
        @endif
 | 
					        @endif
 | 
				
			||||||
        .page-break {
 | 
					        .page-break {
 | 
				
			||||||
            page-break-after: always;
 | 
					            page-break-after: always;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue