1
0
Fork 0

Merge remote-tracking branch 'friendika/master' into newui

This commit is contained in:
Fabio Comuni 2011-08-30 11:00:23 +02:00
commit d0926240a8
45 changed files with 4569 additions and 960 deletions

View file

@ -743,7 +743,8 @@ input#dfrn-url {
.contact-entry-wrapper {
float: left;
width: 180px;
width: 120px;
height: 120px;
}
.contact-entry-direction-icon {
@ -759,7 +760,9 @@ input#dfrn-url {
}
.contact-entry-name {
float: left;
margin-left: 30px;
margin-left: 0px;
width: 120px;
overflow: hidden;
}
.contact-entry-edit-links {
margin-top: 6px;
@ -777,6 +780,7 @@ input#dfrn-url {
}
.contact-entry-photo {
float: left;
position: relative;
}
.contact-entry-end {
clear: both;
@ -784,6 +788,7 @@ input#dfrn-url {
#contact-edit-end {
clear: both;
margin-bottom: 65px;
}
#fsuggest-desc, #fsuggest-submit-wrapper {
@ -1374,6 +1379,12 @@ input#dfrn-url {
margin-left: 30px;
}
#contact-edit-nettype {
margin-top: 5px;
margin-left: 30px;
}
#contact-edit-poll-wrapper {
margin-left: 50px;
margin-top: 30px;
@ -1458,6 +1469,35 @@ input#dfrn-url {
/*margin-left: 50px;*/
}
.contact-photo-menu-button {
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
height: 16px;
top: 64px; left:0px;
overflow: hidden;
text-indent: 40px;
display: none;
}
.contact-photo-menu {
width: auto;
border: 2px solid #444444;
background: #FFFFFF;
position: absolute;
left: 0px; top: 90px;
display: none;
z-index: 10000;
}
.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
.contact-photo-menu li a { display: block; padding: 2px; }
.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
#block-message, #ignore-message {
margin-top: 20px;
color: #FF0000;