Merge branch 'dev-osan-master'. Updating master.

CNAME

@@ -0,0 +1 @@
+devosan.com

index.html

@@ -34,9 +34,9 @@
     <!-- Header information, above the fold -->
     <div class="above-the-fold">
       <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-        <a class="devOsan" href="#" id="devOsanMiniLogo-dynamic">
-			<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
-		</a>
+        <a class="navbar-brand" href="#">
+          <span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
+        </a>
         <button
           class="navbar-toggler"
           type="button"
@@ -49,6 +49,7 @@
           <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
+          <hr />
           <ul class="navbar-nav">
             <li class="nav-item">
               <a class="nav-link" href="#club-info">Club Info</a>
@@ -60,9 +61,7 @@
               <a class="nav-link" href="#projects">Projects</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#learning-resources"
-                >Learning Resources</a
-              >
+              <a class="nav-link" href="#learning-resources">Learning Resources</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="#faq">FAQs</a>
@@ -77,8 +76,8 @@
       <div class="container">
         <div class="row">
           <div class="col">
-            <a href="" id="announcement-card-link">
-              <div class="card mb-3" style="max-width: 540px; margin-top: 5%;">
+            <div class="card mb-3" style="max-width: 540px; margin-top: 5%;">
+              <a href="https://pitchandprototype.com/" id="announcement-card-link">
                 <div class="row no-gutters">
                   <div class="col-4">
                     <img
@@ -99,8 +98,8 @@
                     </div>
                   </div>
                 </div>
-              </div>
-            </a>
+              </a>
+            </div>
           </div>
         </div>
         <div class="row name-slogan">
@@ -218,7 +217,7 @@
 
     <!-- Footer and Contact Us -->
     <div class="container-fluid" id="contact">
-      <div class="row">
+      <div class="row" style="padding: 25px 10px 25px 10px;">
         <div class="col">
           <h3>Contact Us</h3>
           <p>

styles.css

@@ -7,6 +7,11 @@
   padding-top: 3em;
 }
 
+.navbar-collapse hr {
+  background: #e3e3e3;
+  opacity: 0.3;
+}
+
 #announcement-card-link {
   text-decoration: none;
   color: black;
@@ -117,32 +122,3 @@ a {
 .info-header-sm {
   padding-left: 12px;
 }
-
-div[class="question1"]{
-  margin-left: 10px;
-  padding-bottom: 12px;
-  background-color: rgb(250,240,240);
-}
-
-div[class="question1"]>div[class="answer"]{
-  margin-left: 10px;
-  padding-bottom: 12px;
-  background-color: rgb(240,240,220);
-}
-
-div[class="question2"]{
-  margin-left: 10px;
-  padding-bottom: 12px;
-  background-color: rgb(240,240,240);
-}
-
-div[class="question2"]>div[class="answer"]{
-  margin-left: 10px;
-  padding-bottom: 12px;
-  background-color: rgb(230,240,220);
-}
-
-div[class="answer"]>b{
-	font-weight: normal;
-	text-decoration:underline;
-}