From f4a4ec8131d8aa5a3db763333a6a1b2aca26fb71 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 25 Dec 2018 23:20:12 +0000
Subject: [PATCH] Fixed header and sidebar

---
 src/components/Navbar.vue  |   4 +-
 src/components/Sidebar.vue |   2 +-
 src/views/Applications.vue |  82 +++++++++++++++--------------
 src/views/Environments.vue | 102 ++++++++++++++++++++-----------------
 tailwind.js                |   2 +
 5 files changed, 103 insertions(+), 89 deletions(-)

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 13b752c..9afeaed 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -7,8 +7,8 @@
 
         <div class="flex flex-col flex-1">
           <nav class="border-t-2 border-transparent flex justify-end md:justify-start">
-            <a href="#0" class="inline-block text-xs sm:text-sm border-b-4 border-blue-dark mx-2 px-4 py-4 md:py-5 text-blue-dark uppercase no-underline hover:underline focus:underline">Develop</a>
-            <a href="#0" class="inline-block text-xs sm:text-sm border-b-4 border-transparent mx-2 px-4 py-4 md:py-5 text-blue-dark uppercase no-underline hover:underline focus:underline">Manage</a>
+            <a href="#0" class="inline-block text-sm border-b-4 border-blue-dark mx-2 px-4 py-4 md:py-5 text-blue-dark uppercase no-underline hover:underline focus:underline">Develop</a>
+            <a href="#0" class="inline-block text-sm border-b-4 border-transparent mx-2 px-4 py-4 md:py-5 text-blue-dark uppercase no-underline hover:underline focus:underline">Manage</a>
           </nav>
         </div>
 
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 68c16a1..22ebf77 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-auto lg:w-64 bg-grey-darkest text-white antialiased">
+  <div class="w-auto lg:w-64 bg-grey-darkest text-white antialiased fixed pin-l h-full">
     <div>
       <ul class="list-reset">
         <li v-for="link in links" :key="link.title">
diff --git a/src/views/Applications.vue b/src/views/Applications.vue
index 3243deb..40960ec 100644
--- a/src/views/Applications.vue
+++ b/src/views/Applications.vue
@@ -1,55 +1,61 @@
 <template>
   <div>
-    <navbar></navbar>
+    <div class="fixed pin-t w-full z-30">
+      <navbar></navbar>
 
-    <div class="px-4 py-5 border-b-2 border-grey flex justify-between items-center">
-      <div class="w-full md:w-auto flex flex-col">
-        <div class="text-2xl font-hairline mr-2">Applications</div>
-      </div>
+      <title-block>
+        <template slot="left">
+          <div class="text-2xl font-hairline mr-2">Applications</div>
+        </template>
 
-      <header-buttons :links="[
-        { title: 'Add Application', icon: 'alpha__new-app', disabled: false },
-      ]"></header-buttons>
+        <template slot="right">
+          <header-buttons :links="[
+            { title: 'Add Application', icon: 'alpha__new-app', disabled: false },
+          ]"></header-buttons>
+        </template>
+      </title-block>
     </div>
 
-    <div class="flex flex-row-reverse flex-1 h-full">
-      <div class="flex-1 p-4 lg:p-12">
-        <div class="mb-6">
-          <div class="lg:flex lg:items-baseline mb-12">
-            <div class="mr-16 mb-4 lg:mb-0">
-              <h1 class="text-4xl font-hairline mb-2">Applications</h1>
-            </div>
+    <div class="mt-48">
+      <div class="-mt-10 md:-mt-4 flex flex-row-reverse h-full">
+        <div class="flex-1 p-4 lg:p-12 ml-16 lg:ml-64">
+          <div class="mb-6">
+            <div class="lg:flex lg:items-baseline mb-12">
+              <div class="mr-16 mb-4 lg:mb-0">
+                <h1 class="text-4xl font-hairline mb-2">Applications</h1>
+              </div>
 
-            <application-switcher class="hidden lg:flex-1 lg:flex lg:justify-end mr-3" :mode="display" @display-changed="handleDisplay"></application-switcher>
+              <application-switcher class="hidden lg:flex-1 lg:flex lg:justify-end mr-3" :mode="display" @display-changed="handleDisplay"></application-switcher>
 
