diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-30 16:03:36 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-30 16:03:36 +0200 |
| commit | 76c0bc29fe2caaddce4e21b80b51781969287eb9 (patch) | |
| tree | b34e6ef0dd3b9713a1a4874a8aae03a433f50908 | |
| parent | 0e3a0e0fdb17938d473434d94e3c16c1c5dccf73 (diff) | |
| parent | 56241afad790a05bf7d5e2eeedb4ebc05de2cfa7 (diff) | |
| download | nextcloud-server-76c0bc29fe2caaddce4e21b80b51781969287eb9.tar.gz nextcloud-server-76c0bc29fe2caaddce4e21b80b51781969287eb9.zip | |
Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue
Add visual cue when moving draggable item over droppable item,
| -rw-r--r-- | apps/files/css/files.css | 5 | ||||
| -rw-r--r-- | apps/files/js/breadcrumb.js | 3 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | core/css/styles.css | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 373739071e9..94eafe27520 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -828,3 +828,8 @@ html.ie8 #controls .button.new { .app-files .actions .button.new .icon { margin-bottom: 2px; } + +.canDrop, +#filestable tbody tr.canDrop { + background-color: rgba(255, 255, 140, 1); +} diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 58ac9924ef7..98de7aa374c 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -133,7 +133,8 @@ drop: this.onDrop, over: this.onOver, out: this.onOut, - tolerance: 'pointer' + tolerance: 'pointer', + hoverClass: 'canDrop' }); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 38b9007d0bc..f249f2d35c9 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1320,7 +1320,7 @@ } // allow dropping on folders if (this._folderDropOptions && mime === 'httpd/unix-directory') { - filenameTd.droppable(this._folderDropOptions); + tr.droppable(this._folderDropOptions); } if (options.hidden) { diff --git a/core/css/styles.css b/core/css/styles.css index d8d53bd0324..837b3259781 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -862,7 +862,9 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} div.crumb { float: left; display: block; - background: url('../img/breadcrumb.svg') no-repeat right center; + background-image: url('../img/breadcrumb.svg'); + background-repeat: no-repeat; + background-position: right center; height: 44px; background-size: auto 24px; } |