diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-17 19:10:46 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-17 19:10:46 +0200 |
| commit | b59ce403d8ea80ba7aac5683f667853218757502 (patch) | |
| tree | 2e657117cc3e9fd7a8dfe032945cb1e9a63edc46 /apps/files/css | |
| parent | 2c9b3d32efa466b655a7f24c5022a42045ef482f (diff) | |
| parent | 9d18e16c77e8c2690dd23dd19ca1f8e1968161c8 (diff) | |
| download | nextcloud-server-b59ce403d8ea80ba7aac5683f667853218757502.tar.gz nextcloud-server-b59ce403d8ea80ba7aac5683f667853218757502.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
Diffstat (limited to 'apps/files/css')
| -rw-r--r-- | apps/files/css/files.css | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 06088b30fff..ff593fc4d24 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -336,6 +336,27 @@ table.dragshadow td.size { text-align: center; margin-left: -200px; } +.mask { + z-index: 50; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: white; + background-repeat: no-repeat no-repeat; + background-position: 50%; + opacity: 0.7; + filter: alpha(opacity=70); + transition: opacity 100ms; + -moz-transition: opacity 100ms; + -o-transition: opacity 100ms; + -ms-transition: opacity 100ms; + -webkit-transition: opacity 100ms; +} +.mask.transparent{ + opacity: 0; +} .oc-dialog .fileexists table { width: 100%; |