merging from ui update branch

wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less

@@ -381,7 +381,7 @@ ul.listing{
                     }
 
                     img{
-                        border:3px solid transparent;
+                        
                         display:inline-block;
                         vertical-align: middle;
                     }

wagtail/wagtailadmin/static/wagtailadmin/css/components/modals.less

@@ -93,4 +93,10 @@
     .modal-dialog {
         padding:0px 0 2em @menu-width;
     }
+}
+@media screen and (min-width: @breakpoint-desktop-larger){
+    .modal-dialog {
+        max-width:@breakpoint-desktop-larger;
+        padding:0 0 2em 0;
+    }
 }

wagtail/wagtailadmin/static/wagtailadmin/css/core.less

@@ -93,6 +93,7 @@ kbd{
 img{
     max-width:100%;
     height:auto;
+    border: 3px solid @color-grey-4;
 }
 
 .browsermessage{
@@ -148,7 +149,7 @@ img{
     }
 
     #nav-toggle{
-        .push(0.65);
+        margin-left:20px;
         .box-shadow(0px 0px 10px 5px rgba(255, 255, 255, 0.5));
         cursor:pointer;
         position:fixed;
@@ -637,7 +638,13 @@ footer, .logo{
         left:0;
         height:100%;
         width:@menu-width;
-        margin-left: -@menu-width;
+        margin-left:-@menu-width;
+
+        .inner{ /* inner only serves a purpose to position content */
+            height:100%;
+            position:fixed;
+            width:@menu-width;
+        }
     }
 
     .content{
@@ -646,11 +653,7 @@ footer, .logo{
         padding-top:0;
     }
 
-    .inner{ /* inner only serves a purpose to position content */
-        height:100%;
-        position:fixed;
-        width:@menu-width;
-    }
+   
 
     #nav-toggle{
         display:none;
@@ -676,7 +679,10 @@ footer, .logo{
             margin:auto;
             text-align:center;
             margin-bottom:1em;
-
+            
+            img{
+                border:0;
+            }
             a{
                 padding:0 0 1em 0;
                 border-bottom:1px solid rgba(200,200,200,0.1);
@@ -729,7 +735,34 @@ footer, .logo{
     }
     footer{
         width:80%;
-        margin-left:40px;
+        margin-left:50px;
+    }
+}
+
+@media screen and (min-width: @breakpoint-desktop-larger){
+    body{
+        margin:0;
+        background:#555;
+    }   
+    .wrapper{
+        background-color:@color-grey-5;
+        max-width:@breakpoint-desktop-larger;
+        margin:0 auto;
+    }
+    .nav-wrapper{
+        position:relative;
+        left:auto;
+        .box-shadow(inset -6px 0px 4px 0px rgba(0, 0, 0, 0.2));
+
+        .inner{
+            background:@color-grey-1;
+            .box-shadow(inset -6px 0px 4px 0px rgba(0, 0, 0, 0.2));
+
+        }
+    }
+
+    footer{
+        width:90em;
     }
 }
 

wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less

@@ -139,5 +139,19 @@
             margin-left: 16px;
         }
     }
-
+}
+
+@media screen and (min-width: @breakpoint-desktop-larger){
+    .hallotoolbar{
+        margin:0 auto;
+        position:absolute;
+        left:-@menu-width;
+        right:0;
+        z-index:5;
+        margin-top:3em;
+    }
+    .hallotoolbar.affixed{
+        position:fixed;
+        margin:0 auto;
+    }
 }

wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html

@@ -4,7 +4,7 @@
 
 {% if uploadform %}
     <ul class="tab-nav merged">
-        <li><a href="#search" class="active">Search</a></li>
+        <li class="active"><a href="#search">Search</a></li>
         <li><a href="#upload">Upload</a></li>
     </ul>
 {% endif %}

wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html

@@ -6,7 +6,7 @@
 
 {% if uploadform %}
     <ul class="tab-nav merged">
-        <li><a href="#search" class="active">Search</a></li>
+        <li class="active"><a href="#search" >Search</a></li>
         <li><a href="#upload">Upload</a></li>
     </ul>
 {% endif %}