luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved page tag box structure and fixed footer in PDF export.

Browse source 
Fixes #162.
This commit is contained in:
Dan Brown 2016-08-21 13:35:22 +01:00
parent 43d9d2eba7
commit 757f16a3b5
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
3 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/assets/sass/_pages.scss
View file

@ -250,13 +250,10 @@
margin: 0;
padding: 0;
}
span {
color: #666;
margin-left: $-s;
}
.heading {
.heading th {
padding: $-xs $-s;
color: #444;
color: #333;
font-weight: 400;
}
td {
border: 0;
@ -267,9 +264,6 @@
.tag-value {
color: #888;
}
td i {
color: #888;
}
tr:last-child td {
border-bottom: none;
}

18
resources/views/pages/page-display.blade.php
View file

@ -4,14 +4,20 @@
@if(count($page->tags) > 0)
<div class="tag-display float right">
<div class="heading primary-background-light">Page Tags</div>
<table>
@foreach($page->tags as $tag)
<tr class="tag">
<td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
@if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
<thead>
<tr class="text-left heading primary-background-light">
<th colspan="2">Page Tags</th>
</tr>
@endforeach
</thead>
<tbody>
@foreach($page->tags as $tag)
<tr class="tag">
<td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
@if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
</tr>
@endforeach
</tbody>
</table>
</div>
@endif

17
resources/views/pages/pdf.blade.php
View file

@ -3,12 +3,12 @@
@section('head')
<style>
body {
font-size: 15px;
line-height: 1;
font-size: 14px;
line-height: 1.2;
}
h1, h2, h3, h4, h5, h6 {
line-height: 1;
line-height: 1.2;
}
table {
@ -21,10 +21,21 @@
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;
}
.tag-display {
min-width: 0;
max-width: none;
display: none;
}
</style>
@stop