Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-25 03:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some design issues and improved page export styling

Browse Source 
Fixed alignment on export options dropdown.
Fixed bullet list items sitting too close next to floated content. Fixes #34.
Fixed text overlaying images in PDF exports (Floats removed for now). Fixes #53.
Fixed spaced table cells on html & PDF exports.
This commit is contained in:
Dan Brown 2016-02-08 20:41:40 +00:00
parent 5d73d17c74
commit 9b83c57316
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/sass/_lists.scss
View File

@ -105,8 +105,8 @@
} }
.book-tree .sidebar-page-list { .book-tree .sidebar-page-list {
list-style: none; list-style: none;
margin: 0; margin: $-xs 0 0;
margin-top: $-xs; padding-left: 0;
border-left: 5px solid $color-book; border-left: 5px solid $color-book;
li a { li a {
display: block; display: block;

8
resources/assets/sass/_text.scss
View File

@ -223,13 +223,13 @@ span.highlight {
* Lists * Lists
*/ */
ul { ul {
list-style: disc; padding-left: $-m * 1.5;
margin-left: $-m*1.5; list-style: disc inside;
} }
ol { ol {
list-style: decimal; list-style: decimal inside;
margin-left: $-m*1.5; padding-left: $-m * 1.5;
} }
/* /*

7
resources/assets/sass/export-styles.scss
View File

@ -9,4 +9,9 @@
@import "tables"; @import "tables";
@import "header"; @import "header";
@import "lists"; @import "lists";
@import "pages"; @import "pages";
table {
border-spacing: 0;
border-collapse: collapse;
}

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

@ -20,5 +20,11 @@
table td { table td {
width: auto !important; width: auto !important;
} }
.page-content img.align-left, .page-content img.align-right {
float: none !important;
clear: both;
display: block;
}
</style> </style>
@stop @stop

6
resources/views/pages/show.blade.php
View File

@ -22,9 +22,9 @@
<span dropdown class="dropdown-container"> <span dropdown class="dropdown-container">
<div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div> <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
<ul class="wide"> <ul class="wide">
<li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted pull-right">.html</span></a></li> <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
<li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted pull-right">.pdf</span></a></li> <li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted pull-right">.txt</span></a></li> <li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
</ul> </ul>
</span> </span>
@if($currentUser->can('page-update')) @if($currentUser->can('page-update'))