From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 15 Aug 2013 22:31:42 +0000 (-0700)
Subject: Merge pull request #4113 from owncloud/delete-fix
X-Git-Tag: v6.0.0alpha2~317
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d2767faf6104f4a4f0330c1771c488beea6245cd;p=nextcloud-server.git

Merge pull request #4113 from owncloud/delete-fix

Delete icon fix
---

d2767faf6104f4a4f0330c1771c488beea6245cd
diff --cc apps/files/js/filelist.js
index f7cc3767b25,e483626a91a..10801af3ead
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -392,11 -390,10 +390,11 @@@ var FileList=
  							files.removeClass('selected');
  						});
  						procesSelection();
 +						checkTrashStatus();
  					} else {
  						$.each(files,function(index,file) {
- 							var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
- 							deleteAction.html(oldHTML);
+ 							var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ 							deleteAction.removeClass('progress-icon').addClass('delete-icon');
  						});
  					}
  				});
diff --cc core/css/styles.css
index 1b58899eef6,3b2ffad1e41..c3d34253857
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@@ -851,32 -693,14 +867,36 @@@ button.loading 
  
  /* ---- BROWSER-SPECIFIC FIXES ---- */
  
 +/* remove dotted outlines in Firefox */
  ::-moz-focus-inner {
 -	border: 0; /* remove dotted outlines in Firefox */
 +	border: 0;
  }
+ .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+ .lte8 .delete-icon:hover, .delete-icon:focus {
+ 	background-image: url('../img/actions/delete-hover.png');
+ }
  
 +/* IE8 needs background to be set to same color to make transparency look good. */
 +.lte9 #body-login form input[type="text"] {
 +	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
 +	background-color: white; /* don't change background on hover */
 +}
 +.lte9 #body-login form input[type="password"] {
 +	/* leave out top border for 1px line between input fields*/
 +	border-left: 1px solid lightgrey;
 +	border-right: 1px solid lightgrey;
 +	border-bottom: 1px solid lightgrey;
 +	background-color: white; /* don't change background on hover */
 +}
 +.lte9 #body-login form label.infield {
 +	background-color: white; /* don't change background on hover */
 +	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
 +}
 +/* disable opacity of info text on gradient
 +   sice we cannot set a good backround color to use the filter&background hack as with the input labels */
 +.lte9 #body-login p.info {
 +	filter: initial;
 +}
  /* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
  .ie #show, .ie #show+label {
  	display: none;