Merge branch 'master' into delete-fix

Conflicts:
	core/css/styles.css

diff --cc core/css/styles.css
index c328804f816706cb41b162b8dfc383e9c9728479,7d927da151c615ffd387f649a0ba6d8eb76260f5..490619c00d418fb76f83409eec337f625b6feaa4
--- 1/core/css/styles.css
--- 2/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 6558adbb6a7625fe1f5f9db69f7ce16e84eaf331,cf4e72324dc33427246365d183bae9a553f1c417..64e6df0f59d10343beba50e13cc0b8d13877571e
--- 1/core/js/js.js
--- 2/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});