diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-02-06 08:13:45 -0800 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-02-06 08:13:45 -0800 |
| commit | 3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b (patch) | |
| tree | f42c13762cdcb6f98fa7b6a4ebd9714a85db294a /apps/files | |
| parent | 09a4424b1f9458bc0ee57c3b5f5c8a2d6a6c3c77 (diff) | |
| parent | 2d77c7c0fdc49e4386994117eef35da2ad12aa4d (diff) | |
| download | nextcloud-server-3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b.tar.gz nextcloud-server-3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b.zip | |
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/files.css | 8 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 661a2e827a4..f37ac4c262a 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -3,7 +3,7 @@ See the COPYING-README file. */ /* FILE MENU */ -.actions { padding:.3em; float:left; height:2em; } +.actions { padding:.3em; float:left; height:2em; width: 100%; } .actions input, .actions button, .actions .button { margin:0; float:left; } #new { @@ -23,7 +23,7 @@ #new>ul>li>p { cursor:pointer; } #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 1em; z-index:1010; float: right; } #upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; @@ -44,7 +44,7 @@ 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; } /* FILE TABLE */ @@ -55,7 +55,7 @@ font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } -table { position:relative; top:37px; width:100%; } +table { position:relative; width:100%; } tbody tr { background-color:#fff; height:2.5em; } tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; } tbody tr.selected { background-color:#eee; } diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 2d4ed9ab2d9..0b4aa21eac3 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -59,7 +59,7 @@ <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> <?php endif; ?> -<table> +<table class="hascontrols"> <thead> <tr> <th id='headerName'> |