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

Fixes #162.

diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index d70e0cb3cff6488f8d815bf5a0ae4c8d82157e7d..03faef3443fe01bb004011a426435fff250e5075 100644 (file)
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -250,13 +250,10 @@
     margin: 0;
     padding: 0;
   }
     margin: 0;
     padding: 0;
   }

-  span {
-    color: #666;
-    margin-left: $-s;
-  }
-  .heading {
+  .heading th {

     padding: $-xs $-s;
     padding: $-xs $-s;

-    color: #444;
+    color: #333;
+    font-weight: 400;

   }
   td {
     border: 0;
   }
   td {
     border: 0;


@@ -267,9 +264,6 @@
   .tag-value {
     color: #888;
   }
   .tag-value {
     color: #888;
   }

-  td i {
-    color: #888;
-  }

   tr:last-child td {
     border-bottom: none;
   }
   tr:last-child td {
     border-bottom: none;
   }

diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index 11bcddcfcb584afa724b193fc7e89ddc9ff57d40..2ddd4e0d8e38830fd0ce9a7375bac5b947e7f358 100644 (file)
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -4,14 +4,20 @@
 
     @if(count($page->tags) > 0)
         <div class="tag-display float right">
 
     @if(count($page->tags) > 0)
         <div class="tag-display float right">

-            <div class="heading primary-background-light">Page Tags</div>

             <table>
             <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>
                     </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
             </table>
         </div>
     @endif

diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php
index 3a376334d8a0f1ffefb73096aa1f426954c61613..0cbf4df02a32ec16f7ee99f00e4730236a034ec1 100644 (file)
--- a/resources/views/pages/pdf.blade.php
+++ b/resources/views/pages/pdf.blade.php
@@ -3,12 +3,12 @@
 @section('head')
     <style>
         body {
 @section('head')
     <style>
         body {

-            font-size: 15px;
-            line-height: 1;
+            font-size: 14px;
+            line-height: 1.2;

         }
 
         h1, h2, h3, h4, h5, h6 {
         }
 
         h1, h2, h3, h4, h5, h6 {

-            line-height: 1;
+            line-height: 1.2;

         }
 
         table {
         }
 
         table {


@@ -21,10 +21,21 @@
             width: auto !important;
         }
 
             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;
         }
         .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
\ No newline at end of file
     </style>
 @stop
\ No newline at end of file