Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Evan Prodromou 2011-09-18 19:43:55 -04:00
commit 7f2f333528

View File

@ -74,7 +74,7 @@ select {
padding-bottom: 0px; padding-bottom: 0px;
margin-top: -4px; margin-top: -4px;
} }
s
option { option {
padding-bottom: 0px; padding-bottom: 0px;
} }
@ -700,10 +700,6 @@ font-style:italic;
min-height: 1em; min-height: 1em;
} }
#shownotice .vcard .photo {
margin-bottom: 4px;
}
#shownotice .notice .entry-title { #shownotice .notice .entry-title {
font-size:2.2em; font-size:2.2em;
min-height:123px; min-height:123px;