diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less index 4ba4af603..de9a372e4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less @@ -30,7 +30,7 @@ legend{ } .field{ - padding:0 0 0.5em 0; + padding:0 0 0.6em 0; } label{ @@ -38,7 +38,7 @@ label{ color:@color-grey-1; font-size:1.1em; display:block; - padding:0 0 0.7em 0; + padding:0 0 0.8em 0; line-height:1em; .checkbox &, @@ -57,7 +57,8 @@ input, textarea, select, .richtext, .tagit{ background-color:@color-fieldset-hover; -webkit-appearance: none; color:@color-text-input; - font-size:1.1em; + font-size:1.2em; + font-weight:300; outline:none; &:hover{ @@ -450,12 +451,6 @@ ul.inline li:first-child, li.inline:first-child{ .page-chooser, .snippet-chooser, .document-chooser { - .unchosen, .chosen{ - &:before{ - content:"b"; - margin-left:-0.1em; /* this glyphs appear to have left padding, counteracted here */ - } - } .chosen{ .title{ color: @color-grey-1; @@ -469,6 +464,14 @@ ul.inline li:first-child, li.inline:first-child{ } } +.page-chooser{ + .unchosen, .chosen{ + &:before{ + content:"b"; + margin-left:-0.1em; /* this glyphs appear to have left padding, counteracted here */ + } + } +} .snippet-chooser { .unchosen, .chosen{ &:before{ @@ -480,7 +483,7 @@ ul.inline li:first-child, li.inline:first-child{ .document-chooser { .unchosen, .chosen{ &:before{ - content:"h"; + content:"r"; } } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less index dd54a80e2..f8a549e9a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less @@ -334,7 +334,7 @@ img{ .content{ .row(); border-top:40px solid @color-grey-5; /* this top border provides space for the floating logo to toggle the menu */ - padding-bottom:3em; + padding-bottom:4em; } body.nav-open .nav-wrapper{ @@ -372,7 +372,7 @@ body.explorer-open .nav-main{ } header{ - padding-top:2em; + padding-top:1.5em; padding-bottom:1em; background-color: @color-grey-5; border-bottom:1px solid @color-grey-4; @@ -721,8 +721,8 @@ footer, .logo{ } header{ - padding-top:2em; - padding-bottom:2em; + padding-top:1.5em; + padding-bottom:1.5em; } footer{ width:80%; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less index 8f672edda..2c48169a1 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less @@ -1,7 +1,9 @@ @import "../variables.less"; @import "../mixins.less"; @import "../grid.less"; - +.page-editor .content{ + padding-bottom:5em; +} .object{ background:url(/static/wagtailadmin/images/bg-editor-diag.svg); position:relative; @@ -80,7 +82,7 @@ height:3.2em; left:0px; width:3.3em; - background-color:@color-grey-3; + /*background-color:@color-grey-3;*/ padding:0; margin:0; cursor:pointer; @@ -138,6 +140,10 @@ line-height:1.6em; } + .richtext{ + padding-top:3em; /* to provide space for editor buttons */ + } + .error-message{ .nice-padding(); @@ -160,15 +166,16 @@ } .multiple{ - .transition(max-height 5s ease); - padding:4em 0 0 0; - height:auto; + .transition(max-height 10s ease); + padding:4.5em 0 0 0; + max-height:10000px; max-width:1024px - 50px; + overflow:hidden; > li{ position:relative; background-color:white; - padding:2em; + padding:1em 2em; margin-bottom:1em; border:1px solid @color-grey-5; } @@ -233,8 +240,8 @@ position:relative; color:white; padding:0; - line-height:2.6em; /* specific height required as parent 'a' has no height */ - font-size:1rem; + line-height:1.9em; /* specific height required as parent 'a' has no height */ + font-size:1.4rem; width:100%; } } @@ -242,7 +249,7 @@ .multiple{ padding:0; - height:0px; + max-height:0px; } } } diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html index 1a458857e..0a4b08692 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel_child.html @@ -1,10 +1,10 @@
  • {{ child.render_form_content }}