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.

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index fa609ee337ae894c4dec5d67ef5ca573d72c2382..748694635ee1f49a650f5c5aec4757346919f2e2 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -105,8 +105,8 @@
 }
 .book-tree .sidebar-page-list {
   list-style: none;
 }
 .book-tree .sidebar-page-list {
   list-style: none;

-  margin: 0;
-  margin-top: $-xs;
+  margin: $-xs 0 0;
+  padding-left: 0;

   border-left: 5px solid $color-book;
   li a {
     display: block;
   border-left: 5px solid $color-book;
   li a {
     display: block;

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index d3663dee3f239e6acc73da907bb9574f4452e503..49989663192be24d2e315854f8673d16ceb1298a 100644 (file)
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -223,13 +223,13 @@ span.highlight {
  * Lists
  */
 ul {
  * Lists
  */
 ul {

-  list-style: disc;
-  margin-left: $-m*1.5;
+  padding-left: $-m * 1.5;
+  list-style: disc inside;

 }
 
 ol {
 }
 
 ol {

-  list-style: decimal;
-  margin-left: $-m*1.5;
+  list-style: decimal inside;
+  padding-left: $-m * 1.5;

 }
 
 /*
 }
 
 /*

diff --git a/resources/assets/sass/export-styles.scss b/resources/assets/sass/export-styles.scss
index 90fdb196c1d0d53deb5852c8c75ec93137a58a68..60450f3e2e5a1436dacc4554f41c4e363030d5d6 100644 (file)
--- a/resources/assets/sass/export-styles.scss
+++ b/resources/assets/sass/export-styles.scss
@@ -9,4 +9,9 @@
 @import "tables";
 @import "header";
 @import "lists";
 @import "tables";
 @import "header";
 @import "lists";

-@import "pages";
\ No newline at end of file
+@import "pages";
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
\ No newline at end of file

diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php
index 1077c093164d14e47dd3dbbd2bb627265db31cef..3a376334d8a0f1ffefb73096aa1f426954c61613 100644 (file)
--- a/resources/views/pages/pdf.blade.php
+++ b/resources/views/pages/pdf.blade.php
@@ -20,5 +20,11 @@
         table td {
             width: auto !important;
         }
         table td {
             width: auto !important;
         }

+
+        .page-content img.align-left, .page-content img.align-right  {
+            float: none !important;
+            clear: both;
+            display: block;
+        }

     </style>
 @stop
\ No newline at end of file
     </style>
 @stop
\ No newline at end of file

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index a2c82fd9d77f178715c98872ccea1528085c45f7..8a5bffca448e60de7f92f33b5d301fc9f25fd8db 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -22,9 +22,9 @@
                         <span dropdown class="dropdown-container">
                             <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
                             <ul class="wide">
                         <span dropdown class="dropdown-container">
                             <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
                             <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/pdf'}}" target="_blank">PDF File <span class="text-muted pull-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/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 float right">.pdf</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>
                         </span>
                         @if($currentUser->can('page-update'))
                             </ul>
                         </span>
                         @if($currentUser->can('page-update'))