-            <div class="lg:flex lg:flex-row-reverse justify-between items-baseline">
-              <div class="w-full">
-                <form action="#">
-                  <input type="text" placeholder="Filter applications" class="w-full py-2 px-3 border border-grey-darker rounded">
-                </form>
+              <div class="lg:flex lg:flex-row-reverse justify-between items-baseline">
+                <div class="w-full">
+                  <form action="#">
+                    <input type="text" placeholder="Filter applications" class="w-full py-2 px-3 border border-grey-darker rounded">
+                  </form>
+                </div>
               </div>
             </div>
           </div>
+
+          <div class="flex flex-wrap -mx-3 -mb-6">
+            <application-card
+              v-for="application in applications"
+              :id="application.id"
+              :application="application"
+              :key="application.id"
+              :display="display"
+              class="px-3 w-full"
+              :class="[display == 'grid' ? 'lg:w-1/3 xl:w-1/4 mb-6 flex flex-col' : '']"
+            ></application-card>
+          </div>
         </div>
 
-        <div class="flex flex-wrap -mx-3 -mb-6">
-          <application-card
-            v-for="application in applications"
-            :id="application.id"
-            :application="application"
-            :key="application.id"
-            :display="display"
-            class="px-3 w-full"
-            :class="[display == 'grid' ? 'lg:w-1/3 xl:w-1/4 mb-6 flex flex-col' : '']"
-          ></application-card>
-        </div>
+        <sidebar :links="[
+          { title: 'All', icon: 'alpha__grid', active: true, disabled: false },
+          { title: 'Starred', icon: 'state__starred', active: false, disabled: false },
+          { title: 'Recents', icon: 'objects__recent', active: false, disabled: false },
+        ]"></sidebar>
       </div>
-
-      <sidebar :links="[
-        { title: 'All', icon: 'alpha__grid', active: true, disabled: false },
-        { title: 'Starred', icon: 'state__starred', active: false, disabled: false },
-        { title: 'Recents', icon: 'objects__recent', active: false, disabled: false },
-      ]"></sidebar>
     </div>
   </div>
 </template>
diff --git a/src/views/Environments.vue b/src/views/Environments.vue
index 3d4a348..af27038 100644
--- a/src/views/Environments.vue
+++ b/src/views/Environments.vue
@@ -1,67 +1,73 @@
 <template>
   <div>
-    <navbar></navbar>
+    <div class="fixed pin-t w-full z-30">
+      <navbar></navbar>
 
-    <div class="px-4 py-5 border-b-2 border-grey flex justify-between items-center">
-      <div class="w-full md:w-auto flex flex-col">
-        <div class="text-xs mb-3">
-          <ol class="list-reset flex">
-            <li class="flex items-center pr-1">
-              <router-link to="/" class="text-blue-dark no-underline hover:underline mr-1">Applications</router-link>
-              <svg class="w-3 h-3 fill-current text-grey" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M12.95 10.707l.707-.707L8 4.343 6.586 5.757 10.828 10l-4.242 4.243L8 15.657l4.95-4.95z" fill-rule="evenodd"/></svg>
-            </li>
-            <li>{{ application.name }}</li>
-          </ol>
-        </div>
+      <title-block>
+        <template slot="left">
+          <div class="text-xs mb-3">
+            <ol class="list-reset flex">
+              <li class="flex items-center pr-1">
+                <router-link to="/" class="text-blue-dark no-underline hover:underline mr-1">Applications</router-link>
+                <svg class="w-3 h-3 fill-current text-grey" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M12.95 10.707l.707-.707L8 4.343 6.586 5.757 10.828 10l-4.242 4.243L8 15.657l4.95-4.95z" fill-rule="evenodd"/></svg>
+              </li>
+              <li>{{ application.name }}</li>
+            </ol>
+          </div>
 
-        <button class="flex flex-1 items-center justify-between md:justify-start">
-          <div class="text-2xl font-hairline mr-2">{{ application.name }}</div>
-          <svg class="h-6 w-6 text-blue-dark fill-current" role="presentation"><use xlink:href="/img/icons.symbol.svg#actions__down-arrow"></use></svg>
-        </button>
-      </div>
+          <button class="flex flex-1 items-center justify-between md:justify-start">
+            <div class="text-2xl font-hairline mr-2">{{ application.name }}</div>
+            <svg class="h-6 w-6 text-blue-dark fill-current" role="presentation"><use xlink:href="/img/icons.symbol.svg#actions__down-arrow"></use></svg>
+          </button>
+        </template>
 
