From 6c7a5d5bb9a1260068eecfc1270d5f502bfea72f Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 3 Feb 2019 17:45:22 -0800
Subject: [PATCH] Finish UI stuff for today

---
 .../components/server/subpages/Console.ts     |  2 +-
 .../components/server/subpages/FileManager.ts | 32 +++++++++----------
 .../assets/styles/components/filemanager.css  | 11 ++++---
 resources/assets/styles/components/modal.css  |  2 +-
 .../assets/styles/components/navigation.css   |  2 +-
 tailwind.js                                   |  4 +--
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/resources/assets/scripts/components/server/subpages/Console.ts b/resources/assets/scripts/components/server/subpages/Console.ts
index 415b0ef3f..ad1e4af97 100644
--- a/resources/assets/scripts/components/server/subpages/Console.ts
+++ b/resources/assets/scripts/components/server/subpages/Console.ts
@@ -159,7 +159,7 @@ export default Vue.component('server-console', {
     },
 
     template: `
-        <div class="content-box animate fadein">
+        <div class="animate fadein shadow-md">
             <div class="text-xs font-mono">
                 <div class="rounded-t p-2 bg-black overflow-scroll w-full" style="min-height: 16rem;max-height:64rem;">
                     <div class="mb-2 text-grey-light" ref="terminal" v-if="connected"></div>
diff --git a/resources/assets/scripts/components/server/subpages/FileManager.ts b/resources/assets/scripts/components/server/subpages/FileManager.ts
index ecf1dc35a..5235e57a5 100644
--- a/resources/assets/scripts/components/server/subpages/FileManager.ts
+++ b/resources/assets/scripts/components/server/subpages/FileManager.ts
@@ -115,7 +115,7 @@ export default Vue.component('file-manager', {
     },
 
     template: `
-        <div class="content-box animate fadein">
+        <div class="animate fadein">
             <div class="filemanager-breadcrumbs">
                 /<span class="px-1">home</span><!--
                 -->/<router-link :to="{ name: 'server-files' }" class="px-1">container</router-link><!--
@@ -128,24 +128,24 @@ export default Vue.component('file-manager', {
                     </span>
                 </span>
             </div>
-            <div v-if="loading">
-                <div class="spinner spinner-xl blue"></div>
-            </div>
-            <div v-else-if="!loading && errorMessage">
-                <div class="alert error" v-text="errorMessage"></div>
-            </div>
-            <div class="filemanager" v-else>
-                <div class="header">
-                    <div class="flex-none w-8"></div>
-                    <div class="flex-1">Name</div>
-                    <div class="flex-1 text-right">Size</div>
-                    <div class="flex-1 text-right">Modified</div>
-                    <div class="flex-none w-1/6">Actions</div>
+            <div class="content-box">
+                <div v-if="loading">
+                    <div class="spinner spinner-xl blue"></div>
                 </div>
-                <div v-if="!directories.length && !files.length">
+                <div v-else-if="!loading && errorMessage">
+                    <div class="alert error" v-text="errorMessage"></div>
+                </div>
+                <div v-else-if="!directories.length && !files.length">
                     <p class="text-grey text-sm text-center p-6 pb-4">This directory is empty.</p>
                 </div>
-                <div v-else>
+                <div class="filemanager" v-else>
+                    <div class="header">
+                        <div class="flex-none w-8"></div>
+                        <div class="flex-1">Name</div>
+                        <div class="flex-1 text-right">Size</div>
+                        <div class="flex-1 text-right">Modified</div>
+                        <div class="flex-none w-1/6">Actions</div>
+                    </div>
                     <div v-for="directory in directories">
                         <folder-row :directory="directory"/>
                     </div>
diff --git a/resources/assets/styles/components/filemanager.css b/resources/assets/styles/components/filemanager.css
index e100ccc41..c1e539847 100644
--- a/resources/assets/styles/components/filemanager.css
+++ b/resources/assets/styles/components/filemanager.css
@@ -15,11 +15,11 @@
     }
 
     &.clickable {
-      @apply .no-underline;
+      @apply .no-underline .cursor-pointer;
     }
 
     &.active-selection, &.clickable:hover {
-      @apply .bg-grey-lightest .border-blue-light .text-blue-dark;
+      @apply .bg-grey-lightest .text-grey-darkest .shadow;
     }
 
     & > .icon {
@@ -65,13 +65,14 @@
 }
 
 .filemanager-breadcrumbs {
-  @apply .px-4 .py-3 .mb-6 .rounded .border .bg-grey-lightest .text-grey-darker;
+  @apply .px-4 .py-3 .mb-6 .rounded .bg-white .text-grey-darker .shadow-md;
 
   & a {
-    @apply .no-underline .text-blue-light;
+    @apply .no-underline .text-blue;
+    transition: color 50ms ease-in;
 
     &:hover {
-      @apply .text-blue-dark;
+      @apply .text-blue-darker;
     }
   }
 }
diff --git a/resources/assets/styles/components/modal.css b/resources/assets/styles/components/modal.css
index 9c81e79c1..d0673746a 100644
--- a/resources/assets/styles/components/modal.css
+++ b/resources/assets/styles/components/modal.css
@@ -4,7 +4,7 @@
   transition: opacity 250ms ease;
 
   & > .modal-container {
-    @apply .relative .p-8 .bg-white .w-full .max-w-md .m-auto .flex-col .flex;
+    @apply .relative .p-8 .bg-white .w-full .max-w-md .m-auto .flex-col .flex .rounded;
     transition: all 250ms ease;
     margin-top: 15%;
 
diff --git a/resources/assets/styles/components/navigation.css b/resources/assets/styles/components/navigation.css
index 93214f74a..d9715b60b 100644
--- a/resources/assets/styles/components/navigation.css
+++ b/resources/assets/styles/components/navigation.css
@@ -1,5 +1,5 @@
 .nav {
-    @apply .bg-blue .border-b .border-t .border-blue-darkest;
+    @apply .bg-blue-dark .border-b .border-t .border-blue-darkest;
     height: 56px;
 
     & .logo {
diff --git a/tailwind.js b/tailwind.js
index 5757ce9e7..47c9fc052 100644
--- a/tailwind.js
+++ b/tailwind.js
@@ -92,8 +92,8 @@ let colors = {
     'blue-lightest': '#E6F6FF',
     'blue-lighter': '#BAE3FF',
     'blue-light': '#2186EB',
-    'blue': '#0552B5',
-    'blue-dark': '#03449E',
+    'blue': '#0967D2',
+    'blue-dark': '#0552B5',
     'blue-darker': '#01337D',
     'blue-darkest': '#002159',