From 2c0c11e862c9714d1db0728ab5bfa50637dbe917 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 7 Feb 2014 18:01:32 +0100
Subject: [PATCH 1/4] Change bg-color and opacity of top bar

---
 css/contacts.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/css/contacts.css b/css/contacts.css
index 020d17e8..546db417 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -676,8 +676,9 @@ fieldset.adr ul li input.label { margin-top: -4px !important; }
 .multiselect #contactsHeader > td.name {
 	width: 100%;
 	display: inline-block;
-	background-color: white;
-	opacity: 1;
+	color: #000;
+	background-color: rgba(220, 220, 220, 0.8);
+	opacity: 0.9;
 }
 #contactsHeader .delete {
 	background-image: none;

From 05a36cbc24a774e3e5991aad7f1cc34b95e933e7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 7 Feb 2014 18:07:26 +0100
Subject: [PATCH 2/4] Change top bar position based on app-navigation width

---
 css/contacts.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/css/contacts.css b/css/contacts.css
index 546db417..3ae5be66 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -917,6 +917,9 @@ tbody tr.contact.active, tbody tr.contact:hover {
 	#contactsHeader tr td.tel { display: none; }
 	#app-navigation { width: 200px; }
 	#app-settings { width: 199px; }
+	.multiselect #contactsHeader {
+		margin-left: 280px; padding-right: 280px;
+	}
 }
 @media screen and (max-width: 900px) {
 	#contactsHeader .delete { display: none; }

From 462290c78da75ef0eebd26f0254b296478f6923b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 7 Feb 2014 18:11:27 +0100
Subject: [PATCH 3/4] Fix td width change on selection

---
 css/contacts.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/css/contacts.css b/css/contacts.css
index 3ae5be66..1979afe7 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -779,12 +779,10 @@ tbody tr.contact.active, tbody tr.contact:hover {
 	vertical-align: top;
 	white-space: nowrap;
 }
-#contactlist tr > td {
+#contactlist tbody > tr > td {
 	min-width: 80px;
-	line-height: 50px;
-}
-#contactlist:not(.multiselect) tr > td {
 	max-width: 250px;
+	line-height: 50px;
 }
 #contactlist tbody > tr > td.name > input[type=checkbox]:first-child:not(.toggle) {
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;

From 898059b8ed0bd97556622d755aeef20c7e92ccdf Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 7 Feb 2014 20:49:24 +0100
Subject: [PATCH 4/4] Omit avatar character from sorting. Refs. #381

---
 js/contacts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/contacts.js b/js/contacts.js
index ea0f52b9..b882ba25 100644
--- a/js/contacts.js
+++ b/js/contacts.js
@@ -2476,8 +2476,8 @@ OC.Contacts = OC.Contacts || {};
 			if(rows[0].firstElementChild && rows[0].firstElementChild.textContent) {
 				rows.sort(function(a, b) {
 					// 10 (TEN!) times faster than using jQuery!
-					return a.firstElementChild.textContent.trim().toUpperCase()
-						.localeCompare(b.firstElementChild.textContent.trim().toUpperCase());
+					return a.firstElementChild.lastElementChild.textContent.trim().toUpperCase()
+						.localeCompare(b.firstElementChild.lastElementChild.textContent.trim().toUpperCase());
 				});
 			} else {
 				// IE8 doesn't support firstElementChild or textContent