Rebase

additionalScripts.js

@@ -1,27 +0,0 @@
-$(function(){
-	var navMain = $(".navbar-collapse");
-	navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');});
-});
-
-var vals = [
-	`<h1 class="devOsan"">
-              <span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
-            </h1>
-            <h4 class="devOsan">Software Development Club</h4>`, //Original
-	`<h1 class="devOsan" style="text-shadow: 2px 2px 6px #AAFFAA;">
-               <span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
-            </h1>	
-            <h4 class="devOsan">Software Development Club</h4>`,	//By Sig
-];
-
-var vals2 = [
-	`<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan`, //Original
-	`<span style="color:black;text-shadow: 0px 0px 2px #AAFFAA;"><span style="color: #696035;">{</span>dev<span style="color: #696035">}</span>Osan</span>`, //By Sig	
-];
-
-window.onload=generateLogo(Math.floor(Math.random()*vals.length));
-
-function generateLogo(numb) {
-	document.getElementById("devOsanLogo-dynamic").innerHTML=vals[numb];
-	document.getElementById("devOsanMiniLogo-dynamic").innerHTML=vals2[numb];
-}

index.html

@@ -103,11 +103,14 @@
           </div>
         </div>
         <div class="row name-slogan">
-          <div class="col col-md-6 offset-md-6" id="devOsanLogo-dynamic">
+          <div class="col col-md-6 offset-md-6">
-            <h1 class="devOsan">
+            <h1>
-              <span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
+              <span style="color: #696035">{</span>dev<span
+                style="color: #696035"
+                >}</span
+              >Osan
             </h1>
-            <h4 class="devOsan">Software Development Club</h4>
+            <h4>Software Development Club</h4>
           </div>
         </div>
       </div>
@@ -147,30 +150,9 @@
         <div class="col-sm-6" id="projects">
           <h3><i class="fas fa-code-branch"></i><br />Projects</h3>
           <br />
-		  <div id="projectCarousel" class="carousel slide" data-ride="carousel">
+          <p>Bus GPS</p>
-			<div class="carousel-inner">
+          <p>{dev}Osan Website</p>
-				<div class="carousel-item active" data-interval="10000">
+          <p>Pending Game Engine</p>
-					<h3>Bus GPS</h3>
-					<p>Kevin Falting</p>
-				</div>
-				<div class="carousel-item" data-interval="10000">
-					<h3>{dev}Osan Website</h3>
-					<p>{dev}Osan Club</p>
-				</div>
-				<div class="carousel-item" data-interval="10000">
-					<h3>Pending Game Engine</h3>
-					<p>Joshua Sigona</p>
-				</div>
-			</div>
-			<a class="carousel-control-prev" href="#projectCarousel" role="button" data-slide="prev">
-				<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-				<span class="sr-only">Previous</span>
-			</a>
-			<a class="carousel-control-next" href="#projectCarousel" role="button" data-slide="next">
-				<span class="carousel-control-next-icon" aria-hidden="true"></span>
-				<span class="sr-only">Next</span>
-			</a>
-		  </div>
         </div>
       </div>
     </div>
@@ -187,30 +169,10 @@
         </div>
         <div class="col-sm-6" id="faq">
           <h3>FAQ</h3>
-          <div class="question1">
+          <h6>Do I have to know how to program?</h6>
-		  <h6>Do I have to know how to program?</h6>
+          <div class="answer">
-			<div class="answer">
+            Absolutely not, just a desire to hang out with software developers.
-				Absolutely not, just a desire to hang out with software developers.
+          </div>
-			</div>
-		  </div>
-          <div class="question2">
-			<h6>I want to learn a programming language but I have no experience. Where do I start?</h6>
-			<div class="answer">
-				Look at the "Getting Started" Learning Resources above for great starting points. Pick something you are passionate about making and work towards your goal by learning the requirements of that goal.
-			</div>
-		  </div>
-          <div class="question1">
-			<h6>How do I fix errors when I run into them and don't know what do?</h6>
-			<div class="answer">
-				Google is your best friend. Usually asking your question through Google gives you a <b>Stack Overflow</b> article with similar issues that others have faced like you.
-			</div>
-		  </div>
-          <div class="question2">
-			<h6>I want to teach something for the club that would be beneficial!</h6>
-			<div class="answer">
-				Awesome! As we explain in our meetings, anyone can come up and be the speaker for the week. If you have a topic that would benefit others then by all means we would love to hear from you! Let us know when you want to speak!
-			</div>
-		  </div>
         </div>
       </div>
     </div>
@@ -244,6 +206,5 @@
       integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
       crossorigin="anonymous"
     ></script>
-	<script src="additionalScripts.js"></script>
   </body>
 </html>

styles.css

@@ -1,5 +1,5 @@
 .above-the-fold {
-  min-height: 95vh;
+  min-height: 100vh;
   background-image: url("img/devOsan_noLogo.png");
   background-size: cover;
   background-repeat: no-repeat;
@@ -63,28 +63,10 @@ h1 {
   font-size: 5em;
 }
 
-/*h1.devOsan{
-	text-shadow: 2px 2px 6px #AAFFAA;
-}
-
-a.devOsan{
-	text-shadow: 0px 0px 2px #AAFFAA;
-	color:black;
-}*/
-
-h4.devOsan{
-	text-shadow: 1px 1px 3px white;
-}
-
 h4 {
   font-size: 1.8em;
 }
 
-a {
-  font-weight: bold;
-  text-decoration: underline;
-}
-
 .vision-statement {
   /* font-size: 1.5em; */
   margin-bottom: 3em;
@@ -122,3 +104,7 @@ a {
 .info-header-sm {
   padding-left: 12px;
 }
+
+.answer {
+  margin-left: 10px;
+}