From 0a10fee15aaa3c67f610b3bcf8c7af5d7e311cd3 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 22 May 2019 11:38:13 +0900 Subject: [PATCH] Rebase --- additionalScripts.js | 27 ------------------ index.html | 67 +++++++++----------------------------------- styles.css | 26 ++++------------- 3 files changed, 20 insertions(+), 100 deletions(-) delete mode 100644 additionalScripts.js diff --git a/additionalScripts.js b/additionalScripts.js deleted file mode 100644 index 3af9c60..0000000 --- a/additionalScripts.js +++ /dev/null @@ -1,27 +0,0 @@ -$(function(){ - var navMain = $(".navbar-collapse"); - navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');}); -}); - -var vals = [ - `

- {dev}Osan -

-

Software Development Club

`, //Original - `

- {dev}Osan -

-

Software Development Club

`, //By Sig -]; - -var vals2 = [ - `{dev}Osan`, //Original - `{dev}Osan`, //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]; -} \ No newline at end of file diff --git a/index.html b/index.html index fddf78c..123ab17 100644 --- a/index.html +++ b/index.html @@ -103,11 +103,14 @@
-
-

- {dev}Osan +
+

+ {dev}Osan

-

Software Development Club

+

Software Development Club

@@ -147,30 +150,9 @@


Projects


- +

Bus GPS

+

{dev}Osan Website

+

Pending Game Engine

@@ -187,30 +169,10 @@

FAQ

-
-
Do I have to know how to program?
-
- Absolutely not, just a desire to hang out with software developers. -
-
-
-
I want to learn a programming language but I have no experience. Where do I start?
-
- 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. -
-
-
-
How do I fix errors when I run into them and don't know what do?
-
- Google is your best friend. Usually asking your question through Google gives you a Stack Overflow article with similar issues that others have faced like you. -
-
-
-
I want to teach something for the club that would be beneficial!
-
- 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! -
-
+
Do I have to know how to program?
+
+ Absolutely not, just a desire to hang out with software developers. +
@@ -244,6 +206,5 @@ integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous" > - diff --git a/styles.css b/styles.css index f86fefe..c20f5c1 100644 --- a/styles.css +++ b/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; @@ -121,4 +103,8 @@ a { .info-header-sm { padding-left: 12px; -} \ No newline at end of file +} + +.answer { + margin-left: 10px; +}