mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19611 from owncloud/fix-public-scroll 

Fix scrollbars in public template
This commit is contained in:
Thomas Müller 2015-10-08 13:01:01 +02:00
parent 33cf1c3c92 ccfd052e81
commit e5bbec79a6
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_sharing/css/public.css
View File

@ -1,8 +1,12 @@
#content {
height: initial;
min-height: calc(100vh - 120px);
overflow: hidden;
}
#preview { #preview {
background: #fff; background: #fff;
text-align: center; text-align: center;
margin: 45px auto 0;
min-height: 200px;
} }
#preview .notCreatable { #preview .notCreatable {

63
apps/files_sharing/templates/public.php
View File

@ -86,38 +86,39 @@ $thumbSize = 1024;
</a> </a>
</span> </span>
</div> </div>
</div></header> </div></header>
<div id="content"> <div id="content-wrapper">
<div id="preview"> <div id="content">
<?php if (isset($_['folder'])): ?> <div id="preview">
<?php print_unescaped($_['folder']); ?> <?php if (isset($_['folder'])): ?>
<?php else: ?> <?php print_unescaped($_['folder']); ?>
<?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: ?> <?php else: ?>
<!-- Preview frame is filled via JS to support SVG images for modern browsers --> <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
<div id="imgframe"></div> <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; ?> <?php endif; ?>
<div class="directDownload"> </div>
<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> </div>
<footer>
<p class="info">
<?php print_unescaped($theme->getLongFooter()); ?>
</p>
</footer>

9
core/css/styles.css
View File

@ -404,8 +404,7 @@ input[type="submit"].enabled {
width: 100%; width: 100%;
} }
#content .hascontrols { #content .hascontrols {
position: relative; margin-top: 45px;
top: 45px;
} }
#content-wrapper { #content-wrapper {
position: absolute; position: absolute;
@ -425,9 +424,9 @@ input[type="submit"].enabled {
.emptycontent { .emptycontent {
font-size: 16px; font-size: 16px;
color: #888; color: #888;
position: absolute;
text-align: center; text-align: center;
top: 30%; margin-top: 100px; /* ie8 */
margin-top: 30vh;
width: 100%; width: 100%;
} }
#emptycontent h2, #emptycontent h2,
@ -1164,7 +1163,7 @@ div.crumb:active {
/* public footer */ /* public footer */
#body-public footer { #body-public footer {
margin-top: 65px; position: relative;
text-align: center; text-align: center;
} }