merging 9989 to the trunk

This commit is contained in:
tworrall 2012-08-03 14:29:56 +00:00
parent 083678f5b2
commit 6a63de6144
6 changed files with 79 additions and 26 deletions

View file

@ -31,7 +31,7 @@
float:right;
padding-right:5px;
}
.sparqlHtmlContent {
.contentSectionContainer {
background-color:#f9f9f9;
padding-left:6px;
padding-top:2px;
@ -86,9 +86,9 @@ p#templatePTag {
margin-top:8px;
margin-bottom:2px;
}
p#checkboxPTag {
margin-top:10px;
margin-bottom:0px;
p#menuCheckboxPTag {
margin-top:15px;
margin-bottom:3px;
}
section.hideMenuSection {
margin-top:10px;
@ -97,6 +97,10 @@ section.hideMenuSection {
section.showMenuSection {
margin-top:10px;
}
section#addPageOne {
margin-bottom:-12px;
margin-top:8px;
}
input.doneWithContent {
display: inline;
padding: 5px 18px 7px;
@ -118,6 +122,12 @@ input.doneWithContent {
margin-bottom:8px;
margin-top:0px;
}
input#contentCheckbox {
margin-left:30px;
margin-top:5px;
vertical-align:top;
padding: 0;
}
span.deleteLinkContainer {
float:left;
margin-left:100px;