From b5391f7c7604d5e27654744a1ccad2a98e309391 Mon Sep 17 00:00:00 2001
From: Vincent Boutour <bob@vibioh.fr>
Date: Sun, 29 May 2022 10:46:04 +0200
Subject: [PATCH] refactor: Harmonizing position of cancel button

Signed-off-by: Vincent Boutour <bob@vibioh.fr>
---
 cmd/fibr/templates/search-modal.html |  4 ++++
 cmd/fibr/templates/style.html        |  6 +++---
 cmd/fibr/templates/upload-form.html  | 12 +++++++++---
 go.mod                               |  4 ++--
 go.sum                               |  8 ++++----
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/cmd/fibr/templates/search-modal.html b/cmd/fibr/templates/search-modal.html
index 18417f8e..76f02e0d 100644
--- a/cmd/fibr/templates/search-modal.html
+++ b/cmd/fibr/templates/search-modal.html
@@ -12,6 +12,10 @@
     #size {
       width: 7rem;
     }
+
+    #search-form {
+      overflow-y: auto;
+    }
   </style>
 
   <div id="search" class="modal">
diff --git a/cmd/fibr/templates/style.html b/cmd/fibr/templates/style.html
index 94742174..daf77b88 100644
--- a/cmd/fibr/templates/style.html
+++ b/cmd/fibr/templates/style.html
@@ -161,12 +161,13 @@
     }
 
     .modal {
-      align-items: center;
+      align-items: flex-start;
       background-color: rgba(84, 84, 84, 0.75);
       display: none;
       height: 100vh;
       justify-content: center;
       left: 0;
+      padding-top: 5rem;
       pointer-events: none;
       position: fixed;
       top: 0;
@@ -178,8 +179,7 @@
       display: flex;
       flex-direction: column;
       max-height: 80%;
-      max-width: 80%;
-      overflow-y: auto;
+      max-width: 90%;
       pointer-events: auto;
     }
 
diff --git a/cmd/fibr/templates/upload-form.html b/cmd/fibr/templates/upload-form.html
index 6a1a94e2..1ba29d89 100644
--- a/cmd/fibr/templates/upload-form.html
+++ b/cmd/fibr/templates/upload-form.html
@@ -452,9 +452,12 @@
       pointer-events: none;
     }
 
+    #upload-form {
+      overflow-y: auto;
+    }
+
     #upload-list {
       margin: 1rem auto;
-      overflow-y: auto;
     }
 
     #upload-duration {
@@ -487,7 +490,11 @@
 
   <div id="upload-modal" class="modal">
     <div class="modal-content">
-      <h2 class="header">Upload files</h2>
+      <h2 class="flex flex-center header no-margin">
+        <span>Upload files</span>
+        <span class="flex-grow"></span>
+        <a id="upload-cancel" href="#" class="button white small">Close</a>
+      </h2>
 
       <form
         id="upload-form"
@@ -515,7 +522,6 @@ <h2 class="header">Upload files</h2>
         <div id="upload-list" class="hidden upload-width full"></div>
 
         <p class="padding no-margin center">
-          <a id="upload-cancel" href="#" class="button white">Cancel</a>
           <button id="upload-button" type="submit" class="button bg-primary">Upload</button>
         </p>
       </form>
diff --git a/go.mod b/go.mod
index a79ff913..2ada36da 100644
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,10 @@ require (
 	github.com/ViBiOh/ChatPotte v0.0.20
 	github.com/ViBiOh/absto v0.5.8
 	github.com/ViBiOh/auth/v2 v2.12.10
-	github.com/ViBiOh/exas v0.4.1
+	github.com/ViBiOh/exas v0.4.2
 	github.com/ViBiOh/flags v1.0.0
 	github.com/ViBiOh/httputils/v4 v4.42.1
-	github.com/ViBiOh/vith v0.4.2
+	github.com/ViBiOh/vith v0.5.0
 	github.com/golang/mock v1.6.0
 	github.com/prometheus/client_golang v1.12.2
 	github.com/streadway/amqp v1.0.0
diff --git a/go.sum b/go.sum
index a47dd491..a9ff1061 100644
--- a/go.sum
+++ b/go.sum
@@ -39,14 +39,14 @@ github.com/ViBiOh/absto v0.5.8 h1:yjXwAu+k+JEbcBgXjLQ7eHFY3Z3jzVzTKDFbVzmLPjc=
 github.com/ViBiOh/absto v0.5.8/go.mod h1:O8xl5VhV4rR9lISJ/UUTe91SHUUbZan7x1QMSljzRJc=
 github.com/ViBiOh/auth/v2 v2.12.10 h1:xWToUVsJ2y2+bMTovKyeuaxK9u6i++0gfKqEI8x19FM=
 github.com/ViBiOh/auth/v2 v2.12.10/go.mod h1:sMHz7u9cwP1Jjg7AyOoNsgp+gJZYY4V5R5YU7r3khWk=
-github.com/ViBiOh/exas v0.4.1 h1:uTdnF7mjUzXleHbBnMwqmC4ZXsVb/DkxEnFZquCXsbY=
-github.com/ViBiOh/exas v0.4.1/go.mod h1:Ne6nFroCbBYjvvNhbuW4IoU5jBb2AUTj/x3Imdb0DFc=
+github.com/ViBiOh/exas v0.4.2 h1:W84et5rOaeG0n0kl60QJHoa6RmP4614vD8DTPL3BvyU=
+github.com/ViBiOh/exas v0.4.2/go.mod h1:gYLOTipAUoE7mTrUd3Albe2zKFJKkX135+ALSc9QmGM=
 github.com/ViBiOh/flags v1.0.0 h1:ECiQMH2tK04PaCkPRuziWAtxYGtx2Ej8O15ZZ2Jx4Ww=
 github.com/ViBiOh/flags v1.0.0/go.mod h1:W0YgB4Nqou2j/2vevgO3kyrcS2f+ci/+w+jDGzVZilk=
 github.com/ViBiOh/httputils/v4 v4.42.1 h1:AMmZg34uugnti74PdfZl6771uS7ogJEAYSGz1Qv/e9k=
 github.com/ViBiOh/httputils/v4 v4.42.1/go.mod h1:cocXQOmu1AwFP9MH9V51uE7k4gJpzTh/VqfsHx0e9u0=
-github.com/ViBiOh/vith v0.4.2 h1:kHwGapEtOMh5uW6pzRYxI7y50uVXcW/HdQ6maQXGBJA=
-github.com/ViBiOh/vith v0.4.2/go.mod h1:i4V/thf47i7k/R94Zygj9t4OmCUzJ4bLJZ/K9G9+boA=
+github.com/ViBiOh/vith v0.5.0 h1:BpmjwWxd4NGmUJF12XpFOngK32539Lw3mvbMOaeOmhE=
+github.com/ViBiOh/vith v0.5.0/go.mod h1:Wf40eedOBEcxeLzGzGpuO+2G8qe5Ov1WIIBPXohyKco=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=