From cef7d0f2b59fa6d15a69f0f693d85606ab7d5a50 Mon Sep 17 00:00:00 2001 From: Guuq <50501321+Guuq@users.noreply.github.com> Date: Mon, 18 Nov 2019 19:47:19 +0100 Subject: [PATCH] 18-11 #1 --- 404.html | 15 ++---- css.css | 13 ++++- downloads/downloads.css | 46 ------------------ downloads/downloads.json.js | 66 -------------------------- downloads/index.html | 31 ------------ downloads/insertDownloads.js | 31 ------------ index.html | 4 +- playground/css.css | 4 +- resources/css/404.css | 50 ++++++------------- resources/css/cssall.css | 1 + resources/css/shortcuts.css | 25 +++++----- resources/img/downloads/Firefox.png | Bin 345180 -> 0 bytes resources/img/downloads/brave.png | Bin 41727 -> 0 bytes resources/img/downloads/chrome.png | Bin 28296 -> 0 bytes resources/img/downloads/discord.png | Bin 17685 -> 0 bytes resources/img/downloads/minecraft.png | Bin 679517 -> 0 bytes resources/img/downloads/opera.png | Bin 30786 -> 0 bytes resources/img/downloads/origin.png | Bin 15763 -> 0 bytes resources/img/downloads/steam.png | Bin 30560 -> 0 bytes resources/img/downloads/teamspeak.png | Bin 32572 -> 0 bytes resources/img/downloads/whatsapp.png | Bin 194392 -> 0 bytes resources/img/spacecraft.png | Bin 0 -> 377150 bytes 22 files changed, 47 insertions(+), 239 deletions(-) delete mode 100644 downloads/downloads.css delete mode 100644 downloads/downloads.json.js delete mode 100644 downloads/index.html delete mode 100644 downloads/insertDownloads.js delete mode 100644 resources/img/downloads/Firefox.png delete mode 100644 resources/img/downloads/brave.png delete mode 100644 resources/img/downloads/chrome.png delete mode 100644 resources/img/downloads/discord.png delete mode 100644 resources/img/downloads/minecraft.png delete mode 100644 resources/img/downloads/opera.png delete mode 100644 resources/img/downloads/origin.png delete mode 100644 resources/img/downloads/steam.png delete mode 100644 resources/img/downloads/teamspeak.png delete mode 100644 resources/img/downloads/whatsapp.png create mode 100644 resources/img/spacecraft.png diff --git a/404.html b/404.html index af49e9d..c1594c9 100644 --- a/404.html +++ b/404.html @@ -15,18 +15,11 @@ -
-
- -

Error: 404
You are trying to acces a page that doesn't exist

-

Click here to go back

- +
+

404.


+

That's an error.

+

Click here to go back

