From bc94f353decafac15a361bfb682e27742fbe2cfd Mon Sep 17 00:00:00 2001 From: Paradox Programming Date: Thu, 11 Apr 2019 17:19:34 -0600 Subject: [PATCH] Reconfiged Navbars --- 404.html | 40 +++------------------------ css/master.css | 2 +- index.html | 40 +++------------------------ js/master.js | 16 +++++------ p/about/index.html | 44 ++++-------------------------- p/about/site/index.html | 47 +++++--------------------------- p/games/index.html | 47 ++++++-------------------------- p/games/javascript/index.html | 43 +++++------------------------ p/games/javascript/ka/index.html | 43 ++++++----------------------- p/games/javascript/ka/styles.css | 17 +++++------- p/games/javascript/p5/index.html | 45 +++++------------------------- p/games/unity/index.html | 45 +++++------------------------- p/index.html | 12 ++++++++ p/youtube/index.html | 39 +++++--------------------- tests/jstest.html | 5 ++-- 15 files changed, 96 insertions(+), 389 deletions(-) create mode 100644 p/index.html diff --git a/404.html b/404.html index b08d85b..3f4d439 100644 --- a/404.html +++ b/404.html @@ -9,38 +9,7 @@ - < - +
@@ -55,10 +24,9 @@

File not found

- - - - + + + diff --git a/css/master.css b/css/master.css index 0cf53f5..429bab1 100644 --- a/css/master.css +++ b/css/master.css @@ -1,5 +1,5 @@ /* Bootstrap */ -@import url("https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"); +@import url("/assets/libraries/bootstrap/css/bootstrap.min.css"); /* Navbar Font, from Google Fonts */ @import url("https://fonts.googleapis.com/css?family=ZCOOL+QingKe+HuangYou"); /* Font Awesome */ diff --git a/index.html b/index.html index a3c80f4..d30e00d 100644 --- a/index.html +++ b/index.html @@ -15,38 +15,7 @@ - - +
@@ -75,9 +44,8 @@

What I'm up to

- - - - + + + diff --git a/js/master.js b/js/master.js index 1be73fc..a1dc8d5 100644 --- a/js/master.js +++ b/js/master.js @@ -15,18 +15,18 @@ function loadScript(url, callback) { }; function doneLoading(){ var $nav = $('#navbar'); - $nav.load("/html-templates/navcontents.html"); - if(active){ - console.log($("#"+active)); - var $active = $("#"+active).addClass("active"); - $active.addClass("active"); - $active.children() - } + $nav.load("/html-templates/navcontents.html", function(){ + if(active){ + var $active = $('#' + active); + $active.addClass("active"); + $active.children().append(' (current)'); + } + }); }; function loadBootstrap(){ loadScript("/assets/libraries/bootstrap/js/bootstrap.min.js",doneLoading); }; function loadPopper() { - loadScript("/assets/libraries/popper.min.js", loadBootstrap) + loadScript("/assets/libraries/popper.min.js", loadBootstrap); }; loadScript("/assets/libraries/jquery-3.4.0.min.js", loadPopper); diff --git a/p/about/index.html b/p/about/index.html index 8a3f4f6..9282d1a 100644 --- a/p/about/index.html +++ b/p/about/index.html @@ -10,45 +10,13 @@ - - - +
-
+

About Me

@@ -61,9 +29,9 @@

About Me

- - - - + + diff --git a/p/about/site/index.html b/p/about/site/index.html index 4ae3b3d..c31a3cd 100644 --- a/p/about/site/index.html +++ b/p/about/site/index.html @@ -10,46 +10,13 @@ - - - - +
/assets/images/coding-bg-1.jpg
-
+

About this Site

This site was set up 100% free. The domain was from Freenom, where you can buy and manage domains, and Netlify helped me manage the github repository to the domain, using some nameservers. I used bootstrap, jQuery, and Popper.js to make this site work, all free libraries.

@@ -57,10 +24,10 @@

About this Site

- - - - - + + + diff --git a/p/games/index.html b/p/games/index.html index fea2ce8..929028f 100644 --- a/p/games/index.html +++ b/p/games/index.html @@ -11,40 +11,8 @@ - - + +
@@ -62,10 +30,11 @@

The games I put on this website are either made with unity, or javascript li

- - - - - + + + + diff --git a/p/games/javascript/index.html b/p/games/javascript/index.html index 23fee37..c55b19c 100644 --- a/p/games/javascript/index.html +++ b/p/games/javascript/index.html @@ -10,38 +10,7 @@ - - +
@@ -64,10 +33,12 @@

Javascript Games

- - - - + + + + diff --git a/p/games/javascript/ka/index.html b/p/games/javascript/ka/index.html index f13b637..4c0e565 100644 --- a/p/games/javascript/ka/index.html +++ b/p/games/javascript/ka/index.html @@ -10,41 +10,7 @@ - - - +

KA Projects

@@ -68,5 +34,12 @@

Visit + + + + + diff --git a/p/games/javascript/ka/styles.css b/p/games/javascript/ka/styles.css index 1dde255..021c1e5 100644 --- a/p/games/javascript/ka/styles.css +++ b/p/games/javascript/ka/styles.css @@ -1,27 +1,24 @@ -* { - text-align: center; -} body { - padding: 10px; + text-align: center; } h1 { font-size: 5.0em; } .projects { padding: 50px; - width: 400px; + width: 520px; background-color: white; - background: linear-gradient(rgb(255,255,255),rgb(240,250,255)); margin: 0 auto; border-radius: 5px; + margin-bottom: 30px; } .project { - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; border: 10px solid lightgray; background: white; border-radius: 5px; - width: 400px; - height: 400px; + width: 420px; + height: 420px; } diff --git a/p/games/javascript/p5/index.html b/p/games/javascript/p5/index.html index b0e1e66..18459ee 100644 --- a/p/games/javascript/p5/index.html +++ b/p/games/javascript/p5/index.html @@ -8,40 +8,8 @@ Paradox42 | P5 Games - - + +
@@ -61,10 +29,11 @@

P5 Games

- - - - + + + diff --git a/p/games/unity/index.html b/p/games/unity/index.html index 54af03c..455ad7c 100644 --- a/p/games/unity/index.html +++ b/p/games/unity/index.html @@ -10,40 +10,7 @@ - - +
@@ -66,10 +33,12 @@

I am learning how to make 2D games with the unity engine

- - - - + + + + diff --git a/p/index.html b/p/index.html new file mode 100644 index 0000000..72f8268 --- /dev/null +++ b/p/index.html @@ -0,0 +1,12 @@ + + + + + Redirecting... + + + + + diff --git a/p/youtube/index.html b/p/youtube/index.html index 7e763f4..2ead17b 100644 --- a/p/youtube/index.html +++ b/p/youtube/index.html @@ -10,38 +10,7 @@ - - +

Youtube Videos

@@ -74,5 +43,11 @@

+ + + + diff --git a/tests/jstest.html b/tests/jstest.html index 633c05a..47af941 100644 --- a/tests/jstest.html +++ b/tests/jstest.html @@ -7,9 +7,10 @@ - + +