Merge branch 'pull'

This commit is contained in:
friendica 2012-01-28 13:24:53 -08:00
commit 955d2b6d83
2 changed files with 9 additions and 1 deletions

View File

@ -543,7 +543,6 @@ section {
} }
.contact-name { text-align: center; font-weight: bold; } .contact-name { text-align: center; font-weight: bold; }
.contact-details { color: @Grey3;} .contact-details { color: @Grey3;}
/* editor */ /* editor */
.jothidden { display: none; } .jothidden { display: none; }
#jot { #jot {
@ -906,3 +905,8 @@ ul.tabs {
/* page footer */ /* page footer */
footer { height: 100px; display: table-row; } footer { height: 100px; display: table-row; }
.pager {
margin-top: 25px;
clear: both;
}

View File

@ -1265,3 +1265,7 @@ footer {
height: 100px; height: 100px;
display: table-row; display: table-row;
} }
.pager {
margin-top: 25px;
clear: both;
}