Merge branch 'master' into files-em-to-px

Conflicts:
	apps/files/css/files.css

diff --cc apps/files/css/files.css
index 546451806ebf75e3ff117b850e6c5b5799d52c87,2fc86ca537defabd2d511a724c640698017a504b..9c689c05eccbeeea74417edde335da903e7bd3f7
--- 1/apps/files/css/files.css
--- 2/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@@ -56,7 -65,10 +65,10 @@@
        top: 44px;
        width: 100%;
  }
 -#filestable tbody tr { background-color:#fff; height:2.5em; }
 +#filestable tbody tr { background-color:#fff; height:40px; }
+ #filestable, #controls {
+       min-width: 680px;
+ }
  #filestable tbody tr:hover, tbody tr:active {
        background-color: rgb(240,240,240);
  }
@@@ -173,9 -181,12 +183,12 @@@ table td.filename .nametext 
        text-overflow: ellipsis;
        max-width: 800px;
  }
 -table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 -table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 +table td.filename .uploadtext { font-weight:normal; margin-left:8px; }
 +table td.filename form { font-size:.85em; margin-left:48px; margin-right:48px; }
  
+ .ie8 input[type="checkbox"]{
+       padding: 0;
+ }
  
  /* File checkboxes */
  #fileList tr td.filename>input[type="checkbox"]:first-child {
@@@ -238,16 -249,8 +251,8 @@@
        top: 14px;
        right: 0;
  }
- #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
-       background-color: rgba(240,240,240,0.898);
-       box-shadow: -5px 0 7px rgba(240,240,240,0.898);
- }
- #fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */
-       background-color: rgba(230,230,230,.9);
-       box-shadow: -5px 0 7px rgba(230,230,230,.9);
- }
  
 -#fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
 +#fileList img.move2trash { display:inline; margin:-.5em 0; padding:16px 8px 16px 8px !important; float:right; }
  #fileList a.action.delete {
        position: absolute;
        right: 0;