Merge pull request #3672 from owncloud/files-contrast

Contrast fixes

3 files changed, 19 insertions, 8 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f788949b1b6..108dcd741c6 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -63,8 +63,12 @@
 }
 #filestable { position: relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
-tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
-tbody tr.selected { background-color:#eee; }
+tbody tr:hover, tbody tr:active {
+	background-color: rgb(240,240,240);
+}
+tbody tr.selected {
+	background-color: rgb(230,230,230);
+}
 tbody a { color:#000; }
 span.extension, span.uploading, td.date { color:#999; }
 span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
@@ -81,7 +85,12 @@ table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-
 /* Multiselect bar */
 #filestable.multiselect { top:63px; }
 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 th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
+table.multiselect thead th {
+	background-color: rgba(210,210,210,.7);
+	color: #000;
+	font-weight: bold;
+	border-bottom: 0;
+}
 table.multiselect #headerName { width: 100%; }
 table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
 table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
@@ -115,10 +124,12 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 }
 #fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
 #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
-	background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
+	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:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
+	background-color: rgba(230,230,230,.9);
+	box-shadow: -5px 0 7px rgba(230,230,230,.9);
 }
 #fileList .fileactions a.action img { position:relative; top:.2em; }
 #fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c24d1fd8244..e19a35bbc5b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@ var FileList={
 		}else{
 			simpleSize=t('files', 'Pending');
 		}
-		var sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+		var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
 		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
 		td = $('<td></td>').attr({
 			"class": "filesize",
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1719d25e660..1e94275dcba 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -3,12 +3,12 @@
 <?php foreach($_['files'] as $file):
 	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
-	$simple_size_color = intval(200-$file['size']/(1024*1024)*2);
+	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
 	$relative_modified_date = OCP\relative_modified_date($file['mtime']);
 	// the older the file, the brighter the shade of grey; days*14
 	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
-	if($relative_date_color>200) $relative_date_color = 200;
+	if($relative_date_color>160) $relative_date_color = 160;
 	$name = rawurlencode($file['name']);
 	$name = str_replace('%2F', '/', $name);
 	$directory = rawurlencode($file['directory']);