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

Files: fix positioning of Trash button and upload progress bar

This commit is contained in:
Robin Appelman 2013-02-03 17:12:57 +01:00 committed by Thomas Tanghus
parent bb9be6f629
commit 9060c3bd83
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/css/files.css
View File

@ -23,7 +23,7 @@
#new>ul>li>p { cursor:pointer; } #new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; } #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
#trash { height:17px; margin:0 0 0 1em; z-index:1010; position:absolute; right:13.5em; } #trash { height:17px; margin:0.3em 0.3em 0.3em 1em; z-index:1010; float: right; }
#upload { #upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden; height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@ -44,7 +44,7 @@
z-index:20; position:relative; cursor:pointer; overflow:hidden; z-index:20; position:relative; cursor:pointer; overflow:hidden;
} }
#uploadprogresswrapper { position:absolute; right:13.5em; top:0em; } #uploadprogresswrapper { float: right; position: relative; }
#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; } #uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
/* FILE TABLE */ /* FILE TABLE */

16
apps/files/templates/index.php
View File

@ -35,18 +35,18 @@
<a href="#" class="svg" onclick="return false;"></a> <a href="#" class="svg" onclick="return false;"></a>
</form> </form>
</div> </div>
<?php if ($_['trash'] ): ?> </div>
<?php if ($_['trash'] ): ?>
<div id="trash" class="button"> <div id="trash" class="button">
<a><?php echo $l->t('Trash');?></a> <a><?php echo $l->t('Trash');?></a>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div id="uploadprogresswrapper"> <div id="uploadprogresswrapper">
<div id="uploadprogressbar"></div> <div id="uploadprogressbar"></div>
<input type="button" class="stop" style="display:none" <input type="button" class="stop" style="display:none"
value="<?php echo $l->t('Cancel upload');?>" value="<?php echo $l->t('Cancel upload');?>"
onclick="javascript:Files.cancelUploads();" onclick="javascript:Files.cancelUploads();"
/> />
</div>
</div> </div>
<div id="file_action_panel"></div> <div id="file_action_panel"></div>
<?php else:?> <?php else:?>