From a36c7a559bd7b556f323a94a55686b258d611d2e Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@ghost.org>
Date: Thu, 7 Aug 2014 16:35:58 +0300
Subject: [PATCH] Fix floatingheader alignments

---
 ghost/admin/assets/sass/layouts/content.scss | 11 ++++++-----
 ghost/admin/assets/sass/layouts/editor.scss  | 10 ++++++----
 ghost/admin/assets/sass/patterns/_shame.scss |  3 ++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ghost/admin/assets/sass/layouts/content.scss b/ghost/admin/assets/sass/layouts/content.scss
index 0bbd345652..60d053234c 100644
--- a/ghost/admin/assets/sass/layouts/content.scss
+++ b/ghost/admin/assets/sass/layouts/content.scss
@@ -48,10 +48,10 @@
     .btn-green {
         @include icon($i-add);
         position: absolute;
-        top: 10px;
-        right: 15px;
+        top: 9px;
+        right: 20px;
         z-index: 700;
-        padding: 3px 4px 3px 5px;
+        padding: 2px 4px 3px 5px;
         color: #fff !important; // getting overridden by floatingheader
     }
 
@@ -67,7 +67,8 @@
     }
 
     .entry-title {
-        font-size: 1.4em;
+        font-size: 1.6rem;
+        line-height: 1.25em;
         font-weight: normal;
     }
 
@@ -112,7 +113,7 @@
         a {
 
             display: block;
-            padding: 20px 15px;
+            padding: 20px 20px;
             color: rgba(0,0,0,0.5);
             @media (max-width: 400px) {
                 padding: 15px;
diff --git a/ghost/admin/assets/sass/layouts/editor.scss b/ghost/admin/assets/sass/layouts/editor.scss
index b6d565ce0d..f26c54444d 100644
--- a/ghost/admin/assets/sass/layouts/editor.scss
+++ b/ghost/admin/assets/sass/layouts/editor.scss
@@ -7,7 +7,7 @@
  // The main post title
 .entry-container .entry-title {
     height: 60px;
-    padding: 0 15px;
+    padding: 0 20px;
     position: relative;
 
     input {
@@ -388,7 +388,8 @@ body.zen {
     .usermenu {
         display: none;
     }
-    #global-header,
+    .global-nav,
+    .page-header,
     #publish-bar {
         opacity: 0;
         height: 0;
@@ -396,10 +397,11 @@ body.zen {
         @include transition(all 0.5s ease-out);
     }
 
-    main {
-        top: 15px;
+    .page-content {
+        top: 0;
         @include transition(all 0.5s ease-out);
     }
+
     .entry-markdown,
     .entry-preview {
         bottom: 0;
diff --git a/ghost/admin/assets/sass/patterns/_shame.scss b/ghost/admin/assets/sass/patterns/_shame.scss
index 1962484f99..0b98e083f1 100644
--- a/ghost/admin/assets/sass/patterns/_shame.scss
+++ b/ghost/admin/assets/sass/patterns/_shame.scss
@@ -40,7 +40,8 @@
     right: 0;
     z-index: 400;
     height: 40px;
-    padding: 8px 15px 12px;
+    padding: 10px 20px;
+    font-size: 1.3rem;
     text-transform: uppercase;
     color: $brown;
     //Transparent gradient to make bg fade out as it goes out the top.