From 34258ed2dc91c34f4c91ccc0a40414262c573e5c Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 7 May 2019 11:11:00 +0900 Subject: [PATCH 01/16] Change links to be more noticeable with Bolding and Underlining. --- styles.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/styles.css b/styles.css index 565496a..d85f2c4 100644 --- a/styles.css +++ b/styles.css @@ -62,6 +62,11 @@ h4 { font-size: 1.8em; } +a { + font-weight: bold; + text-decoration: underline; +} + .vision-statement { /* font-size: 1.5em; */ margin-bottom: 3em; @@ -102,4 +107,4 @@ h4 { .answer { margin-left: 10px; -} \ No newline at end of file +} From a17ed332e6f703669e86d03ce22e84290c1db5b7 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 7 May 2019 11:56:50 +0900 Subject: [PATCH 02/16] Add in shadowing to make devOsan title stand out and readable. Made links stand out more with bolding and underlining. Created script to collapse menu. This is a fix for Issue #5 --- additionalScripts.js | 4 ++++ index.html | 18 +++++++----------- styles.css | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 additionalScripts.js diff --git a/additionalScripts.js b/additionalScripts.js new file mode 100644 index 0000000..30a3f14 --- /dev/null +++ b/additionalScripts.js @@ -0,0 +1,4 @@ +$(function(){ + var navMain = $(".navbar-collapse"); + navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');}); +}); \ No newline at end of file diff --git a/index.html b/index.html index 66215a2..3ddc02c 100644 --- a/index.html +++ b/index.html @@ -34,11 +34,9 @@
@@ -209,5 +204,6 @@ integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous" > + diff --git a/styles.css b/styles.css index d85f2c4..375dd45 100644 --- a/styles.css +++ b/styles.css @@ -1,5 +1,5 @@ .above-the-fold { - min-height: 100vh; + min-height: 95vh; background-image: url("img/devOsan_noLogo.png"); background-size: cover; background-repeat: no-repeat; @@ -58,6 +58,19 @@ 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; } From a2c93c33ddffafa02fce56fbd16158c6823a5f80 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 7 May 2019 15:18:44 +0900 Subject: [PATCH 03/16] Prepare formatting for Projects Carousel. --- index.html | 55 +++++++++++++++++++++++++++++++++++++++++++++++------- styles.css | 27 ++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 3ddc02c..7da73fd 100644 --- a/index.html +++ b/index.html @@ -148,9 +148,30 @@


Projects


-

Bus GPS

-

{dev}Osan Website

-

Pending Game Engine

+
@@ -167,10 +188,30 @@

FAQ

-
Do I have to know how to program?
-
- Absolutely not, just a desire to hang out with software developers. -
+
+
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! +
+
diff --git a/styles.css b/styles.css index 375dd45..7329f72 100644 --- a/styles.css +++ b/styles.css @@ -118,6 +118,31 @@ a { padding-left: 12px; } -.answer { +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; } From 2cd52587bbc79e11e7737c0a04277b02fe1e7498 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 21 May 2019 17:10:33 +0900 Subject: [PATCH 04/16] Added random HTML picker to script influencing the design of devOsan logo and mini logo. --- additionalScripts.js | 25 ++++++++++++++++++++++++- index.html | 4 ++-- styles.css | 4 ++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/additionalScripts.js b/additionalScripts.js index 30a3f14..3af9c60 100644 --- a/additionalScripts.js +++ b/additionalScripts.js @@ -1,4 +1,27 @@ $(function(){ var navMain = $(".navbar-collapse"); navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');}); -}); \ No newline at end of file +}); + +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 7da73fd..664d60e 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@
-
+

{dev}Osan

diff --git a/styles.css b/styles.css index 7329f72..0b0ac63 100644 --- a/styles.css +++ b/styles.css @@ -58,14 +58,14 @@ h1 { font-size: 5em; } -h1.devOsan{ +/*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; From 8572ca28d9ca825c16e9b30d4bc3acda66f7b881 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 21 May 2019 21:15:53 +0900 Subject: [PATCH 05/16] Add dynamic logo --- dev-osan.github.io | 1 + index.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 dev-osan.github.io diff --git a/dev-osan.github.io b/dev-osan.github.io new file mode 160000 index 0000000..2cd5258 --- /dev/null +++ b/dev-osan.github.io @@ -0,0 +1 @@ +Subproject commit 2cd52587bbc79e11e7737c0a04277b02fe1e7498 diff --git a/index.html b/index.html index fddf78c..322eb4e 100644 --- a/index.html +++ b/index.html @@ -34,9 +34,9 @@
-

- {dev}Osan +

+ {dev}Osan

-

Software Development Club

+

Software Development Club

@@ -206,5 +203,6 @@ integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous" > + diff --git a/styles.css b/styles.css index 792ab04..ba18b65 100644 --- a/styles.css +++ b/styles.css @@ -1,5 +1,5 @@ .above-the-fold { - min-height: 100vh; + min-height: 95vh; background-image: url("img/devOsan_noLogo.png"); background-size: cover; background-repeat: no-repeat; @@ -63,6 +63,19 @@ 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; } From 10d8be599a495ebbbd727b55d2f975f4a6f44999 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 7 May 2019 15:18:44 +0900 Subject: [PATCH 10/16] Prepare formatting for Projects Carousel. --- index.html | 55 +++++++++++++++++++++++++++++++++++++++++++++++------- styles.css | 27 ++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 2d755b7..06fde4b 100644 --- a/index.html +++ b/index.html @@ -147,9 +147,30 @@


Projects


-

Bus GPS

-

{dev}Osan Website

-

Pending Game Engine

+
@@ -166,10 +187,30 @@

FAQ

-
Do I have to know how to program?
-
- Absolutely not, just a desire to hang out with software developers. -
+
+
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! +
+
diff --git a/styles.css b/styles.css index ba18b65..ff8e711 100644 --- a/styles.css +++ b/styles.css @@ -123,6 +123,31 @@ a { padding-left: 12px; } -.answer { +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; } From 994e8b801ec2d290ea96d5802516e9c7bf6dde45 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Tue, 21 May 2019 17:10:33 +0900 Subject: [PATCH 11/16] Added random HTML picker to script influencing the design of devOsan logo and mini logo. --- additionalScripts.js | 25 ++++++++++++++++++++++++- index.html | 2 +- styles.css | 4 ++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/additionalScripts.js b/additionalScripts.js index 30a3f14..3af9c60 100644 --- a/additionalScripts.js +++ b/additionalScripts.js @@ -1,4 +1,27 @@ $(function(){ var navMain = $(".navbar-collapse"); navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');}); -}); \ No newline at end of file +}); + +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 06fde4b..fddf78c 100644 --- a/index.html +++ b/index.html @@ -103,7 +103,7 @@
-
+

{dev}Osan

diff --git a/styles.css b/styles.css index ff8e711..70ef195 100644 --- a/styles.css +++ b/styles.css @@ -63,14 +63,14 @@ h1 { font-size: 5em; } -h1.devOsan{ +/*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; From 3e0559f8df482e671e65cb8cbc18d5968603d6c6 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 21 May 2019 21:15:53 +0900 Subject: [PATCH 12/16] Add dynamic logo --- dev-osan.github.io | 1 + index.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 dev-osan.github.io diff --git a/dev-osan.github.io b/dev-osan.github.io new file mode 160000 index 0000000..2cd5258 --- /dev/null +++ b/dev-osan.github.io @@ -0,0 +1 @@ +Subproject commit 2cd52587bbc79e11e7737c0a04277b02fe1e7498 diff --git a/index.html b/index.html index fddf78c..322eb4e 100644 --- a/index.html +++ b/index.html @@ -34,9 +34,9 @@
-
-

- {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; +} From e2fba3210998509ee58c46a43c6e65e89f7a176a Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 22 May 2019 11:56:14 +0900 Subject: [PATCH 16/16] Prepare formatting layout for Project Carousel. --- index.html | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 123ab17..7b4eaff 100644 --- a/index.html +++ b/index.html @@ -150,9 +150,30 @@


Projects


-

Bus GPS

-

{dev}Osan Website

-

Pending Game Engine

+