Merge branch 'development' of https://github.com/COS301-SE-2023/Blue-…

…Skies into development
COS301-SE-2023 · Oct 25, 2023 · c931444 · c931444
2 parents 202efdb + bfe968f
commit c931444
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 31 deletions.
diff --git a/src/apps/blazor-app/Components/Advanced/Finanace.razor b/src/apps/blazor-app/Components/Advanced/Finanace.razor
@@ -10,7 +10,7 @@
     <Subscript><p class="text-center">All calculations are derived from the monthly bill. Please keep in mind that these calculations are approximate, and costs may vary among different solar installers."</p></Subscript>
 </Heading>
 
-<div class="w-full flex md:px-20">
+<div class="w-full flex md:px-20 gap-4">
     <div class="flex flex-col gap-4 items-center justify-center p-4 w-full rounded-3xl bg-gradient-to-tr from-primary-400 to-primary-500">
         <div class="md:flex justify-center items-center">
             <div class="flex flex-col gap-2 items-center justify-center">
@@ -28,7 +28,7 @@
 </div>
 
 <div class="md:flex gap-5 justify-center items-center mt-10">
-    <div class="md:w-1/2 md:h-1/2 mt-10">
+    <div class="mt-20 mb-10 md:w-1/2 md:h-1/2 md:mt-10">
         <Chart Config="barConfig"></Chart>
     </div>
     <div class="flex md:w-2/5 flex-col gap-4 p-2 justify-center">

diff --git a/src/apps/blazor-app/Components/Base/Tooltip.razor b/src/apps/blazor-app/Components/Base/Tooltip.razor
@@ -35,4 +35,4 @@
                 break;
         }
     }
-}
+}
diff --git a/src/apps/blazor-app/Pages/Login.razor b/src/apps/blazor-app/Pages/Login.razor
@@ -26,7 +26,7 @@
                     </a>
                 </div>
                 <Image ImageName="Sun.svg" css="absolute top-0 -right-10 lg:right-0 z-0 w-52 lg:w-fit" alt="Sun"/>
-                <Image ImageName="Panels_Trees.svg" css="absolute bottom-0 left-0 z-0" alt="UI Elements"/>
+                <Image ImageName="Panels_Trees.svg" css="absolute bottom-0 scale-75 md:scale-100 left-0 z-0" alt="UI Elements"/>
                 <Image ImageName="Robert_Waving.png" css="absolute robert-slide-in-right translate-x-1/2 top-20 lg:bottom-10  -right-20 sm:-right-[100px] lg:-right-[180px]  xl:-right-[200px] h-[300px] md:h-[400px] lg:h-[600px] xl:h-[800px] " alt="Rob"/>
 
                 <div class="flex mx-auto my-auto  items-center justify-center w-full z-20">

diff --git a/src/apps/blazor-app/Pages/Register.razor b/src/apps/blazor-app/Pages/Register.razor
@@ -26,8 +26,8 @@ else if (logIn)
                     </a>
                 </div>
         <Image ImageName="Sun.svg" css="absolute top-0 -left-10 lg:left-0 z-0 w-52 lg:w-fit" alt="Sun"/>
-        <Image ImageName="Panels_Trees.svg" css="absolute bottom-0  right-0 transform -scale-x-100" alt="UI Elements"/>
-        <Image ImageName="Robert_Sitting.png" css="absolute robert-slide-in-left bottom-14 md:bottom-0 -translate-x-full -left-32 sm:-left-44 md:-left-52 xl:-left-64 h-[300px] sm:h-[400px] md:h-[480px] xl:h-[580px] " alt="Rob"/>
+        <Image ImageName="Panels_Trees.svg" css="absolute bottom-0 w-3/4 right-0 transform -scale-x-100" alt="UI Elements"/>
+        <Image ImageName="Robert_Sitting.png" css="absolute robert-slide-in-left -bottom-5 md:bottom-0 -translate-x-full -left-32 sm:-left-44 md:-left-52 xl:-left-64 h-[300px] sm:h-[400px] md:h-[480px] xl:h-[580px] " alt="Rob"/>
 
         <div class="flex justify-center w-full">
             <div class="my-auto max-w-lg w-full text-left z-10">

