1
0
Fork 0

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

This commit is contained in:
Fabio Comuni 2011-09-05 09:09:34 +02:00
commit 0283cbfcd3
46 changed files with 3080 additions and 1365 deletions

View file

@ -1591,7 +1591,7 @@ input#dfrn-url {
float: left;
margin: 4px;
}
.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; }
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a {
font-size: 8px;
display: block;
@ -1811,6 +1811,24 @@ a.mail-list-link {
margin-top: 10px;
}
#search-save {
margin-left: 5px;
}
.groupsideedit {
margin-right: 10px;
}
#saved-search-ul {
list-style-type: none;
}
.savedsearchdrop, .savedsearchterm {
float: left;
margin-top: 10px;
}
.savedsearchterm {
margin-left: 10px;
}
#side-follow-wrapper {
margin-top: 20px;
}
@ -2417,6 +2435,7 @@ a.mail-list-link {
}
#crepair-nick-label,
#crepair-attag-label,
#crepair-url-label,
#crepair-request-label,
#crepair-confirm-label,
@ -2428,6 +2447,7 @@ a.mail-list-link {
}
#crepair-nick,
#crepair-attag,
#crepair-url,
#crepair-request,
#crepair-confirm,