Merge branch 'dev' of github.com:CUCyber/cucyber.github.io

CUCyber · Sep 6, 2023 · 3774adf · 3774adf
2 parents 690c554 + f08d9f4
commit 3774adf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/about.html b/about.html
@@ -34,7 +34,7 @@ <h3 class="subtitle wow fadeInUp" data-wow-delay=".3s" data-wow-duration="500ms"
                     <ul>
 			<li><p class="wow fadeInUp" data-wow-delay=".5s" data-wow-duration="500ms">2021 <a rel="external noopener" href="https://pcdc-sc.com/" target="_blank">PCDC</a> First Place; Team Members: Matt Ehrnschwender, Charles Truluck, Matthew Burnett, and Kaitlyn Pierce.
                     	<li><p class="wow fadeInUp" data-wow-delay=".5s" data-wow-duration="500ms">2020 <a rel="external noopener" href="https://www.csaw.io/" target="_blank">CSAW Finals</a> Thirteenth Place; Team Members: Matthew Rinaldi and Matt Ehrnschwender</p></li>
-                    	
+
                         <li><p class="wow fadeInUp" data-wow-delay=".5s" data-wow-duration="500ms">2020 <a rel="external noopener" href="https://cyberinstitute.kennesaw.edu/seccdc/" target="_blank">SECCDC</a> Third Place; Team Members: Max Harley, Matthew Rinaldi, Cameron Ogle, Adam Van Scyoc, Madeleine Wolfe, and David Houston</p></li>
                         <li><p class="wow fadeInUp" data-wow-delay=".5s" data-wow-duration="500ms">2019 <a rel="external noopener" href="https://pcdc-sc.com/" target="_blank">PCDC</a> First Place; Team Members: Nick Bulischeck, Max Harley, Weston Belk, Kenneth Simpson, David Houston, and Matthew Rinaldi; Our former president, Nick Bulischeck, took MVP of the competition!</p></li>
                         <li><p class="wow fadeInUp" data-wow-delay=".5s" data-wow-duration="500ms">2019 <a rel="external noopener" href="https://pcdc-sc.com/" target="_blank">PDFC</a> First Place; Team Members: Nick Bulischeck, Max Harley, and Weston Belk</p></li>
@@ -74,8 +74,8 @@ <h2 class="item_title">
                         Weekly Meetings
                     </h2>
                     <p>
-                        CU Cyber meetings are held Thursdays at 7pm in the Watt Family Innovation Center room 308.<br/><br/>
-                        We will cover security topics and tools in these meetings that can be applied to your professional and daily life.
+                        CU Cyber meetings are held weekly; <a href="/events">see our calendar for times</a>.<br/><br/>
+                        We cover security topics and tools that can be applied to your professional and daily life.
                     </p>
                 </div>
             </div>

diff --git a/contact.html b/contact.html
@@ -72,16 +72,16 @@ <h3 class="team_name"></h3>
                             <p class="team_designation">CUCTF Task Force Leader</p>
                             <p class="team_text"><a href="mailto:@g.clemson.edu">@g.clemson.edu</a></p>
                         </div>
-		    </div> --> 
+		    </div> -->
                 </div>
             </div>
             <div class="col-lg-6">
                 <div class="map-area">
                     <div class="text-center">
-                        <h2 class="subtitle wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".3s">Find us in the Watt Center room 308</h2>
-                        <p class="subtitle-des wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".5s">
-                            We meet weekly on Thursdays at 7:00 PM in the Watt Center room 308, so come check us out!
-                        </p><br>
+                        <h2 class="subtitle wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".3s">Find us in the Watt Center</h2>
+						<p class="subtitle-des wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".5s">
+							We meet weekly in the Watt center, <a href="/events">see our calendar for times</a>.
+						</p><br>
                     </div>
                     <div class="map text-center">
                         <iframe src="https://www.google.com/maps/embed?pb=!1m23!1m12!1m3!1d1640.5817852664861!2d-82.83738650733035!3d34.6758209805779!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!4m8!3e6!4m0!4m5!1s0x88585e6c9bf4ef91%3A0x6ac5cda68e85ebf8!2sWatt+Family+Innovation+Center%2C+Clemson%2C+SC!3m2!1d34.6759451!2d-82.8367853!5e0!3m2!1sen!2sus!4v1453409418371" allowfullscreen></iframe>