diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-09 21:49:21 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-09 21:49:21 -0500 |
| commit | fbcf62389c195410def29e04b9e515324d0a128f (patch) | |
| tree | 19c01805ed2c6937e676eb40cc2d537ef0135a6f /apps/files/css/files.css | |
| parent | 78043d73e83b95b0d1328598f59a1a65707f4ca6 (diff) | |
| parent | 912050afa0bd963fdde7d7b223c32bb9bd8e1479 (diff) | |
| download | nextcloud-server-fbcf62389c195410def29e04b9e515324d0a128f.tar.gz nextcloud-server-fbcf62389c195410def29e04b9e515324d0a128f.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/lib/webdav.php
Diffstat (limited to 'apps/files/css/files.css')
| -rw-r--r-- | apps/files/css/files.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 99c39f0acdb..36a1e5c954b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -21,14 +21,14 @@ #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em; background-repeat:no-repeat; cursor:pointer; } #new>ul>li>p { cursor:pointer; } -#new>ul>li>input { padding:0.3em; margin:-0.3em; } +#new>ul>li>form>input { padding:0.3em; margin:-0.3em; } #upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; } #upload a { position:relative; display:block; width:100%; height:27px; - cursor:pointer; z-index:1000; + cursor:pointer; z-index:10; background-image:url('%webroot%/core/img/actions/upload.svg'); background-repeat:no-repeat; background-position:7px 6px; @@ -39,7 +39,7 @@ left:0; top:0; width:28px; height:27px; padding:0; font-size:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; - z-index:-1; position:relative; cursor:pointer; overflow:hidden; + z-index:20; position:relative; cursor:pointer; overflow:hidden; } #uploadprogresswrapper { position:absolute; right:13.5em; top:0em; } |