Merge branch 'master' of https://github.com/mcd223/mcd223.github.io

5 files changed, 18 insertions, 69 deletions

diff --git a/CSS/main.css b/CSS/main.css
index af4bcef..7940649 100644
--- a/CSS/main.css
+++ b/CSS/main.css
@@ -49,9 +49,9 @@ ul {
 ul li a {
     text-decoration: none;
     text-transform: uppercase;
-    font-size: .8em;
+    font-size: .6em;
     display: block;
-    padding: .95em 3em;
+    padding: .5em 3em;
     color: #000;
 }
 div.logo{
@@ -120,6 +120,7 @@ main{
     }
     ul li a{
         padding: 1.4em;
+        font-size: .8em;
     }
     ul li a:hover{
         background: #fff;
diff --git a/JS/command.js b/JS/command.js
new file mode 100644
index 0000000..e46c268
--- /dev/null
+++ b/JS/command.js
@@ -0,0 +1,10 @@
+function fourChan() {
+    document.getElementById("pLink").innerHTML = "4chan";
+    document.getElementById("pLink").href = "https://4chan.org/";
+    document.getElementById("pLinks").innerHTML = "4channel";
+    document.getElementById("pLinks").href = "https://4channel.org/";
+}
+function help(){
+    alert('hahahaha. There is no help. You cannot escape.');
+    help()
+}
\ No newline at end of file
diff --git a/JS/main.js b/JS/main.js
index 97b5449..ec46e4c 100644
--- a/JS/main.js
+++ b/JS/main.js
@@ -2,11 +2,11 @@ function searchDuck(event){
     var x = document.getElementById('Search').value;
     if (event.keyCode == 13 || event.which == 13) { 
         if (x == '/4chan'){
-            document.getElementById("pLink").innerHTML = "4chan";
-            document.getElementById("pLink").href = "https://4chan.org/";
-            document.getElementById("pLinks").innerHTML = "4channel";
-            document.getElementById("pLinks").href = "https://4channel.org/";
+            fourChan()
         } 
+        else if (x == '/help'){
+            help()
+        }
         else{location='https://duckduckgo.com/?q=' + encodeURIComponent(document.getElementById('Search').value);}}//13 = enter
 }
 function FocusOnInput(){
diff --git a/day_counter_linux.py b/day_counter_linux.py
deleted file mode 100644
index b4302c7..0000000
--- a/day_counter_linux.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import datetime
-#import threading
-#import subprocess
-import time
-import os
-today = datetime.date.today()
-
-ww1start = datetime.date(1914, 7, 28)#WW1 start date
-ww1sday = today - ww1start
-ww1end = datetime.date(1918, 11, 11)#WW1 end date
-ww1eday = today - ww1end
-
-ww2start = datetime.date(1939, 9, 1)#WW2 start date
-ww2sday = today - ww2start
-ww2end = datetime.date(1945, 9, 2)#WW2 end date
-ww2eday = today - ww2end
-
-Koreanwarstart = datetime.date(1950, 6, 25)#Korean War start date
-Koreanwarsday = today - Koreanwarstart
-Koreanwarend = datetime.date(1953, 7, 27)#Korean War end date
-Koreanwareday = today - Koreanwarend
-
-Vietnamwarstart = datetime.date(1955, 11, 1)#Vietnam War start date
-Vietnamwarsday = today - Vietnamwarstart
-Vietnamwarend = datetime.date(1975, 4, 30)#Vietnam War end date
-Vietnamwareday = today - Vietnamwarend
-
-USSRstart = datetime.date(1922, 12, 30)#U.S.S.R. start date
-USSRsday = today - USSRstart
-USSRend = datetime.date(1991, 12, 25)#U.S.S.R. end date
-USSReday = today - USSRend
-
-
-
-#def printit():
-#   threading.Timer(10, printit).start()
-
-while True:
-    time.sleep(5)
-    os.system('clear')
-    print "    Important Date Counter"
-    print "------------------------------------"
-    print "WW1 Start:", ww1sday.days, "days ago"
-    print "WW1 End:" ,ww1eday.days, "days ago"
-    print "------------------------------------"
-    print "WW2 Start:" ,ww2sday.days, "days ago"
-    print "WW2 End:" ,ww2eday.days, "days ago"
-    print "------------------------------------"
-    print "Korean War Start:" ,Koreanwarsday.days, "days ago"
-    print "Korean War End:" ,Koreanwareday.days, "days ago"
-    print "------------------------------------"
-    print "Vietnam War Start:" ,Vietnamwarsday.days, "days ago"
-    print "Vietnam War End:" ,Vietnamwareday.days, "days ago"
-    print "------------------------------------"
-    print "U.S.S.R. Start:" ,USSRsday.days, "days ago"
-    print "U.S.S.R. End:" ,USSReday.days, "days ago"
-
-
-
-
-
-#printit()
-
diff --git a/index.html b/index.html
index 95804ee..e38e64a 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
         <title>Jacob McDonnell</title>
         <link href="CSS/main.css" rel="stylesheet" type="text/css">
         <script src="JS/main.js"></script>
+        <script src="JS/command.js"></script>
     </head>
     <body onkeydown="keyCode(event)" onload="FocusOnInput()">
         <aside>