From 91618e22081ed425978be91f29494a85d7d88889 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 5 Feb 2014 11:12:18 +0000 Subject: [PATCH] Merge commit 'fcb9134' into reapply-design-updates-pre-split --- .../wagtailadmin/css/components/forms.less | 90 +++++--------- .../wagtailadmin/css/components/icons.less | 9 ++ .../wagtailadmin/css/components/tabs.less | 17 +-- .../static/wagtailadmin/css/core.less | 2 +- .../static/wagtailadmin/css/fonts/verdant.eot | Bin 10346 -> 12088 bytes .../static/wagtailadmin/css/fonts/verdant.svg | 114 +++++++++--------- .../static/wagtailadmin/css/fonts/verdant.ttf | Bin 10184 -> 11924 bytes .../wagtailadmin/css/fonts/verdant.woff | Bin 6028 -> 7716 bytes .../wagtailadmin/css/layouts/page-editor.less | 102 ++++++++++++---- .../wagtailadmin/css/panels/rich-text.less | 2 + .../edit_handlers/chooser_panel.html | 10 +- .../edit_handlers/inline_panel_child.html | 6 +- .../templates/wagtailusers/create.html | 2 +- .../templates/wagtailusers/edit.html | 2 +- 14 files changed, 195 insertions(+), 161 deletions(-) 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 5156f60b3b55da63be1c7f85f46fa648ebd54c54..d4735a5411ef48dfbd5857041c45f7dc385ae1a3 100644 GIT binary patch literal 12088 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 literal 10346 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 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 59f9617e7ef4a9c16f20824d4fac9e3b4de7cb6e..acf206c5956906d535e838d22bcff6927aa65037 100644 GIT binary patch literal 11924 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 PAAE}|;7s;Qo#+1oxzlgS literal 10184 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 jb_(IXzzM1R*PtCJ95#(9FBz8thlT|LG3ml}f 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 @@