diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less index 592773b28..12ec699ac 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less @@ -34,9 +34,11 @@ legend{ } label{ - font-weight:normal; + font-weight:bold; + color:@color-grey-1; + font-size:1.1em; display:block; - padding:0 0 0.5em 0; + padding:0 0 0.7em 0; line-height:1em; .checkbox &, @@ -414,23 +416,18 @@ ul.inline li:first-child, li.inline:first-child{ } .unchosen, .chosen{ position:relative; - padding-left:@thumbnail-width+15; &:before{ + vertical-align:middle; font-family:verdant; content:""; - position:absolute; - top:0; - left:0; - margin-top:auto; - margin-bottom:auto; - display:inline-block; - opacity:0.1; - font-size:7.5em; - line-height:1em; - } - &:hover:before{ - opacity:0.2; + position:relative; + display:block; + float:left; + color:@color-grey-3; + line-height:0.85em; + font-size:2.5em; + margin-right:0.3em; } } .unchosen { @@ -445,7 +442,7 @@ ul.inline li:first-child, li.inline:first-child{ input[type=button]{ font-size:0.85em; - padding:0.9em 1.4em; + padding:0.5em 0.5em; } } @@ -454,79 +451,56 @@ ul.inline li:first-child, li.inline:first-child{ .snippet-chooser, .document-chooser { .unchosen, .chosen{ - height:100px; - &:before{ - content:"c"; - left:0.2em; + content:"b"; + margin-left:-0.1em; /* this glyphs appear to have left padding, counteracted here */ } } .chosen{ - &:before{ - content:"b"; - } .title{ - z-index:0; - float: left; - margin-left: -146px; - width: 126px; - max-height: 40px; - overflow: hidden; - font-size: 0.7em; - padding: 30px 10px 0px 10px; - display: block; - top: 0px; - position: absolute; - line-height: 1.4em; - text-align: center; - color: black; - white-space:nowrap; - text-overflow:ellipsis; + color: @color-grey-1; + display:block; + padding-left:3em; } - &:hover .title{ + .actions{ + clear:both; + padding-top:0.6em; } } } .snippet-chooser { - .unchosen:before, - .chosen:before{ - content:"D"; + .unchosen, .chosen{ + &:before{ + content:"D"; + } } } .document-chooser { .unchosen, .chosen{ - height:100px; - &:before{ content:"h"; - left:0.2em; } } - .chosen:before{ - content:"r"; - } } .image-chooser { .unchosen, .chosen{ - .clearfix; - min-height:95px; - &:before{ content:"o"; - font-size:120px; - line-height:97px; } } - .chosen{ + .chosen{ + padding-left:@thumbnail-width; + &:before{ content:""; } .preview-image{ float:left; - margin-left:-(@thumbnail-width)-15; + margin-left:-(@thumbnail-width); + margin-right:1em; } } } @@ -628,15 +602,15 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ .transition(~"background-color 0.2s ease, color 0.2s ease"); } .help{ - /* TODO: This transitionmakes the browser go nuts and the left menu jerk around. Find way to solve */ .transition(opacity 0.2s ease); } +/* .chooser { .unchosen:before, .chosen:before{ .transition(opacity 0.3s ease); } } - +*/ @media screen and (min-width: @breakpoint-mobile){ input[type=submit], input[type=reset], input[type=button], .button, button{ font-size:0.95em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less index 5cdb4439e..08f97a046 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less @@ -209,6 +209,15 @@ .icon-grip:before{ content:"U"; } +.icon-order-down:before{ + content:"X"; +} +.icon-order-up:before{ + content:"Y"; +} +.icon-bin:before{ + content:"Z"; +} .icon.text-replace{ font-size:0em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less index 049078382..d92a250ff 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less @@ -5,9 +5,9 @@ padding:0; li{ + display:inline-block; border:1px solid @color-grey-4; border-width:1px 1px 0px 1px; - text-align:center; background-color:@color-grey-5; border-top:0.3em solid @color-grey-3; @@ -33,14 +33,11 @@ border-top-color:@color-grey-3; } - &.active{ - - color:@color-grey-1; - border-bottom:2px solid white; - margin-bottom:-1px; - z-index:1; - position:relative; - } + } + + li.active a{ + border-bottom:2px solid white; + margin-bottom:-1px; } /* For cases where tab-nav should merge with header */ @@ -62,12 +59,10 @@ @media screen and (min-width: @breakpoint-mobile){ .tab-nav li{ - .column(2); padding:0; } .modal-content .tab-nav li{ - .column(2); padding:0; min-width:110px; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less index f92708cbf..dd54a80e2 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less @@ -44,7 +44,7 @@ h1{ line-height:1.3em; font-size:1.5em; text-transform:uppercase; - color:@color-grey-2; + color:@color-grey-1; font-weight:700; span{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot index 5156f60b3..d4735a541 100644 Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg index 7fcbdd94a..846f02b7a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg @@ -1,62 +1,62 @@ -This SVG font generated by Fontastic.me +Generated by Fontastic.me - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - -======= ->>>>>>> feature/ordering-integrated - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf index 59f9617e7..acf206c59 100644 Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff index 9fba4530b..201ef286f 100644 Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less index 7bae00628..ea1547aa0 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less @@ -2,11 +2,6 @@ @import "../mixins.less"; @import "../grid.less"; -.page-editor .tab-nav li{ - .column(6); - padding:0; -} - .object{ background:url(/static/wagtailadmin/images/bg-editor-diag.svg); position:relative; @@ -24,24 +19,36 @@ } fieldset{ - .column(10); padding-top:4em; padding-left:0; padding-right:0; } .object-help{ - .column(2); display:block; - position:absolute; + position:relative; z-index:1; - right:0; - top:0; + top:1em; padding-right:@grid-gutter-width/2; - float:right; margin-top:4em; - text-align:right; opacity:0; + padding-left:3em; + + &:before{ + display:block; + float:left; + content:"?"; + border:1px solid @color-grey-2; + color:@color-grey-2; + .border-radius(100%); + height:15px; + width:15px; + line-height:15px; + text-align:center; + font-size:1.1em; + margin-left:-2em; + margin-top:0.3em; + } } &:hover .object-help{ @@ -93,9 +100,6 @@ /* Special full-width, one-off fields i.e a single text or textarea input */ &.full{ - padding-left:0px; - padding-right:0px; - h2{ display:none; /* The field label is used instead */ } @@ -107,7 +111,7 @@ fieldset{ display:block; float:none; - width:auto; + padding:3.2em 0 0 0; .help{ @@ -157,12 +161,14 @@ .multiple{ .transition(max-height 5s ease); - padding-top:4em; + padding:4em 0 0 0; height:auto; + max-width:1024px - 50px; > li{ + position:relative; background-color:white; - padding:1em; + padding:2em; margin-bottom:1em; border:1px solid @color-grey-5; } @@ -188,6 +194,8 @@ .add{ cursor:pointer; + margin-bottom:3em; + clear:both; } &.empty{ @@ -245,18 +253,27 @@ /* Object controls */ .controls{ position:absolute; - right:@grid-gutter-width/2; - text-transform:uppercase; + right:1em; + top:1em; color:@color-grey-2; + overflow:hidden; + .border-radius(2px); li{ background-color: @color-grey-3; - display:inline-block; + float:left; cursor:pointer; + margin-right:1px; + + &:last-child{ + margin-right:0; + } } + .icon{ padding:0.3em; } + .icon:before{ vertical-align:middle; line-height:2em; @@ -268,6 +285,9 @@ color:white; } } + .icon-bin:hover{ + background-color:@color-red; + } .disabled{ display:none; } @@ -275,9 +295,41 @@ @media screen and (min-width: @breakpoint-mobile){ - .page-editor .tab-nav li{ - .column(3); - padding:0; - max-width:210px; + .object{ + fieldset{ + max-width:1024px; + .column(10); + padding-left:0; + padding-right:0; + } + + .object-help{ + .column(2); + display:block; + position:absolute; + z-index:1; + right:0; + top:1em; + padding-right:@grid-gutter-width/2; + float:right; + margin-top:4em; + opacity:0; + padding-left:3em; + } + + &.full{ + fieldset{ + .column(11); + margin-left:-50px; + margin-right:-50px; + padding-left:0; + padding-right:0; + } + } + .multiple{ + .column(10); + padding-left:0; + padding-right:0; + } } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less index bd7c87126..ad827a892 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less @@ -4,11 +4,13 @@ position:absolute; left:5.83%; z-index:5; + margin-top:3em; } .hallotoolbar.affixed{ position:fixed; left:5.83%; margin-left:140px; + margin-top:0; } .richtext { diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html index 53cd3a93d..4196a121c 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html @@ -15,10 +15,12 @@
{% block chosen_state_view %}{% endblock %} - {% if not field.field.required %} - - {% endif %} - +
+ {% if not field.field.required %} + + {% endif %} + +
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 3124b2c92..1a458857e 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 @@
    • {% if can_order %} -
    • Move up
      • -
    • Move down
      • +
    • Move up
      • +
    • Move down
      • {% endif %} -
    • Delete
      • +
    • Delete
    {{ child.render_form_content }}
    • diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/create.html index 46fded1bb..3fa9fdc33 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/create.html +++ b/wagtail/wagtailusers/templates/wagtailusers/create.html @@ -8,7 +8,7 @@ diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/edit.html index 65ce182a9..f12364eee 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/edit.html +++ b/wagtail/wagtailusers/templates/wagtailusers/edit.html @@ -8,7 +8,7 @@