diff --git a/src/apps/blazor-app/wwwroot/css/app.css b/src/apps/blazor-app/wwwroot/css/app.css
@@ -903,6 +903,22 @@ video {
   top: 100%;
 }
 
+.bottom-12 {
+  bottom: 3rem;
+}
+
+.bottom-8 {
+  bottom: 2rem;
+}
+
+.-bottom-0 {
+  bottom: -0px;
+}
+
+.-bottom-5 {
+  bottom: -1.25rem;
+}
+
 .-right-\[134px\] {
   right: -134px;
 }
@@ -1224,6 +1240,10 @@ video {
   margin-top: 2.5rem;
 }
 
+.mt-12 {
+  margin-top: 3rem;
+}
+
 .mt-14 {
   margin-top: 3.5rem;
 }
@@ -1617,6 +1637,10 @@ video {
   width: 1.75rem;
 }
 
+.w-7\/12 {
+  width: 58.333333%;
+}
+
 .w-72 {
   width: 18rem;
 }
@@ -1713,6 +1737,10 @@ video {
   width: 420px;
 }
 
+.w-\[470px\] {
+  width: 470px;
+}
+
 .w-\[65px\] {
   width: 65px;
 }
@@ -2027,6 +2055,12 @@ video {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
+.scale-\[2\.5\] {
+  --tw-scale-x: 2.5;
+  --tw-scale-y: 2.5;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+}
+
 .scale-\[2\.6\] {
   --tw-scale-x: 2.6;
   --tw-scale-y: 2.6;
@@ -2686,6 +2720,10 @@ video {
   padding: 0.625rem;
 }
 
+.p-20 {
+  padding: 5rem;
+}
+
 .p-3 {
   padding: 0.75rem;
 }
@@ -4375,6 +4413,10 @@ html {
     margin-top: 18rem;
   }
 
+  .md\:mt-10 {
+    margin-top: 2.5rem;
+  }
+
   .md\:block {
     display: block;
   }
@@ -4411,10 +4453,6 @@ html {
     height: 18rem;
   }
 
-  .md\:h-8 {
-    height: 2rem;
-  }
-
   .md\:h-80 {
     height: 20rem;
   }
@@ -4432,6 +4470,10 @@ html {
     height: fit-content;
   }
 
+  .md\:h-8 {
+    height: 2rem;
+  }
+
   .md\:w-1\/2 {
     width: 50%;
   }
@@ -4440,14 +4482,6 @@ html {
     width: 33.333333%;
   }
 
-  .md\:w-12 {
-    width: 3rem;
-  }
-
-  .md\:w-16 {
-    width: 4rem;
-  }
-
   .md\:w-2\/3 {
     width: 66.666667%;
   }
@@ -4456,6 +4490,27 @@ html {
     width: 40%;
   }
 
+  .md\:w-\[45\%\] {
+    width: 45%;
+  }
+
+  .md\:w-fit {
+    width: -moz-fit-content;
+    width: fit-content;
+  }
+
+  .md\:w-full {
+    width: 100%;
+  }
+
+  .md\:w-12 {
+    width: 3rem;
+  }
+
+  .md\:w-16 {
+    width: 4rem;
+  }
+
   .md\:w-24 {
     width: 6rem;
   }
@@ -4472,23 +4527,10 @@ html {
     width: 360px;
   }
 
-  .md\:w-\[45\%\] {
-    width: 45%;
-  }
-
   .md\:w-\[470px\] {
     width: 470px;
   }
 
-  .md\:w-fit {
-    width: -moz-fit-content;
-    width: fit-content;
-  }
-
-  .md\:w-full {
-    width: 100%;
-  }
-
   .md\:flex-shrink-0 {
     flex-shrink: 0;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ @@
                     break;
             }
         }
-    }
+    }