Merge pull request #9 from IEEE-UofG-Student-Branch/Lukas-Dev

Update events
IEEE-UofG-Student-Branch · Sep 17, 2024 · a84dad3 · a84dad3
2 parents 677ac71 + 6bf9b4c
commit a84dad3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/www/html/images/originals/genMeetF24.png b/www/html/images/originals/genMeetF24.png
diff --git a/www/html/index.html b/www/html/index.html
@@ -64,23 +64,22 @@
             <div class="feature1">
 
               <img class="feature1_img"
-                   src="images/spingle.webp"
+                   src="images/originals/genMeetF24.png"
                    alt="TEMP">
               <div class="feature_header_text">
-                IEEE Engineering Speed Mingle
+                IEEE General Meeting
               </div>
               <div class="feature_date_text">
-                04.Sep.2024
+                20.Sep.2024 at 6 pm (THRN 1002)
               </div>
               <div class="feature_blurb_text">
                 <p>
-                  Students will have the opportunity to break the ice with other aspiring engineering students in a fast-paced, riveting environment, discussing
-                  their mutual excitement and passion as a Guelph Engineering student. This event is a great opportunity for students to meet and mingle with
-                  their peers in a casual, low-pressure environment and foster a new cohort of engineers at the University of Guelph.
+                  Join the IEEE Student Branch at the University of Guelph for our semesterly general meeting where we
+                  will discuss our plans for the semester including events, workshops, and provide miscellaneous updates!
                 </p>
               </div>
 
-              <!--
+
               <div class="nav_button_div">
                 <a class="nav_button_anchor"
                    href="proj/Catan.html" data-remove-file-extension="true">
@@ -105,10 +104,11 @@
                   </div>
                 </a>
               </div>
-              -->
+
 
             </div>
 
+            <!--
             <div class="feature2">
               <img class="feature1_img"
                    src="images/hutt.webp"
@@ -125,7 +125,6 @@
                 </p>
               </div>
 
-              <!--
               <div class="nav_button_div">
                 <a class="nav_button_anchor"
                    href="proj/Webserver.html" data-remove-file-extension="true">
@@ -150,9 +149,10 @@
                   </div>
                 </a>
               </div>
-              -->
 
             </div>
+            -->
+
           </div>
         </div>
 

diff --git a/www/html/indexStyles.css b/www/html/indexStyles.css
@@ -120,8 +120,15 @@
 
 .feature1_img,
 .feature2_img {
-    width: 100%;
+    width: 50%;
     border-radius: 15px;
+
+    /*
+    Temp centering for when there is only 1 featured event
+    */
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .more_proj_text_box {
@@ -191,4 +198,4 @@
     overflow: hidden;
     object-fit: cover;
     border-radius: 10px;
-}
+}