merging from ui update branch

This commit is contained in:
Dave Cranwell 2014-02-05 12:31:38 +00:00
parent 6fb3159074
commit 864e2a9ac1
3 changed files with 11 additions and 3 deletions

View file

@ -13,7 +13,7 @@
@import "components/formatters.less";
html{
background:url(/static/verdantadmin/images/bg-body.svg);
background:url(@{static-root}bg-body.svg);
height:100%;
}

View file

@ -4,8 +4,14 @@
.page-editor .content-wrapper{
margin-bottom:10em;
}
.object{
background:url(/static/wagtailadmin/images/bg-editor-diag.svg);
.objects{
margin-top:-1em;
padding-top:1em;
background:url(@{static-root}bg-editor-diag.svg);
}
.object{
position:relative;
/*border:1px solid @color-grey-4;
border-width:1px 0 0 0;*/

View file

@ -18,6 +18,8 @@
}
.richtext {
font-family:Bitter, Georgia, serif;
padding-top:4em;
min-height:50px;
overflow: hidden;