From 439b5e664a5bcad32bde6dec6af37c11377904e6 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 11 Feb 2014 10:32:34 +0000 Subject: [PATCH 1/3] Explorer interface was cluttered by too many horizontal dividing sections in the header. 'Explorer' title has been dropped in favour of making the current section index page feel more like the title. breadcrumb also toned down --- .../wagtailadmin/css/components/listing.less | 4 +-- .../static/wagtailadmin/css/core.less | 31 ++++++++----------- .../static/wagtailadmin/css/mixins.less | 4 +-- .../templates/wagtailadmin/pages/index.html | 2 +- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less index b9e10fa0f..8d8f31f77 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less @@ -156,7 +156,7 @@ ul.listing{ color:auto; } .actions{ - margin-top:1.5em; + margin-top:1.8em; li{ border-color:@color-teal-darker; @@ -178,7 +178,6 @@ ul.listing{ } } } - } .page-explorer & .index{ @@ -187,6 +186,7 @@ ul.listing{ .title h2{ color:white; + font-size:1.3em; a:hover{ color:white; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less index 65fc848e7..15d043145 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less @@ -33,7 +33,6 @@ body{ h1,h2,h3,h4,h5,h6{ font-weight:normal; - -webkit-font-smoothing: auto; } h1{ @@ -525,15 +524,16 @@ footer{ .unlist(); .clearfix(); + padding-top:0.2em; font-size:0.85em; - margin-top:1.5em !important; margin-left:-30px; + margin-bottom:-4px; /* negates the 4px margin on the bottom of each LI, used to make it wrap nicely */ li { display: block; float: left; - background: @color-grey-3; - padding: 0.5em 1em 0.5em 2em; + background: @color-teal-darker; + padding: 0.4em 1em 0.4em 2em; position: relative; margin: 0 4px 4px 0; text-decoration: none; @@ -544,44 +544,39 @@ footer{ line-height:1.5em; a{ - color:@color-grey-2; + color:white; display:block; max-width:25em; white-space: nowrap; text-overflow:ellipsis; overflow:hidden; line-height:1.6em; - text-shadow: 1px 1px 0 rgba(255,255,255,0.5); + } &:after, &:before{ content: ""; - border-top: 1.3em solid transparent; - border-bottom: 1.3em solid transparent; + border-top: 1.2em solid transparent; + border-bottom: 1.2em solid transparent; } &:after { - border-left: 1em solid @color-grey-3; + border-left: 1em solid @color-teal-darker; position: absolute; right: -0.9em; top: 0; z-index: 1; } - &:before { + &:before { border-left: 1em solid white; position: absolute; left: 0; top: 0; } &:hover { - background: @color-teal-darker; - - a{ - color:white; - text-shadow:none; - } + background: @color-teal-dark; } &:hover:after { - border-left-color: @color-teal-darker; + border-left-color: @color-teal-dark; } &:first-child { - padding:0.5em; + padding:0.4em; .border-radius(3px 0px 0px 3px); &:before{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/mixins.less b/wagtail/wagtailadmin/static/wagtailadmin/css/mixins.less index 9eb711a27..4a0a7104e 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/mixins.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/mixins.less @@ -61,7 +61,7 @@ box-shadow: @shadow; //inset 2px 2px 3px 2px rgba(0, 0, 0, 1) } -.visuallyhidden() { +.visuallyhidden{ border: 0; clip: rect(0 0 0 0); height: 1px; @@ -81,7 +81,7 @@ } } -.visuallyvisible(){ +.visuallyvisible{ clip:none; height:auto; width:auto; diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index a5b471d61..3d0f53cc1 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -5,7 +5,7 @@ {% block content %}
-

Explorer

+

Explorer

{% if not parent_page.is_root %}