From 49a43a3c0f9811307b614d2703d29de1b32e799f Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 13:44:33 +0100 Subject: [PATCH 01/17] Update css.css --- css.css | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/css.css b/css.css index bd9f2b9..747a49f 100644 --- a/css.css +++ b/css.css @@ -3,8 +3,8 @@ section { float: left; display: inline-block; width: 50%; - margin-top: 55px; - height: 95vh; + padding-top: 55px; + height: 100vh; overflow: scroll; overflow-x: hidden; } @@ -12,11 +12,11 @@ section::-webkit-scrollbar { display: none; } svg { - margin-top: 49px; + padding-top: 49px; fill: #454752; stroke-width: 1; stroke: #454752; - height: 95.6vh; + height: 100vh; } /* Clock */ #timeBox { @@ -36,25 +36,29 @@ svg { /* Feedback */ #feedbackContent { background-color: #33353d; + float: left; width: 100%; } .feedback { display: inline-block; padding: 14vh 0 14vh 5%; width: 50%; - height: 100%; + vertical-align: top; } #feedbackOne { border-right: #454752 4px solid; } .user { display: inline-block; - height: 100%; - width: 10rem; + min-width: 8rem; +} +.user h3 { + text-align: center; } .userImg { width: 8rem; height: 8rem; + margin-left: calc(50% - 4rem); margin-bottom: 2rem; } .userFeedback { From 269838d662658848a301ad53cdafdca811fcf617 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 13:46:45 +0100 Subject: [PATCH 02/17] Update shortcuts.css --- resources/css/shortcuts.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/shortcuts.css b/resources/css/shortcuts.css index 7641312..270cf03 100644 --- a/resources/css/shortcuts.css +++ b/resources/css/shortcuts.css @@ -41,7 +41,7 @@ #addShortcutMenu { display: inline-block; z-index: 2; - border-radius: 1rem; + border-radius: .75rem; position: absolute; left: calc(50% - 25rem); height: 27rem; From 4151f672cda8427b26adf9cccee5e94688b0f10e Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 13:49:25 +0100 Subject: [PATCH 03/17] Update index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 712f4b5..cfdd975 100644 --- a/index.html +++ b/index.html @@ -80,9 +80,9 @@
-

Sam Taen

+

User

-

adkjfkldjafkldfjdklfjdklafjdklaadkjfkldjafkldfjdklfjdklafjdklaadkjfkldjafkldfjdklfjdklafjdklaadkjfkldjafkldfjdklfjdklafjdklaadkjfkldjafkldfjdklfjdklafjdkla

+

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

From 2c950e1f8bc1871822e1ea24a7b0f43492b88f49 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 13:58:54 +0100 Subject: [PATCH 04/17] Minified html --- index.html | 143 +---------------------------------------------------- 1 file changed, 1 insertion(+), 142 deletions(-) diff --git a/index.html b/index.html index cfdd975..fae5973 100644 --- a/index.html +++ b/index.html @@ -1,142 +1 @@ - - - - - - - - - - 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.

-
-
- - - - - - - - - - - - - - - - - +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.

From 758da1b9b15d9c6dce4505ac11ec6f21d86740f9 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 14:00:47 +0100 Subject: [PATCH 05/17] Minfied contact html --- contact/index.html | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/contact/index.html b/contact/index.html index 34d45f1..bcb59fd 100644 --- a/contact/index.html +++ b/contact/index.html @@ -1,42 +1 @@ - - - - - - - - - - - - - Contact - - - -
-

Contact opnemen?

- -
-
-

Neem contact met mij op

- - - -
- - - - - - - + Contact

Contact opnemen?

Neem contact met mij op

From d6d4b6452dc5a9728ec8ff81e9c440f7a9c60a68 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 14:01:34 +0100 Subject: [PATCH 06/17] Minfied playground html --- playground/index.html | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) 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
From 9604e43afe7d495456ce8d610982964163b0da07 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Tue, 26 Nov 2019 14:02:31 +0100 Subject: [PATCH 07/17] Minified vuurjongen en watermeisje html --- vuurjongen-en-watermeisje-4/index.html | 32 +------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) 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 From ad9d3aacd0034ab89bba2acf6c2bf06c4b0afdf2 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:37:24 +0100 Subject: [PATCH 08/17] Removed iframe border on playground --- playground/css.css | 1 + 1 file changed, 1 insertion(+) 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) { From c803c7ad5f67fb22f1af681a85e98a4aa30df40e Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:44:15 +0100 Subject: [PATCH 09/17] Removed font-awesome contact card --- contact/index.html | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/contact/index.html b/contact/index.html index bcb59fd..61718bd 100644 --- a/contact/index.html +++ b/contact/index.html @@ -1 +1,44 @@ - Contact

Contact opnemen?

Neem contact met mij op

+ + + + + + + + + + + + + + Contact + + + +
+

Contact opnemen?

+
+
+

Neem contact met mij op

+ + + +
+ + + + + + From 22f42935e634a8b303cf84d4e2e1ef2c28c8bdb4 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:46:14 +0100 Subject: [PATCH 10/17] Removed search from the navbar --- resources/js/navbar.json.js | 6 ------ 1 file changed, 6 deletions(-) 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!", From 555ac8ee203f8c1772568a9e086ddfdb8e72978c Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:50:47 +0100 Subject: [PATCH 11/17] Changed the searchbar --- resources/js/insertNavbar.js | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) 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" From af28b86e00d3f62176e5e5b5a1b259e21517dc97 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:56:24 +0100 Subject: [PATCH 12/17] Changed searchbar --- resources/css/cssall.css | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index 38142f3..dbc61b2 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -20,27 +20,22 @@ body { } /* Search */ .searchBar { - background-color: #ededed; - border: #ededed 2px solid; - position: fixed; + background-color: #1b1b1f; + border: #1b1b1f 2px solid; + position: relative; 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; + padding: 1rem; + width: 12rem; + height: 3rem; + 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; From 432ff733c2feff4afb550a739b8143ace37b0b2e Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 13:58:39 +0100 Subject: [PATCH 13/17] Fixed searchbar --- resources/css/cssall.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index dbc61b2..8b71c3a 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -22,7 +22,8 @@ body { .searchBar { background-color: #1b1b1f; border: #1b1b1f 2px solid; - position: relative; + position: absolute; + color: white; font-family: 'Open Sans', sans-serif; z-index: 2; right: 2rem; From bb85dae34443dbbdf9833795ba717388db48d00c Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:00:06 +0100 Subject: [PATCH 14/17] Update searchbar --- resources/css/cssall.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index 8b71c3a..d358034 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -27,9 +27,10 @@ body { font-family: 'Open Sans', sans-serif; z-index: 2; right: 2rem; + top: 8px; padding: 1rem; width: 12rem; - height: 3rem; + height: 39px; border-radius: .5rem; outline: none; transition: border .4s; From efbafd3c0802620e480c1e93f3a3a5d29ce04ecc Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:00:58 +0100 Subject: [PATCH 15/17] Changed the width of the searchbar --- resources/css/cssall.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index d358034..9c70769 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -29,7 +29,7 @@ body { right: 2rem; top: 8px; padding: 1rem; - width: 12rem; + width: 25rem; height: 39px; border-radius: .5rem; outline: none; From f34354d9ba9bb139593c5cd3500058f922c646b3 Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:02:27 +0100 Subject: [PATCH 16/17] Decreased the width of the searchbar --- resources/css/cssall.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index 9c70769..24796fe 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -29,7 +29,7 @@ body { right: 2rem; top: 8px; padding: 1rem; - width: 25rem; + width: 20rem; height: 39px; border-radius: .5rem; outline: none; From f3747cf0f10d544e2a27606d8adddc3b21a8992a Mon Sep 17 00:00:00 2001 From: Guus van Meerveld <57101832+Guusvanmeerveld@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:04:39 +0100 Subject: [PATCH 17/17] Changed the color of the searchbar --- resources/css/cssall.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/css/cssall.css b/resources/css/cssall.css index 24796fe..b879eea 100644 --- a/resources/css/cssall.css +++ b/resources/css/cssall.css @@ -20,8 +20,8 @@ body { } /* Search */ .searchBar { - background-color: #1b1b1f; - border: #1b1b1f 2px solid; + background-color: #2d2d33; + border: #2d2d33 2px solid; position: absolute; color: white; font-family: 'Open Sans', sans-serif;