Dan Brown

Fixed some design issues and improved page export styling

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.
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
105 } 105 }
106 .book-tree .sidebar-page-list { 106 .book-tree .sidebar-page-list {
107 list-style: none; 107 list-style: none;
108 - margin: 0; 108 + margin: $-xs 0 0;
109 - margin-top: $-xs; 109 + padding-left: 0;
110 border-left: 5px solid $color-book; 110 border-left: 5px solid $color-book;
111 li a { 111 li a {
112 display: block; 112 display: block;
......
...@@ -223,13 +223,13 @@ span.highlight { ...@@ -223,13 +223,13 @@ span.highlight {
223 * Lists 223 * Lists
224 */ 224 */
225 ul { 225 ul {
226 - list-style: disc; 226 + padding-left: $-m * 1.5;
227 - margin-left: $-m*1.5; 227 + list-style: disc inside;
228 } 228 }
229 229
230 ol { 230 ol {
231 - list-style: decimal; 231 + list-style: decimal inside;
232 - margin-left: $-m*1.5; 232 + padding-left: $-m * 1.5;
233 } 233 }
234 234
235 /* 235 /*
......
...@@ -10,3 +10,8 @@ ...@@ -10,3 +10,8 @@
10 @import "header"; 10 @import "header";
11 @import "lists"; 11 @import "lists";
12 @import "pages"; 12 @import "pages";
13 +
14 +table {
15 + border-spacing: 0;
16 + border-collapse: collapse;
17 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,5 +20,11 @@ ...@@ -20,5 +20,11 @@
20 table td { 20 table td {
21 width: auto !important; 21 width: auto !important;
22 } 22 }
23 +
24 + .page-content img.align-left, .page-content img.align-right {
25 + float: none !important;
26 + clear: both;
27 + display: block;
28 + }
23 </style> 29 </style>
24 @stop 30 @stop
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
22 <span dropdown class="dropdown-container"> 22 <span dropdown class="dropdown-container">
23 <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div> 23 <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
24 <ul class="wide"> 24 <ul class="wide">
25 - <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted pull-right">.html</span></a></li> 25 + <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
26 - <li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted pull-right">.pdf</span></a></li> 26 + <li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
27 - <li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted pull-right">.txt</span></a></li> 27 + <li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
28 </ul> 28 </ul>
29 </span> 29 </span>
30 @if($currentUser->can('page-update')) 30 @if($currentUser->can('page-update'))
......