-      <header-buttons :links="[
-        { title: 'Add database', icon: 'actions__new-database', disabled: false },
-        { title: 'Git Info', icon: 'actions__info', disabled: false },
-        { title: 'Rename', icon: 'actions__edit', disabled: true },
-      ]"></header-buttons>
+        <template slot="right">
+          <header-buttons :links="[
+            { title: 'Add database', icon: 'actions__new-database', disabled: false },
+            { title: 'Git Info', icon: 'actions__info', disabled: false },
+            { title: 'Rename', icon: 'actions__edit', disabled: true },
+          ]"></header-buttons>
+        </template>
+      </title-block>
     </div>
 
-    <div class="flex flex-row-reverse h-full">
-      <div class="flex-1 p-4 lg:p-12">
-        <div class="mb-6">
-          <div class="lg:flex lg:items-baseline mb-2">
-            <div class="mr-16 mb-4 lg:mb-0">
-              <h1 class="text-4xl font-hairline mb-2">Environments</h1>
+    <div class="mt-48">
+      <div class="-mt-4 md:-mt-2 flex flex-row-reverse h-full">
+        <div class="flex-1 p-4 lg:p-12 ml-16 lg:ml-64">
+          <div class="mb-6">
+            <div class="lg:flex lg:items-baseline mb-2">
+              <div class="mr-16 mb-4 lg:mb-0">
+                <h1 class="text-4xl font-hairline mb-2">Environments</h1>
 
-              <application-tags :type="application.type" :level="application.level"></application-tags>
-            </div>
-
-            <div class="lg:flex lg:flex-row-reverse flex-1 justify-between _bg-blue items-baseline">
-              <div class="w-full lg:w-1/2 xl:w-1/3">
-                <form action="#">
-                  <input type="text" placeholder="Filter environments" class="w-full py-2 px-3 border border-grey-darker rounded">
-                </form>
+                <application-tags :type="application.type" :level="application.level"></application-tags>
               </div>
 
-              <div class="flex-1">
-                <toggle-help @toggle="help.hidden = !help.hidden"></toggle-help>
+              <div class="lg:flex lg:flex-row-reverse flex-1 justify-between _bg-blue items-baseline">
+                <div class="w-full lg:w-1/2 xl:w-1/3">
+                  <form action="#">
+                    <input type="text" placeholder="Filter environments" class="w-full py-2 px-3 border border-grey-darker rounded">
+                  </form>
+                </div>
+
+                <div class="flex-1">
+                  <toggle-help @toggle="help.hidden = !help.hidden"></toggle-help>
+                </div>
               </div>
             </div>
           </div>
+
+          <quick-help :hidden="help.hidden"></quick-help>
+          <environment-cards :environments="application.environments"></environment-cards>
+          <task-log></task-log>
         </div>
 
-        <quick-help :hidden="help.hidden"></quick-help>
-        <environment-cards :environments="application.environments"></environment-cards>
-        <task-log></task-log>
+        <sidebar :links="[
+          { title: 'Environments', icon: 'alpha__grid', active: true, disabled: false },
+          { title: 'Product Keys', icon: 'locations__keys', active: false, disabled: true },
+          { title: 'Security', icon: 'alpha__security', active: false, disabled: true },
+          { title: 'Acquia Search', icon: 'actions__search', active: false, disabled: false },
+        ]"></sidebar>
       </div>
-
-      <sidebar :links="[
-        { title: 'Environments', icon: 'alpha__grid', active: true, disabled: false },
-        { title: 'Product Keys', icon: 'locations__keys', active: false, disabled: true },
-        { title: 'Security', icon: 'alpha__security', active: false, disabled: true },
-        { title: 'Acquia Search', icon: 'actions__search', active: false, disabled: false },
-      ]"></sidebar>
     </div>
   </div>
 </template>
diff --git a/tailwind.js b/tailwind.js
index 0afab24..b24f637 100644
--- a/tailwind.js
+++ b/tailwind.js
@@ -733,6 +733,8 @@ module.exports = {
     '20': '5rem',
     '24': '6rem',
     '32': '8rem',
+    '48': '10rem',
+    '64': '16rem',
   },