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

---
 .../static/wagtailadmin/css/components/tabs.less    | 13 +++++--------
 .../wagtailadmin/static/wagtailadmin/css/core.less  |  1 +
 .../templates/wagtailredirects/add.html             |  8 +++-----
 .../templates/wagtailredirects/confirm_delete.html  |  2 +-
 .../templates/wagtailredirects/edit.html            |  8 +++-----
 .../templates/wagtailredirects/index.html           |  5 +++--
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
index 8c62523cd..0a3208e22 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less
@@ -9,14 +9,9 @@
         width:48%;
         float:left;
         border:1px solid @color-grey-4;
-        border-width:1px 1px 0px 1px;
+        border-width:0px 1px;
         background-color:@color-grey-5;
-        border-top:0.3em solid @color-grey-3;
-
-        &.active{
-            background-color:white;
-            border-top:0.3em solid @color-grey-1;  
-        }
+        margin-right:2px;
     }
     a{
         outline:none;
@@ -29,15 +24,17 @@
         padding:0 20px;
         color:@color-grey-2;
         border-bottom:1px solid transparent;
+        border-top:0.3em solid @color-grey-3;
 
         &:hover{
             color:inherit;
             border-top-color:@color-grey-3;
         }
-
     }
 
     li.active a{
+        background-color:white;
+        border-top:0.3em solid @color-grey-1;  
         border-bottom:2px solid white;
         margin-bottom:-1px;
     }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index df9abe9a0..2218cea6b 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -339,6 +339,7 @@ img{
         .row();
         border-top:40px solid @color-grey-5; /* this top border provides space for the floating logo to toggle the menu */
         padding-bottom:4em;
+         position:relative; /* yuk. necessary for positions for jquery ui widgets */
     }
 
 body.nav-open .nav-wrapper{
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/add.html b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
index c1433ffd3..ecdf4b411 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/add.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
@@ -1,23 +1,21 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Add redirect{% endblock %}
+{% block bodyclass %}menu-redirects{% endblock %}
 {% block content %}
 
     {% include "wagtailadmin/shared/header.html" with title="Add redirect" %}
 
-    <form action="{% url 'wagtailredirects_add_redirect' %}" method="POST">
+    <form action="{% url 'wagtailredirects_add_redirect' %}" method="POST" class="nice-padding">
         {% csrf_token %}
         {{ edit_handler.render_form_content }}
 
-        <div class="nice-padding">
+        <div>
             <input type="submit" value="Save" />
         </div>
     </form>
     
 {% endblock %}
 
-{% block extra_css %}
-    {% include "wagtailadmin/pages/_editor_css.html" %}
-{% endblock %}
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
index 800c4ae5b..f4dbbaca1 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-
+{% block bodyclass %}menu-redirects{% endblock %}
 {% block titletag %}Delete redirect {{ redirect.title }}{% endblock %}
 {% block content %}
 
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
index b58b399ad..c34f040d5 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
@@ -1,14 +1,15 @@
 {% extends "wagtailadmin/base.html" %}
+{% block bodyclass %}menu-redirects{% endblock %}
 {% block titletag %}Editing {{ redirect.title }}{% endblock %}
 {% block content %}
 
     {% include "wagtailadmin/shared/header.html" with title="Editing" subtitle=redirect.title %}
 
-    <form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST">
+    <form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST" class="nice-padding">>
         {% csrf_token %}
         {{ edit_handler.render_form_content }}
 
-        <div class="nice-padding">
+        <div>
             <input type="submit" value="Save" />
             <a href="{% url 'wagtailredirects_delete_redirect' redirect.id %}" class="button button-secondary no">Delete redirect</a>
         </div>
@@ -16,9 +17,6 @@
     
 {% endblock %}
 
-{% block extra_css %}
-    {% include "wagtailadmin/pages/_editor_css.html" %}
-{% endblock %}
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index 075e8a704..8a892c5b2 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -1,9 +1,10 @@
 {% extends "wagtailadmin/base.html" %}
 {% block titletag %}Redirects{% endblock %}
-{% block bodyclass %}page-explorer{% endblock %}
+{% block bodyclass %}menu-redirects{% endblock %}
 
 {% block content %}
-    {% include "wagtailadmin/shared/header.html" with title="Redirects" add_link="wagtailredirects_add_redirect" add_text="Add redirect" %}
+
+    {% include "wagtailadmin/shared/header.html" with title="Redirects" merged=1 add_link="wagtailredirects_add_redirect" add_text="Add redirect" %}
 
     <table class="listing full-width">
         <col />