Merge remote-tracking branch 'origin/template-redesigns' into profile…

…_dropdown
ACMAS · Nov 6, 2023 · dc5ffc0 · dc5ffc0
2 parents bd55ada + e12bae6
commit dc5ffc0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/ACMAS/app/ACMAS_Web/components/field/field.html b/ACMAS/app/ACMAS_Web/components/field/field.html
@@ -12,7 +12,7 @@
     {% if name == "password1" and placeholder == "Create password..." %}
     <div class="-left-48 absolute invisible peer-focus:visible">
         <div class="w-40 h-40 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
-            <p>Password can't be:</p>
+            <p class="text-center">Password can't be:</p>
             <ul class="list-disc pl-2 gap-y-2">
                 <li>too similar to other personal information</li>
                 <li>less than 8 characters </li>
@@ -28,18 +28,18 @@
     </div>
     {% endif %}
     {% if name == "username" and placeholder == "Create username..." %}
-    <div class="-left-48 absolute invisible peer-focus:visible">
-        <div class="w-40 h-36 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
-            <ul class="list-disc pl-2 gap-y-2">
-                <li>Required</li>
+    <div class="absolute -left-48 invisible peer-focus:visible">
+        <div class="w-40 h-40 flex-col flex bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
+            <p class="text-center">Required</p>
+            <ul class="pl-2 list-disc gap-y-2">
                 <li>150 characters or fewer</li>
-                <li>Letters, digits and @/./+/-/_ only.</li>
-                <li>entirely numeric</li>
+                <li>Letters, digits and @/./+/-/_ only</li>
+                <li>Must not be fully numeric</li>
             </ul>
         </div>
-        <div class="relative z-30">
-            <div class="flex left-full -ml-3 bottom-[4.5rem] absolute z-0">
-                <div class="h-4 w-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
+        <div class="z-30 relative">
+            <div class="flex -ml-3 left-full bottom-20 absolute z-0">
+                <div class="w-4 h-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
             </div>
         </div>
     </div>

diff --git a/ACMAS/app/ACMAS_Web/templates/index.html b/ACMAS/app/ACMAS_Web/templates/index.html
@@ -18,8 +18,8 @@
 <div class="p-0 flex items-center overflow-hidden relative" style="height: 75vh;">
     <div class="absolute w-full h-full" style="background: linear-gradient(-45deg, #f8f8f3, #f5f2d6, #dbebf3, #c6d6f7); background-size: 300% 300%; animation: gradient 65s ease infinite;"> </div>
     <div class="container mx-auto px-4 z-3 pt-6 relative lg:w-6/12">
-        <div class="justify-center flex flex-wrap flex-col -mx-4 text-center">
-            <h1 class="text-7xl font-bold text-white leading-tight mt-0" style="color: #327796">ACMAS</h1>
+        <div class="justify-center items-center flex flex-wrap flex-col -mx-4 text-center">
+            <img class="h-48 w-96" src="../static/img/ACMAS_Logo.svg" alt="ACMAS star logo">
             <h2 class="text-3xl text-white mb-24" style="color: #327796">Automated Course Material Archiving System</h2>
         </div>
     </div>

diff --git a/ACMAS/app/requirements.txt b/ACMAS/app/requirements.txt
@@ -1,4 +1,4 @@
-Django==4.2.5
+Django==4.2.7
 django-dbbackup==4.0.2
 django_components