Dark mode is now darker

4 files changed, 28 insertions, 25 deletions

diff --git a/components/ModelBoxCard.vue b/components/ModelBoxCard.vue
index bdd8a8f..2881043 100644
--- a/components/ModelBoxCard.vue
+++ b/components/ModelBoxCard.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .model.shadow-sm.rounded-lg.bg-white.p-4.w-full.h-80.duration-300(
-    class="hover:ease-out hover:shadow-md dark:bg-gray-600 dark:text-white"
+    class="hover:ease-out hover:shadow-md dark:bg-gray-800 dark:text-white"
   )
     a(:href="'/models/'+model.id")
       .image.bg-gray-900.rounded-xl.w-full.h-48.overflow-hidden
diff --git a/components/ModelForm.vue b/components/ModelForm.vue
index d09c1ab..d59a5ae 100644
--- a/components/ModelForm.vue
+++ b/components/ModelForm.vue
@@ -46,25 +46,25 @@
                 @click="boxDeleteModelUpload = 0"
               ) Cancel
     .shadow(class="sm:overflow-hidden sm:rounded-md")
-      .grid.grid-cols-2(v-if="form.id" class="dark:bg-gray-600")
+      .grid.grid-cols-2(v-if="form.id" class="dark:bg-gray-800")
         button.p-2.duration-100(
           type="button"
-          :class="{'dark:hover:bg-gray-300 hover:bg-white': true, 'bg-white dark:bg-gray-300 border-green-600 border-b-2': tab == 'info'}"
+          :class="{'dark:hover:bg-gray-300 hover:bg-white dark:text-white': true, 'bg-white dark:bg-green-500 border-green-600 border-b-2': tab == 'info'}"
           @click="tab = 'info'"
         ) Info
         button.p-2.duration-100(
           type="button"
-          :class="{'dark:hover:bg-gray-300 hover:bg-white': true, 'bg-white dark:bg-gray-300 border-green-600 border-b-2': tab == 'files'}"
+          :class="{'dark:hover:bg-gray-300 hover:bg-white dark:text-white': true, 'bg-white dark:bg-green-500 border-green-600 border-b-2': tab == 'files'}"
           @click="tab = 'files'"
         ) Files
       div(v-if="tab == 'info'")
-        .space-y-6.bg-white.px-4.py-5(class="sm:p-6 dark:bg-gray-600")
+        .space-y-6.bg-white.px-4.py-5(class="sm:p-6 dark:bg-gray-800")
           div
             label.block.text-sm.font-medium.text-gray-700(class="dark:text-white" for="name") Name
             .mt-1
               input#name.mt-1.block.w-full.rounded-md.border-gray-300.border-1.px-2.py-1(
                 name="name"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 placeholder="My super project"
                 required
                 v-model="form.name"
@@ -75,7 +75,7 @@
             .mt-1
               textarea#description.mt-1.block.w-full.rounded-md.border-gray-300.border-1.px-2.py-1(
                 name="description" rows="3"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 placeholder="Now this is the story all about how, My life got flipped-turned upside down... "
                 v-model="form.description"
               )
@@ -86,7 +86,7 @@
                 name="duration"
                 type="number"
                 step="0.01"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 required
                 v-model="form.duration"
               )
@@ -98,7 +98,7 @@
                 name="height"
                 type="number"
                 step="0.01"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 required
                 v-model="form.height"
               )
@@ -110,7 +110,7 @@
                 name="weight"
                 type="number"
                 step="0.01"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 required
                 v-model="form.weight"
               )
@@ -121,7 +121,7 @@
             .mt-1
               input#printer.mt-1.block.w-full.rounded-md.border-gray-300.border-1.px-2.py-1(
                 name="printer"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 placeholder="Formlabs Form 3BL"
                 v-model="form.printer"
               )
@@ -131,7 +131,7 @@
             .mt-1
               input#material.mt-1.block.w-full.rounded-md.border-gray-300.border-1.px-2.py-1(
                 name="material"
-                class="focus:border-green-500 focus:ring-green-500 sm:text-sm"
+                class="focus:border-green-500 focus:ring-green-500 sm:text-sm dark:bg-gray-600 dark:text-gray-50 dark:border-gray-700"
                 placeholder="PLA"
                 v-model="form.material"
               )
@@ -148,11 +148,11 @@
               <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
             </svg>
             | Save
-          p.text-sm.text-gray-700.mt-2(v-if="!form.id") You will add assets like images and STL/OBJ later.
+          p.text-sm.text-gray-700.mt-2(v-if="!form.id" class="dark:text-white") You will add assets like images and STL/OBJ later.
       div(v-else)
-        .space-y-6.bg-white.px-4.py-5(class="sm:p-6 dark:bg-gray-600 dark:text-white")
+        .space-y-6.bg-white.px-4.py-5(class="sm:p-6 dark:bg-gray-800 dark:text-white")
           h3(v-if="form.uploads") Manage '{{ form.name }}' already uploaded files
-          ul.divide-y.divide-gray-200.rounded-b-md.border.border-gray-200(role="list" v-if="form.uploads")
+          ul.divide-y.divide-gray-200.rounded-md.border.border-gray-200(class="dark:border-gray-500 dark:divide-gray-500" role="list" v-if="form.uploads")
             li.flex.items-center.justify-between.py-3.pl-3.pr-4.text-sm(v-for="upload in form.uploads" :key="upload.id")
               .flex.w-0.flex-1.items-center
                 svg.h-5.w-5.flex-shrink-0.text-gray-400(xmlns="http://www.w3.org/2000/svg", viewbox="0 0 20 20", fill="currentColor", aria-hidden="true")
