summaryrefslogtreecommitdiffstats
path: root/files/css/files.css
diff options
context:
space:
mode:
authorDawid Opis <ncore@ncore.com.pl>2011-08-11 22:29:48 +0200
committerDawid Opis <ncore@ncore.com.pl>2011-08-11 22:29:48 +0200
commit11b3c10cc61b42174c3f3bc46276c59135dff856 (patch)
tree40912e1a8326b9f13eb132ba0fa6ba3b093279dd /files/css/files.css
parent9683d44633cd24696573a0c3ca193a3b5d06f1b7 (diff)
parentce9b36fd3ed2f229886abe32b84698733321d399 (diff)
downloadnextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.tar.gz
nextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.zip
resolved merge conflicts
Diffstat (limited to 'files/css/files.css')
-rw-r--r--files/css/files.css2
1 files changed, 2 insertions, 0 deletions
diff --git a/files/css/files.css b/files/css/files.css
index 2e96e113f1f..e0282d2ce05 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -21,6 +21,8 @@
.file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
.file_upload_filename { z-index:100; cursor:pointer;}
+.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
+
/* FILE TABLE */
span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
table { position:relative; top:37px; width:100%; }