-
diff --git a/css.css b/css.css index 924dc2c..7e533f9 100644 --- a/css.css +++ b/css.css @@ -37,6 +37,7 @@ svg { footer { background-color: black; display: flex!important; + height: 20rem; font-family: 'Open Sans', sans-serif; } footer div { @@ -54,6 +55,12 @@ footer ul { footer li { margin-top: 1rem; } +footer p { + position: absolute; + font-size: 13px; + bottom: -19rem; + left: 1rem; +} /* Mobile support */ @viewport { width: device-width; @@ -73,10 +80,12 @@ footer li { } footer { float: left; - display: block!important; width: 100%; } footer div { - margin: 3rem 0 1rem 2rem!important; + margin: 3rem 0 1rem 4rem!important; + } + footer p { + bottom: -10rem!important; } } diff --git a/downloads/downloads.css b/downloads/downloads.css deleted file mode 100644 index c508d8a..0000000 --- a/downloads/downloads.css +++ /dev/null @@ -1,46 +0,0 @@ -@media screen and (min-width:0px) and (max-width:1020px) { - .downloadbox { - width: 93%!important; - margin: 25px 0 0 1rem!important; - padding: 1rem; - } - .headerBox { - width: 93%!important; - } -} -/* Headers */ -#livesearch { - background-color: #ededed; - border: 2px #ededed solid; - padding: 1rem; - outline: none; - height: 3.5rem; - font-size: 1.2rem; - border-radius: 2rem; - margin: 4rem 0 -1rem 1rem; - width: 98%; - display: block; - transition: border .4s; -} -#livesearch:hover, #livesearch:focus { - border: #4c8a80 2px solid; -} -/* Classes for blocks */ -.headerBox { - width: 94%; - height: 5rem; - padding: 1rem; - margin: 1.5rem 0 0 1rem; -} -.downloadbox { - width: 18rem; - padding: .9rem; - max-height: 6rem; - margin: 1.5rem 0 0 1.5rem; - display: inline-block; -} -.img { - width: 3rem; - height: 3rem; - margin-left: 1rem; -} diff --git a/downloads/downloads.json.js b/downloads/downloads.json.js deleted file mode 100644 index 123b680..0000000 --- a/downloads/downloads.json.js +++ /dev/null @@ -1,66 +0,0 @@ -Downloads = [ - { - catagory: "Browsers", - content: [ - { - name: "Chrome", - href: "https://www.google.com/intl/nl/chrome/", - }, - { - name: "Firefox", - href: "https://www.mozilla.org/nl/firefox/download/thanks/", - }, - { - name: "Opera", - href: "https://www.opera.com/computer/thanks?ni=stable&os=windows" - }, - { - name: "Brave", - href: "https://laptop-updates.brave.com/download/BRK107" - }, - ] - }, - { - catagory: "Games", - content: [ - { - name: "Steam", - href: "https://steamcdn-a.akamaihd.net/client/installer/SteamSetup.exe", - }, - { - name: "Minecraft", - href: "https://my.minecraft.net/store/minecraft/" - }, - { - name: "Origin", - href: "https://www.dm.origin.com/download" - }, - ] - }, - { - catagory: "Communication", - content: [ - { - name: "Discord", - href: "https://discordapp.com/api/download?platform=win" - }, - { - name: "Teamspeak", - href: "https://www.teamspeak.com/en/downloads/" - }, - { - name: "WhatsApp", - href: "https://www.whatsapp.com/download/" - }, - ] - }, - { - catagory: "File managament", - content: [ - { - name: "7-Zip", - href: "" - } - ] - } -] diff --git a/downloads/index.html b/downloads/index.html deleted file mode 100644 index 67764bf..0000000 --- a/downloads/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - Downloads - - - - -
- - - - - - - - - - diff --git a/downloads/insertDownloads.js b/downloads/insertDownloads.js deleted file mode 100644 index 1008cec..0000000 --- a/downloads/insertDownloads.js +++ /dev/null @@ -1,31 +0,0 @@ -var c = document.createElement.bind(document); -var d = document.getElementById.bind(document); - -// Create downloads -Downloads.forEach(i=>{ - var h2 = c("h2") - h2.innerHTML = i.catagory - var headerDiv = c("div") - headerDiv.className = "box headerBox" - headerDiv.appendChild(h2) - $('body').append(headerDiv) - if (typeof i.content == "object") { - i.content.forEach(d=>{ - var downloadDiv = c("div") - downloadDiv.className = "box downloadbox" - var a = c("a") - a.href = d.href - a.target = "_blank" - var button = c("button") - button.className = "btn btn-secondary" - button.innerHTML = "Download " + d.name - var img = c("img") - img.src = "/resources/img/downloads/" + d.name + ".png" - img.alt = "" - img.className = "img" - a.appendChild(button) - $(downloadDiv).append(a, img) - $('body').append(downloadDiv) - }) - } - }) diff --git a/index.html b/index.html index 6f30276..3b44e60 100644 --- a/index.html +++ b/index.html @@ -72,6 +72,7 @@