Merge master into oc_preview

1 files changed, 16 insertions, 2 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index b94d6fbcbe8..be2af2d1aa5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -130,7 +130,8 @@ table th#headerDate, table td.date {
 #filestable.multiselect {
 	top: 88px;
 }
-table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
+table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
+
 table.multiselect thead th {
 	background-color: rgba(210,210,210,.7);
 	color: #000;
@@ -298,7 +299,20 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 }
 
 .summary {
-	opacity: .5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
+	height: 70px;
+}
+
+.summary:hover, .summary, table tr.summary td {
+	background-color: transparent;
+}
+
+.summary td {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	border-bottom: none;
 }
 .summary .info {
 	margin-left: 55px;