From 8359d3fea2e61dd8fdb9c261dbb905107af1bdc0 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 12:35:39 +0000
Subject: [PATCH] merging from ui update branch

---
 .../css/components/dropdowns.less             |  3 +++
 .../wagtailadmin/css/components/tabs.less     |  1 +
 .../static/wagtailadmin/css/core.less         |  2 ++
 .../wagtailadmin/css/layouts/page-editor.less | 11 ++++++-----
 .../static/wagtailadmin/css/variables.less    |  2 +-
 .../wagtailadmin/images/bg-editor-diag.svg    | 19 -------------------
 6 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/images/bg-editor-diag.svg

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/dropdowns.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/dropdowns.less
index 08ee663f0..f409dd42e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/dropdowns.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/dropdowns.less
@@ -25,6 +25,7 @@
         }
 
         a{
+
             box-sizing:border-box;
             white-space: nowrap;
             position:relative;
@@ -54,6 +55,7 @@
         a, input[type=submit], input[type=reset], input[type=button], .button, button{
             font-size:0.95em;
             -webkit-font-smoothing: auto;
+            text-shadow:-1px -1px 1px rgba(0,0,0,0.2);
         }
 
         label{
@@ -100,6 +102,7 @@
         width:100%;
         text-align:left;
         padding-left:1em;
+        text-shadow:-1px -1px 1px rgba(0,0,0,0.2);
     }
 
     .button{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
index 0a3208e22..950a43208 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
@@ -25,6 +25,7 @@
         color:@color-grey-2;
         border-bottom:1px solid transparent;
         border-top:0.3em solid @color-grey-3;
+        margin:0 -1px;
 
         &:hover{
             color:inherit;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index fb2be6269..44da70efa 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -382,6 +382,7 @@ header{
 
     h1, h2{
         margin:0;
+        color:white;
     }
 
     .left, .right{
@@ -513,6 +514,7 @@ footer{
             text-overflow:ellipsis;
             overflow:hidden;
             line-height:1.6em;
+            text-shadow: 1px 1px 0 white;
         }
 
         &:after, &:before{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
index 3d5c36c34..4ee3252a4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
@@ -8,7 +8,7 @@
 .objects{
     margin-top:-1em;
     padding-top:1em;
-    background:url(@{static-root}bg-editor-diag.svg);
+    background:url(@{static-root}bg-dark-diag.svg);
 }
 .object{  
 
@@ -66,11 +66,11 @@
     > h2, &.single-field label{
         -webkit-font-smoothing: auto;
         .border-radius(2px);
-        background-color:@color-grey-3; // lighten(@color-grey-4, 5%);
+        background:@color-grey-3 url(@{static-root}bg-light-diag.svg);
         text-transform:uppercase;
         padding:0.9em 0 0.9em 4em;
         font-size:1em;
-        margin:0 25px 0.2em 25px;
+        margin:0 0 0.2em 0;
         line-height:1.5em;
         font-weight:normal;
         position:absolute;
@@ -78,6 +78,7 @@
         left:0;
         right:0;
         z-index:1;
+        text-shadow:1px 1px 1px rgba(255,255,255,0.5);
 
         &:before{
             font-family:verdant;
@@ -200,7 +201,7 @@
         border-bottom:1px solid white;
 
         > h2, &.single-field label{
-            margin:0 25px;
+            margin:0 0;
             border-bottom:1px solid white;
         }
 
@@ -210,7 +211,7 @@
             position:relative;
             z-index:2;
             top:0px;
-            left:25px;
+            left:0px;
             width:3.3em;
             background-color:@color-teal;
             padding:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less b/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less
index fcacfb40c..872169144 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less
@@ -28,7 +28,7 @@
 @color-grey-5: #fafafa;
 
 @color-thead-bg: @color-grey-5;
-@color-header-bg: @color-grey-5;
+@color-header-bg: @color-teal;
 @color-fieldset-hover: @color-grey-5;
 @color-input-border: @color-grey-3;
 @color-input-focus: #f4fcfc;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/bg-editor-diag.svg b/wagtail/wagtailadmin/static/wagtailadmin/images/bg-editor-diag.svg
deleted file mode 100644
index 7830c7be6..000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/images/bg-editor-diag.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg width="5px" height="5px" viewBox="0 0 5 5" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <style type="text/css">
-            <![CDATA[
-                rect {
-                    fill: #EEE;
-                }
-            ]]>
-        </style>
-    </defs>
-    <g>
-        <rect x="0" y="4" width="1" height="1"></rect>
-        <rect x="1" y="3" width="1" height="1"></rect>
-        <rect x="2" y="2" width="1" height="1"></rect>
-        <rect x="3" y="1" width="1" height="1"></rect>
-        <rect x="4" y="0" width="1" height="1"></rect>
-    </g>
-</svg>
\ No newline at end of file