From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 23 Jul 2013 14:24:34 +0000 (+0200)
Subject: Merge branch 'master' into delete-fix
X-Git-Tag: v6.0.0alpha2~317^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a420218156d1e4ed3f88a50fd3b0d60476eeeb9;p=nextcloud-server.git

Merge branch 'master' into delete-fix

Conflicts:
	core/css/styles.css
---

2a420218156d1e4ed3f88a50fd3b0d60476eeeb9
diff --cc core/css/styles.css
index c328804f816,7d927da151c..490619c00d4
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@@ -685,7 -680,9 +688,13 @@@ button.loading 
  ::-moz-focus-inner {
  	border: 0; /* remove dotted outlines in Firefox */
  }
 +.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');
- }
++}
+ 
+ /* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
+ .ie #show, .ie #show+label {
+ 	display: none;
+ 	visibility: hidden;
+ }
diff --cc core/js/js.js
index 6558adbb6a7,cf4e72324dc..64e6df0f59d
--- a/core/js/js.js
+++ b/core/js/js.js
@@@ -664,9 -664,8 +664,7 @@@ $(document).ready(function()
  	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
  	$('#upload').tipsy({gravity:'w', fade:true});
  	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
 -	$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
  	$('a.action').tipsy({gravity:'s', fade:true, live:true});
- 	$('#headerSize').tipsy({gravity:'s', fade:true, live:true});
- 	$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
  	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
  
  	$('input').tipsy({gravity:'w', fade:true});