From 98a99b0fe7c929cb97b68df1957a2f142f2f28e9 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 6 Feb 2015 09:58:36 +0000
Subject: [PATCH] ongoing layout tweaks

---
 .../scss/layouts/page-editor.scss             | 35 +++++++++++++++----
 .../wagtailadmin/block_forms/stream_menu.html |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index 21d2a0455..22e9d6253 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -204,6 +204,7 @@
                 padding:0 1.5em;
                 margin:1em 0;
                 border:1px solid lighten($color-grey-4, 3%);
+                border-width:0 1px;
             }
         }
 
@@ -222,6 +223,10 @@
             border-bottom:1px solid lighten($color-grey-4, 3%);
             margin:0 -1.5em;
 
+            &:first-child{
+                border-top:1px solid lighten($color-grey-4, 3%);
+            }
+
             .inner{
                 @include clearfix;
             }
@@ -270,7 +275,6 @@
     .stream-menu{
         @include transition(all 0.2s ease);
         position:relative;
-        overflow:hidden;
 
         ul{
             @include transition(all 0.2s ease);
@@ -294,7 +298,17 @@
             display:block;
             width:100%;
             padding:0 0 0.5em 0;
-            text-overflow:ellipsis;
+
+            span{
+                text-overflow:ellipsis;
+                text-transform:none;
+                white-space: nowrap;
+                width:100%;
+                display:block;
+                overflow:hidden;
+                padding:0 1em;
+                box-sizing: border-box;
+            }
 
             &:before{
                 display:block;
@@ -305,23 +319,30 @@
                 line-height:2em;
                 text-align:center;
             }
+
+            &:hover{
+                color:$color-teal;
+            }
         }
 
         &:before{
-            margin-top:-0.5em;
             font-family:wagtail;
             content:"B";
             width:2em;
-            height:2em;
+            height:1em;
             display:block;
             position:relative;
             left:0;right:0;
-            margin:auto;
+            margin:auto auto -1em auto;
             z-index:5;
             color:$color-teal;
             font-size:1.7em;
-            line-height:2em;
+            line-height:1em;
             text-align:center;
+
+            &:hover{
+                border:1px solid red;
+            }
         }
 
 
@@ -339,7 +360,7 @@
         }
     }
     .sequence-member .stream-menu{
-        margin:auto -1.5em;
+        margin:auto -1.5em -1em -1.5em;
     }
 
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
index bdc559651..b7df153e2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
@@ -1,7 +1,7 @@
 <div class="stream-menu">
 	<ul>
 	    {% for child_block in child_blocks %}
-	        <li><button type="button" id="{{ prefix }}-add-{{ child_block.name }}" class="block-{{ child_block.name|slugify }} icon icon-{{ child_block.icon }}">{{ child_block.label }}</button></li>
+	        <li><button type="button" id="{{ prefix }}-add-{{ child_block.name }}" class="block-{{ child_block.name|slugify }} icon icon-{{ child_block.icon }}"><span>{{ child_block.label }}</span></button></li>
 	    {% endfor %}
 	</ul>
 </div>