merging r10033 to the trunk

This commit is contained in:
tworrall 2012-09-06 14:52:54 +00:00
parent 0a4262d876
commit 5d950625c2
6 changed files with 20 additions and 11 deletions

View file

@ -66,6 +66,7 @@ section#floatRight {
}
select#typeSelect {
margin-top:0px;
margin-bottom:20px;
}
section#headerBar {
background-color:#f5f5f5;
@ -130,7 +131,7 @@ input#contentCheckbox {
}
span.deleteLinkContainer {
float:left;
margin-left:100px;
margin-left:170px;
margin-top:-36px;
}
form#managePage textarea {