diff --git a/contact/index.html b/contact/index.html index 34d45f1..61718bd 100644 --- a/contact/index.html +++ b/contact/index.html @@ -1,42 +1,44 @@ + - - - - - - - - - - Contact + + + + + + + + + + Contact - - -
-

Contact opnemen?

- -
-
-

Neem contact met mij op

- - - -
- - - - + +
+

Contact opnemen?

+
+
+

Neem contact met mij op

+ + + +
+ + + + diff --git a/index.html b/index.html index cfdd975..1db0f94 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -140,3 +141,6 @@ +======= +Home

uren

:minuten

:seconden


datum


Peer Droog

"Een goede en overzichtelijk website met een handige klok, wel mist er de mogelijkheid om je eigen plaatjes toe te voegen aan de shortcuts."

User

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam a risus eu ex sagittis interdum ac ac odio. Proin eleifend turpis a aliquam.

+>>>>>>> f3747cf0f10d544e2a27606d8adddc3b21a8992a diff --git a/playground/css.css b/playground/css.css index 6c4c3dd..84ee63a 100644 --- a/playground/css.css +++ b/playground/css.css @@ -44,6 +44,7 @@ #htmlOutput { background-color: white; height: 100%; + border: 0; width: 50%; } @media screen and (min-width:0px) and (max-width:1079px) { diff --git a/playground/index.html b/playground/index.html index b46410e..bccb4e2 100644 --- a/playground/index.html +++ b/playground/index.html @@ -1,40 +1 @@ - - - - - - - Playground - - - - - - - - - -
-
-
- - - - - - - - -
-
- -
- - - - - - - - - + Playground
diff --git a/resources/css/cssall.css b/resources/css/cssall.css index 38142f3..b879eea 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -20,27 +20,24 @@ body { } /* Search */ .searchBar { - background-color: #ededed; - border: #ededed 2px solid; - position: fixed; + background-color: #2d2d33; + border: #2d2d33 2px solid; + position: absolute; + color: white; font-family: 'Open Sans', sans-serif; z-index: 2; - top: 6rem; - left: calc(50% - 48%); - padding: 1rem; - width: 96%; - height: 3rem; - border-radius: 2rem; + right: 2rem; + top: 8px; + padding: 1rem; + width: 20rem; + height: 39px; + border-radius: .5rem; outline: none; - transition: border .4s, opacity .3s, top .3s; + transition: border .4s; } .searchBar:hover, .searchBar:focus { border: #4c8a80 2px solid; } -.searchMove { - opacity: 0; - top: 0px!important; -} /* Scrollbar */ ::-webkit-scrollbar { background-color: #1d1e1e; diff --git a/resources/js/insertNavbar.js b/resources/js/insertNavbar.js index d13bd5a..efb3685 100644 --- a/resources/js/insertNavbar.js +++ b/resources/js/insertNavbar.js @@ -22,10 +22,10 @@ navigation.prepend(hamburger) // Search var search = c("input") -search.className = "searchMove searchBar" +search.className = "searchBar" search.placeholder = "Vul een zoek opdracht of url in" search.type = "text" -document.body.prepend(search) +navigation.appendChild(search) g(".searchBar").addEventListener("keyup",searchEnter) function searchEnter(key) { @@ -46,28 +46,6 @@ function searchEnter(key) { } } -function showSearch() { - var open = !g(".searchBar").classList.contains("searchMove") - if (open) { - closeSearch(); - } - else { - openSearch(); - } -} - -function closeSearch() { - $(".opacityMenu").addClass("lowerIndex") - g(".searchBar").blur() - g(".searchBar").classList.add("searchMove") -} - -function openSearch(e) { - $(".opacityMenu").removeClass("lowerIndex") - g(".searchBar").classList.remove("searchMove") - g(".searchBar").focus() -} - // Create Navbar Navbar.forEach(i=>{ var navList = c("li") @@ -84,9 +62,6 @@ 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" diff --git a/resources/js/navbar.json.js b/resources/js/navbar.json.js index 334f4ac..e34673d 100644 --- a/resources/js/navbar.json.js +++ b/resources/js/navbar.json.js @@ -5,12 +5,6 @@ Navbar = [ link: "/", icon: "fas fa-home" }, - { - name: "Search", - desc: "Zoek iets op", - icon: "fas fa-search", - func: "showSearch()" - }, { name: "Playground", desc: "Test je html live!", diff --git a/vuurjongen-en-watermeisje-4/index.html b/vuurjongen-en-watermeisje-4/index.html index c3d7a31..48896a4 100644 --- a/vuurjongen-en-watermeisje-4/index.html +++ b/vuurjongen-en-watermeisje-4/index.html @@ -1,31 +1 @@ - - - - - - - - - - - - Vuurjongen en Watermeisje - - - - - - - - - - - - + Vuurjongen en Watermeisje