From d60cf825a70379074eac576684f2c05adc90b90c Mon Sep 17 00:00:00 2001
From: Edd Baldry <edd@potatolondon.com>
Date: Tue, 25 Oct 2016 19:22:38 +0100
Subject: [PATCH] Align content page elements

---
 .../static_src/wagtailadmin/scss/components/_listing.scss | 6 +++---
 .../static_src/wagtailadmin/scss/components/_modals.scss  | 6 ++++++
 .../static_src/wagtailadmin/scss/components/_tabs.scss    | 8 ++++++++
 .../wagtailadmin/static_src/wagtailadmin/scss/core.scss   | 4 ++--
 .../static_src/wagtailadmin/scss/layouts/page-editor.scss | 7 +++++--
 .../templates/wagtailadmin/shared/header.html             | 2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss
index 7271b6a06..edcc5f2eb 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_listing.scss
@@ -436,6 +436,9 @@ table.listing {
             position: absolute;
             right: 10%;
             top: 2em;
+            // @media screen and (min-width: $breakpoint-desktop-larger) {
+            //     right: 20em;
+            // }
         }
 
         .locked-indicator {
@@ -673,9 +676,6 @@ table.listing {
     .children,
     .no-children {
         @include transition(background-color 0.2s ease);
-        @media screen and (min-width: $breakpoint-desktop-larger) {
-            padding-right: 19em
-        }
     }
 
     .children a,
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss
index 61f31a2f5..dc4b59db6 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_modals.scss
@@ -98,8 +98,14 @@ $zindex-modal-background: 500;
     padding-bottom: 2em;
 
     header {
+        padding-left: 2em;
         padding-right: 100px;
     }
+
+    .header-title {
+        padding-left: 1em!important;
+        /* @TODO That specificity isn't working out so well... */
+    }
 }
 
 @media screen and (min-width: $breakpoint-mobile) {
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss
index c9822584b..e3fae7690 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_tabs.scss
@@ -10,6 +10,10 @@
         padding: 0;
         position: relative;
         margin-right: 1px;
+
+        &:first-of-type {
+            padding-left: 1.2em;
+        }
     }
 
     a {
@@ -118,5 +122,9 @@
     .modal-content .tab-nav li {
         padding: 0;
         min-width: 0;
+
+        &:first-of-type {
+            padding-left: 2.5em;
+        }
     }
 }
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss
index 0b5efcbf3..30b8a77a9 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss
@@ -115,7 +115,7 @@ body {
     @include row();
     background: $color-white;
     border-top: 0 solid $color-grey-5; // this top border provides space for the floating logo to toggle the menu
-    height: 100%;
+    min-height: 100%;
     padding-bottom: 4em;
     position: relative; // yuk. necessary for positions for jquery ui widgets
 }
@@ -493,7 +493,7 @@ footer,
 
 @media screen and (min-width: 90em) {
     .wrapper {
-        width: 100%;
+        // width: 100%;
     }
 
     footer {
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
index ab49497d4..ccedd6976 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
@@ -9,8 +9,7 @@
     }
 
     .breadcrumb {
-        margin-top: -1.2em;
-        margin-bottom: 2em;
+        margin: -1.2em 0 2em 0;
     }
 
     .modal .breadcrumb {
@@ -29,6 +28,10 @@
             padding-left: 0;
         }
     }
+
+    .header-title {
+        padding-left: 4em;
+    }
 }
 
 // An object is the basic wrapper around any field or group of fields in the editor interface
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
index c1e56503b..f0138aeb2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -17,7 +17,7 @@
     add_link - if present, display an 'add' button. This is a URL route name (taking no parameters) to be used as the link URL for the button
     add_text - text for the 'add' button
 {% endcomment %}
-<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if search_form %}hasform{% endif %}">
+<header class="{% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if search_form %}hasform{% endif %}">
     <div class="row">
         <div class="left">
             <div class="col header-title">