From f29b8c3db296139cb2bd65d22e68ba2b9a261b9d Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Sat, 2 Dec 2017 01:11:02 -0700
Subject: [PATCH] Fix tiles overflowing if width > columns

---
 lib/gencontent.php     | 5 ++++-
 static/css/content.css | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/gencontent.php b/lib/gencontent.php
index a6293ea..149057c 100644
--- a/lib/gencontent.php
+++ b/lib/gencontent.php
@@ -35,7 +35,7 @@ if (defined("EDIT_MODE") && EDIT_MODE == true) {
 <?php $pagesize = $database->get("page_sizes", ["sizewidth (width)", "sizeheight (height)"], ["sizeid" => $pubdata["page_size"]]); ?>
     .pub-content {
         max-width: <?php echo ($pubdata["landscape"] == 0 ? $pagesize["width"] : $pagesize["height"]); ?>;
-        min-height: <?php echo ($pubdata["landscape"] == 0 ? $pagesize["height"] : $pagesize["width"]); ?>;
+        height: <?php echo ($pubdata["landscape"] == 0 ? $pagesize["height"] : $pagesize["width"]); ?>;
     }
     
     .page-safe-line .bottom {
@@ -56,6 +56,9 @@ foreach ($styles as $style) {
 }
 
 foreach ($tiles as $tile) {
+    if ($tile["width"] > $pubdata["columns"]) {
+        $tile["width"] = $pubdata["columns"];
+    }
     ?> 
         #tile-<?php echo $tile["tileid"]; ?> {
             order: <?php echo $tile["order"]; ?>;
diff --git a/static/css/content.css b/static/css/content.css
index 04c91b4..5579e85 100644
--- a/static/css/content.css
+++ b/static/css/content.css
@@ -12,6 +12,7 @@
     margin: 0px auto;
     box-shadow: 5px 5px 15px -3px rgba(0,0,0,0.75);
     margin-bottom: 20px;
+    overflow: auto;
 }
 
 .page-safe-line div {