Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue

Add visual cue when moving draggable item over droppable item,
owncloud · May 30, 2016 · 76c0bc2 · 76c0bc2
2 parents 0e3a0e0 + 56241af
commit 76c0bc2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
 }