rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-03 15:24:09 +01:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

Browse Source
This commit is contained in:
babelouest 2014-02-07 15:56:20 -05:00
commit 904bc4b523
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/contacts.css
View File

@ -676,8 +676,9 @@ fieldset.adr ul li input.label { margin-top: -4px !important; }
.multiselect #contactsHeader > td.name { .multiselect #contactsHeader > td.name {
width: 100%; width: 100%;
display: inline-block; display: inline-block;
background-color: white; color: #000;
opacity: 1; background-color: rgba(220, 220, 220, 0.8);
opacity: 0.9;
} }
#contactsHeader .delete { #contactsHeader .delete {
background-image: none; background-image: none;
@ -778,12 +779,10 @@ tbody tr.contact.active, tbody tr.contact:hover {
vertical-align: top; vertical-align: top;
white-space: nowrap; white-space: nowrap;
} }
#contactlist tr > td { #contactlist tbody > tr > td {
min-width: 80px; min-width: 80px;
line-height: 50px;
}
#contactlist:not(.multiselect) tr > td {
max-width: 250px; max-width: 250px;
line-height: 50px;
} }
#contactlist tbody > tr > td.name > input[type=checkbox]:first-child:not(.toggle) { #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; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
@ -916,6 +915,9 @@ tbody tr.contact.active, tbody tr.contact:hover {
#contactsHeader tr td.tel { display: none; } #contactsHeader tr td.tel { display: none; }
#app-navigation { width: 200px; } #app-navigation { width: 200px; }
#app-settings { width: 199px; } #app-settings { width: 199px; }
.multiselect #contactsHeader {
margin-left: 280px; padding-right: 280px;
}
} }
@media screen and (max-width: 900px) { @media screen and (max-width: 900px) {
#contactsHeader .delete { display: none; } #contactsHeader .delete { display: none; }

4
js/contacts.js
View File

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