From ac2116deeafe2e8db151e4310b125c198d06a7d9 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 4 Mar 2015 09:48:56 +1030
Subject: [PATCH] Make mobile header smaller

---
 ember/app/styles/bootstrap/variables.less |  2 ++
 ember/app/styles/flarum/composer.less     |  2 +-
 ember/app/styles/flarum/layout.less       | 31 +++++++++++++++--------
 ember/app/styles/flarum/modals.less       |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ember/app/styles/bootstrap/variables.less b/ember/app/styles/bootstrap/variables.less
index db0f51757..45f5adde6 100644
--- a/ember/app/styles/bootstrap/variables.less
+++ b/ember/app/styles/bootstrap/variables.less
@@ -74,6 +74,8 @@
 
 @drawer-width: 270px;
 @index-pane-width: 400px;
+@header-height: 56px;
+@mobile-header-height: 46px;
 
 // ---------------------------------
 // BOOTSTRAP
diff --git a/ember/app/styles/flarum/composer.less b/ember/app/styles/flarum/composer.less
index 16f6c22b2..4870c1dd2 100644
--- a/ember/app/styles/flarum/composer.less
+++ b/ember/app/styles/flarum/composer.less
@@ -65,7 +65,7 @@
     z-index: @zindex-composer;
     background: @fl-body-bg;
     height: 100vh !important;
-    padding-top: 56px;
+    padding-top: @mobile-header-height;
 
     &:before {
       content: " ";
diff --git a/ember/app/styles/flarum/layout.less b/ember/app/styles/flarum/layout.less
index f51a99bb8..aa328fb47 100644
--- a/ember/app/styles/flarum/layout.less
+++ b/ember/app/styles/flarum/layout.less
@@ -16,7 +16,6 @@ body {
 .toolbar() {
   background: fade(@fl-hdr-bg, 98%);
   transform: translateZ(0); // Fix for Chrome bug where a transparent white background is actually gray
-  height: 56px;
   position: fixed;
   top: 0;
   left: 0;
@@ -24,6 +23,13 @@ body {
   z-index: @zindex-navbar-fixed;
   border-bottom: 1px solid @fl-body-control-bg;
   .transition(~"box-shadow 0.2s, left 0.2s");
+
+  @media @phone {
+    height: @mobile-header-height;
+  }
+  @media @tablet, @desktop, @desktop-hd {
+    height: @header-height;
+  }
 }
 
 // Fix a solid white box to the top of the viewport. This toolbar's contents
@@ -54,7 +60,7 @@ body {
   .primary-control, .title-control, .back-control {
     position: fixed;
     z-index: @zindex-navbar-fixed + 1;
-    top: 10px;
+    top: 5px;
     margin: 0;
 
     & .btn {
@@ -69,7 +75,7 @@ body {
   }
   .primary-control {
     width: auto;
-    right: 10px;
+    right: 5px;
     .transition(right 0.2s);
 
     .drawer-open .global-page & {
@@ -117,7 +123,7 @@ body {
     }
   }
   .back-control {
-    left: 10px;
+    left: 5px;
     .transition(left 0.2s);
 
     .drawer-open .global-page & {
@@ -210,7 +216,7 @@ body {
     font-size: 16px;
     font-weight: normal;
     margin: 0;
-    line-height: 56px;
+    line-height: @mobile-header-height;
     white-space: nowrap;
     text-align: center;
   }
@@ -231,7 +237,7 @@ body {
 @media @tablet, @desktop, @desktop-hd {
   .global-header {
     padding: 10px;
-    height: 56px;
+    height: @header-height;
     position: fixed;
     top: 0;
     left: 0;
@@ -308,10 +314,6 @@ body {
 // ------------------------------------
 // Content Area
 
-.global-content {
-  padding-top: 56px;
-}
-
 // On phones, the content area overlays the drawer, so we must give it a
 // background and min-height so it cannot be seen through. When the drawer is
 // meant to be open, we slide the content to the right to reveal the drawer.
@@ -322,8 +324,9 @@ body {
     width: 100%;
     min-height: 100vh;
     padding-bottom: 15px;
-    .transition(margin-left 0.2s);
+    padding-top: @mobile-header-height;
     .box-shadow(0 0 6px @fl-shadow-color);
+    .transition(margin-left 0.2s);
 
     .drawer-open & {
       margin-left: @drawer-width;
@@ -331,6 +334,12 @@ body {
   }
 }
 
+@media @tablet, @desktop, @desktop-hd {
+  .global-content {
+    padding-top: @header-height;
+  }
+}
+
 // ------------------------------------
 // Footer
 
diff --git a/ember/app/styles/flarum/modals.less b/ember/app/styles/flarum/modals.less
index 9a6851be5..0be0f803c 100644
--- a/ember/app/styles/flarum/modals.less
+++ b/ember/app/styles/flarum/modals.less
@@ -84,7 +84,7 @@
     border-radius: 0;
     border: 0;
     min-height: 100vh;
-    padding-top: 56px;
+    padding-top: @mobile-header-height;
     .box-shadow(none);
   }
   .modal-header {