friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list

This commit is contained in:
Michael Vogel 2015-01-27 10:20:00 +01:00
parent 848c09935a cd7d29d13e
commit 6a34210353
6 changed files with 8370 additions and 8162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13697
view/cs/messages.po
View File

File diff suppressed because it is too large Load Diff

2738
view/cs/strings.php
View File

File diff suppressed because it is too large Load Diff

26
view/theme/quattro/dark/style.css
View File

@ -1283,6 +1283,9 @@ section {
opacity: 0.5; opacity: 0.5;
}*/ }*/
.wwto { .wwto {
position: absolute !important;
width: 25px;
height: 25px;
background: #FFFFFF; background: #FFFFFF;
border: 2px solid #364e59; border: 2px solid #364e59;
height: 25px; height: 25px;
@ -2093,10 +2096,29 @@ ul.tabs li .active {
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;
width: 90px; width: 110px;
height: 90px; height: 110px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.profile-match-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
opacity: 0.3;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .contact-photo { .profile-match-wrapper .contact-photo {
width: 80px; width: 80px;
height: 80px; height: 80px;

26
view/theme/quattro/green/style.css
View File

@ -1283,6 +1283,9 @@ section {
opacity: 0.5; opacity: 0.5;
}*/ }*/
.wwto { .wwto {
position: absolute !important;
width: 25px;
height: 25px;
background: #FFFFFF; background: #FFFFFF;
border: 2px solid #364e59; border: 2px solid #364e59;
height: 25px; height: 25px;
@ -2093,10 +2096,29 @@ ul.tabs li .active {
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;
width: 90px; width: 110px;
height: 90px; height: 110px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.profile-match-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
opacity: 0.3;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .contact-photo { .profile-match-wrapper .contact-photo {
width: 80px; width: 80px;
height: 80px; height: 80px;

26
view/theme/quattro/lilac/style.css
View File

@ -1283,6 +1283,9 @@ section {
opacity: 0.5; opacity: 0.5;
}*/ }*/
.wwto { .wwto {
position: absolute !important;
width: 25px;
height: 25px;
background: #FFFFFF; background: #FFFFFF;
border: 2px solid #364e59; border: 2px solid #364e59;
height: 25px; height: 25px;
@ -2093,10 +2096,29 @@ ul.tabs li .active {
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;
width: 90px; width: 110px;
height: 90px; height: 110px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.profile-match-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
height: 22px;
opacity: 0.3;
position: relative;
top: 10px;
left: -10px;
}
.profile-match-wrapper .contact-photo { .profile-match-wrapper .contact-photo {
width: 80px; width: 80px;
height: 80px; height: 80px;

19
view/theme/quattro/quattro.less
View File

@ -1423,9 +1423,24 @@ ul.tabs {
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;
width: 90px; width: 110px;
height: 90px; height: 110px;
margin-bottom: 20px; margin-bottom: 20px;
.drop {
background-image: url('../../../images/icons/22/delete.png');
display: block; width: 22px; height: 22px;
position: relative;
top: 10px;
left: -10px;
}
.drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block; width: 22px; height: 22px;
opacity: 0.3;
position: relative;
top: 10px;
left: -10px;
}
.contact-photo { .contact-photo {
width: 80px; height: 80px; width: 80px; height: 80px;
img { width: 80px; height: 80px; } img { width: 80px; height: 80px; }