14-11 #1

css.css

@@ -68,15 +68,9 @@ footer ul {
   margin-top: 20px;
   padding: 0;
 }
-footer a {
-  transition: color .5s;
-}
 footer li {
   margin-top: 1rem;
 }
-footer a:hover {
-  color: gray!important;
-}
 /* Mobile support */
 @viewport {
   width: device-width;

index.html

@@ -82,7 +82,7 @@
 			<ul>
 				<li><a href="https://samtaen.ml">Sam Taen</a></li>
 				<li><a href="http://jonathanbos.nl">Jonathan Bos</a></li>
-				<li><a href=""></a></li>
+				<li><a href="https://instagram.com/gerda.6">Daniels insta</a></li>
 			</ul>
 		</div>
 		<div>

js.js

@@ -2,53 +2,6 @@ var d = document.getElementById.bind(document);
 var c = document.createElement.bind(document);
 var q = document.querySelector.bind(document);
 
-// Google Search
-d("googleSearchBar").addEventListener("keyup",searchGoogleEnter)
-function searchGoogleEnter(key) {
-  if(key.key == "Enter") {
-    var search = d("googleSearchBar").value;
-    var containsDot = search.indexOf(".");
-    if (search !== "") {
-      if (containsDot > -1) {
-        open("http://" + search);
-      }
-      else {
-        open("https://www.google.com/search?q=" + search);
-      }
-    }
-  }
-  if (key.key == "Escape") {
-    closeSearch()
-  }
-}
-
-addEventListener("keyup",showSearch)
-function showSearch(e) {
-  if (e.target !== document.body || !d("addShortcutMenu").classList.contains("hidden")) {
-    return
-  }
-  var open = !d("googleSearchBar").classList.contains("searchMove")
-  if (open && !d("googleSearchBar").value || e.key == "Escape" ) {
-    closeSearch();
-  }
-  else {
-    openSearch();
-    d("googleSearchBar").value = d("googleSearchBar").value + e.key
-  }
-}
-
-function closeSearch() {
-  $("#opacityMenu").addClass("lowerIndex")
-  d("googleSearchBar").blur()
-  d("googleSearchBar").classList.add("searchMove")
-}
-
-function openSearch(e) {
-  $("#opacityMenu").removeClass("lowerIndex")
-  d("googleSearchBar").classList.remove("searchMove")
-  d("googleSearchBar").focus()
-}
-
 // Clock
 function showTime() {
   var date = new Date()

resources/css/cssall.css

@@ -37,6 +37,10 @@ body {
 a {
   text-decoration: none!important;
   color: white!important;
+  transition: color .4s;
+}
+a:hover {
+  color: gray!important;
 }
 /* Standard block styling */
 .box {

resources/css/shortcuts.css

@@ -9,15 +9,18 @@
 section span button {
   margin: 0 0 1rem 1rem;
   width: 12rem;
+  max-height: 5.3rem;
   padding: 1rem;
   color: white;
   background-color: #363840;
   border: #363840 2px solid;
   border-radius: .5rem;
   display: inline-block;
-  cursor: pointer;
   transition: background-color .5s, border .5s;
 }
+section span button::-webkit-scrollbar {
+  display: hidden;
+}
 section span button:hover {
   background-color: #3d3e47;
   border-color: #3d3e47;

resources/js/insertNavbar.js

@@ -10,6 +10,48 @@ navbarList.className = "navbarList"
 navigation.appendChild(navbarList)
 document.body.appendChild(navigation)
 
+// Search
+d("googleSearchBar").addEventListener("keyup",searchGoogleEnter)
+function searchGoogleEnter(key) {
+  if(key.key == "Enter") {
+    var search = d("googleSearchBar").value;
+    var containsDot = search.indexOf(".");
+    if (search !== "") {
+      if (containsDot > -1) {
+        open("http://" + search);
+      }
+      else {
+        open("https://www.google.com/search?q=" + search);
+      }
+    }
+  }
+  if (key.key == "Escape") {
+    closeSearch()
+  }
+}
+
+function showSearch() {
+  var open = !d("googleSearchBar").classList.contains("searchMove")
+  if (open) {
+    closeSearch();
+  }
+  else {
+    openSearch();
+  }
+}
+
+function closeSearch() {
+  $("#opacityMenu").addClass("lowerIndex")
+  d("googleSearchBar").blur()
+  d("googleSearchBar").classList.add("searchMove")
+}
+
+function openSearch(e) {
+  $("#opacityMenu").removeClass("lowerIndex")
+  d("googleSearchBar").classList.remove("searchMove")
+  d("googleSearchBar").focus()
+}
+
 // Create Navbar
 Navbar.forEach(i=>{
   var navList = c("li")
@@ -26,6 +68,9 @@ Navbar.forEach(i=>{
   if (i.desc) {
     navButton.title = i.desc
   }
+  if (i.func) {
+    navButton.setAttribute('onclick',i.func)
+  }
   navList.appendChild(navButton)
   var dropdownList = c("ul")
     dropdownList.className = "dropdownList"

resources/js/navbar.json.js

@@ -1,16 +1,16 @@
 Navbar = [
+  {
+    name: "Search",
+    desc: "Zoek iets op",
+    icon: "fas fa-search",
+    func: "showSearch()"
+  },
   {
     name: "Home",
     desc: "Ga naar de homepagina",
     link: "/",
     icon: "fas fa-home"
   },
-  {
-    name: "Downloads",
-    desc: "Handige downloads",
-    link: "/downloads",
-    icon: "fas fa-download"
-  },
   {
     name: "Contact",
     desc: "Neem contact met mij op",

resources/js/shortcuts.js

@@ -44,17 +44,13 @@ function createShortcut(shortcutObj) {
     }
     var obj = JSON.stringify(data)
     ls.setItem("shortcuts", obj)
-    var shortcut = c("a")
-    shortcut.href = shortcutLink
-    shortcut.alt = " "
-    shortcut.target = "_blank"
-    shortcut.innerHTML = shortcutName
     var shortcutButton = c("button")
+    shortcutButton.onclick = function() { window.open(shortcutLink); }
+    shortcutButton.innerHTML = shortcutName
     var shortcutImage = c("img")
     shortcutImage.src = "/resources/img/shortcut.png"
     $("#shortcuts").append(shortcutButton);
-    $(shortcutButton).append(shortcut);
-    $(shortcut).prepend(shortcutImage);
+    $(shortcutButton).prepend(shortcutImage);
     $(".inputMenu").val('')
     closeMenu();
   }