diff --git a/components/ModelReportsList.vue b/components/ModelReportsList.vue
index 9ea9475..7da07b1 100644
--- a/components/ModelReportsList.vue
+++ b/components/ModelReportsList.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .shadow-sm.rounded-lg.bg-white.p-4.w-full.mb-5(class="dark:bg-gray-600" v-if="warnings.length")
+  .shadow-sm.rounded-lg.bg-white.p-4.w-full.mb-5(class="dark:bg-gray-800" v-if="warnings.length")
     .relative.z-10(aria-labelledby="modal-title", role="dialog", aria-modal="true" v-if="boxToResolve > 0")
       .fixed.inset-0.bg-gray-900.bg-opacity-90.transition-opacity
       .fixed.inset-0.z-10.overflow-y-auto
@@ -44,7 +44,7 @@
           path(stroke-linecap="round" stroke-linejoin="round" d="M4.5 15.75l7.5-7.5 7.5 7.5" v-else)
 
     ul(role="list" v-if="me && expandList")
-      li.text-sm.rounded-md.border.border-gray-200.mt-3(class="dark:bg-gray-50" v-for="warning in warnings" :key="warning.id")
+      li.text-sm.rounded-md.border.border-gray-200.mt-3(class="dark:bg-gray-600 dark:text-white dark:border-gray-400" v-for="warning in warnings" :key="warning.id")
         .py-3.pl-3.pr-4(v-if="!me.is_staff")
           h3.flex.leading-6.mb-2.float-right
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 w-6 h-6">
@@ -62,7 +62,7 @@
             .mr-3.float-left(style="flex-shrink: 0;" class="sm:float-none")
               user-avatar(:data="warning.user")
             p.leading-8.ml-2(class="sm:ml-0")
-              a.text-green-800(class="hover:text-green-700" :href="'/user/'+warning.user.id")
+              a.text-green-800(class="hover:text-green-700 dark:text-green-200 dark:hover:text-green-100" :href="'/user/'+warning.user.id")
                 | @
                 span.underline {{ warning.user.username }}
             p.leading-8.ml-0(class="sm:ml-5") {{ warning.note }}
@@ -76,7 +76,7 @@
                   <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
                 </svg>
                 | Resolve
-        .bg-green-50.py-3.pl-3.pr-4(v-if="warning.resolved_by")
+        .bg-green-50.py-3.pl-3.pr-4(class="dark:bg-gray-500" v-if="warning.resolved_by")
           em Resolved by:
           h3.flex.leading-6.mb-2.float-right
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 w-6 h-6">
@@ -87,7 +87,7 @@
             .mr-3.float-left(style="flex-shrink: 0;" class="sm:float-none")
               user-avatar(:data="warning.resolved")
             p.leading-8.ml-2(class="sm:ml-0")
-              a.text-green-800(class="hover:text-green-700" :href="'/user/'+warning.user.id")
+              a.text-green-800(class="hover:text-green-700 dark:text-green-200 dark:hover:text-green-100" :href="'/user/'+warning.user.id")
                 | @
                 span.underline {{ warning.resolved.username }}
             p.leading-8.ml-0(class="sm:ml-5") {{ warning.admin_note }}
diff --git a/components/VHeader.vue b/components/VHeader.vue
index 1285875..a141d0b 100644
--- a/components/VHeader.vue
+++ b/components/VHeader.vue
@@ -36,24 +36,27 @@
                 )
                   span.sr-only Open user menu
                   user-avatar(:data="me")
-              .absolute.right-0.z-10.mt-2.w-48.origin-top-right.rounded-md.bg-white.py-1.shadow-lg.ring-1.ring-black.ring-opacity-5(class="focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="user-menu-button" tabindex="-1" v-if="boxUserInfo && me")
-                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(class="sm:hidden" href="/create" role="menuitem" tabindex="-1")
+              .absolute.right-0.z-10.mt-2.w-48.origin-top-right.rounded-md.bg-white.py-1.shadow-lg.ring-1.ring-black.ring-opacity-5(
+                class="focus:outline-none dark:bg-gray-800" role="menu" aria-orientation="vertical" aria-labelledby="user-menu-button" tabindex="-1"
+                v-if="boxUserInfo && me"
+              )
+                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(class="dark:text-white sm:hidden" href="/create" role="menuitem" tabindex="-1")
                   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
                   </svg>
                   | Create
-                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(:href="'/user/'+me.id" role="menuitem" tabindex="-1")
+                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(class="dark:text-white" :href="'/user/'+me.id" role="menuitem" tabindex="-1")
                   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 11-7.5 0 3.75 3.75 0 017.5 0zM4.501 20.118a7.5 7.5 0 0114.998 0A17.933 17.933 0 0112 21.75c-2.676 0-5.216-.584-7.499-1.632z" />
                   </svg>
                   | Your Profile
-                a.flex.leanding-6.block.px-4.py-2.text-sm.text-gray-700(href="/settings" role="menuitem" tabindex="-1")
+                a.flex.leanding-6.block.px-4.py-2.text-sm.text-gray-700(class="dark:text-white" href="/settings" role="menuitem" tabindex="-1")
                   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
                     <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                   </svg>
                   | Settings
-                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(href="#" role="menuitem" tabindex="-1" @click="logout")
+                a.flex.leading-6.block.px-4.py-2.text-sm.text-gray-700(class="dark:text-white" href="#" role="menuitem" tabindex="-1" @click="logout")
                   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z" />
                   </svg>