From c1a5e9643589233e0e4e131f1b2808c40370cec9 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 6 Oct 2015 16:17:25 +0200
Subject: [PATCH] fix scrollbars in public template

---
 apps/files_sharing/css/public.css       |  5 +-
 apps/files_sharing/templates/public.php | 63 +++++++++++++------------
 core/css/styles.css                     |  2 +-
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 2b7e84c987..17356640ae 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,7 +1,10 @@
+#content {
+	height: initial;
+}
+
 #preview {
 	background: #fff;
 	text-align: center;
-	margin: 45px auto 0;
 	min-height: 200px;
 }
 
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 06d797c3c6..b5dd653d71 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -86,38 +86,39 @@ $thumbSize = 1024;
 				</a>
 			</span>
 		</div>
-	</div></header>
-<div id="content">
-	<div id="preview">
-		<?php if (isset($_['folder'])): ?>
-			<?php print_unescaped($_['folder']); ?>
-		<?php else: ?>
-			<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
-				<div id="imgframe">
-					<video tabindex="0" controls="" preload="none">
-						<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
-					</video>
-				</div>
+</div></header>
+<div id="content-wrapper">
+	<div id="content">
+		<div id="preview">
+			<?php if (isset($_['folder'])): ?>
+				<?php print_unescaped($_['folder']); ?>
 			<?php else: ?>
-				<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
-				<div id="imgframe"></div>
+				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
+					<div id="imgframe">
+						<video tabindex="0" controls="" preload="none">
+							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
+						</video>
+					</div>
+				<?php else: ?>
+					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
+					<div id="imgframe"></div>
+				<?php endif; ?>
+				<div class="directDownload">
+					<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
+						<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+						<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
+					</a>
+				</div>
+				<div class="directLink">
+					<label for="directLink"><?php p($l->t('Direct link')) ?></label>
+					<input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>">
+				</div>
 			<?php endif; ?>
-			<div class="directDownload">
-				<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
-					<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
-					<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
-				</a>
-			</div>
-			<div class="directLink">
-				<label for="directLink"><?php p($l->t('Direct link')) ?></label>
-				<input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>">
-			</div>
-		<?php endif; ?>
+		</div>
 	</div>
-
+	<footer>
+		<p class="info">
+			<?php print_unescaped($theme->getLongFooter()); ?>
+		</p>
+	</footer>
 </div>
-<footer>
-	<p class="info">
-		<?php print_unescaped($theme->getLongFooter()); ?>
-	</p>
-</footer>
diff --git a/core/css/styles.css b/core/css/styles.css
index df533aab31..1384f6403e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -1164,7 +1164,7 @@ div.crumb:active {
 
 /* public footer */
 #body-public footer {
-	margin-top: 65px;
+	position: relative;
 	text-align: center;
 }