github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-22 14:49:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Aligned export styles a little better and fixed potential DOMPDF css error

Browse Source 
- Removed different PDF template used on pages.
- Updated export view files to have the intended format passed.
- Shared the export CSS amoung the export templates.

Should hopefully address #1886
This commit is contained in:
Dan Brown
2020-02-15 15:34:06 +00:00
parent 14363edb73
commit ccd50fe918
7 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/sass/export-styles.scss
View File

@ -5,7 +5,6 @@
@import "text";
@import "layout";
@import "blocks";
@import "forms";
@import "tables";
@import "header";
@import "lists";

5
resources/views/books/export.blade.php
View File

@ -4,10 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{ $book->name }}</title>
@include('partials.export-styles', ['format' => $format])
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;
}

6
resources/views/chapters/export.blade.php
View File

@ -4,10 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{ $chapter->name }}</title>
@include('partials.export-styles', ['format' => $format])
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;
}
@ -20,7 +19,6 @@
}
}
</style>
@yield('head')
@include('partials.custom-head')
</head>
<body>

31
resources/views/pages/export.blade.php
View File

@ -4,12 +4,31 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{ $page->name }}</title>
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
</style>
@yield('head')
@include('partials.export-styles', ['format' => $format])
@if($format === 'pdf')
<style>
body {
font-size: 14px;
line-height: 1.2;
}
h1, h2, h3, h4, h5, h6 {
line-height: 1.2;
}
table {
max-width: 800px !important;
font-size: 0.8em;
width: 100% !important;
}
table td {
width: auto !important;
}
</style>
@endif
@include('partials.custom-head')
</head>
<body>

34
resources/views/pages/pdf.blade.php
View File

@ -1,34 +0,0 @@
@extends('pages/export')
@section('head')
<style>
body {
font-size: 14px;
line-height: 1.2;
}
h1, h2, h3, h4, h5, h6 {
line-height: 1.2;
}
table {
max-width: 800px !important;
font-size: 0.8em;
width: 100% !important;
}
table td {
width: auto !important;
}
.page-content .float {
float: none !important;
}
.page-content img.align-left, .page-content img.align-right {
float: none !important;
clear: both;
display: block;
}
</style>
@stop

29
resources/views/partials/export-styles.blade.php Normal file
View File

@ -0,0 +1,29 @@
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
</style>
@if ($format === 'pdf')
<style>
/* Patches for CSS variable colors */
a {
color: {{ setting('app-color') }};
}
blockquote {
border-left-color: {{ setting('app-color') }};
}
/* Patches for content layout */
.page-content .float {
float: none !important;
}
.page-content img.align-left, .page-content img.align-right {
float: none !important;
clear: both;
display: block;
}
</style>
@endif