From 29a4873e7da43d5886dd885f5d6e6e4b0a7bd60d Mon Sep 17 00:00:00 2001 From: Guuq <50501321+Guuq@users.noreply.github.com> Date: Sun, 10 Nov 2019 14:48:32 +0100 Subject: [PATCH] 10-11 #1 --- canvas/index.html | 1 + color/index.html | 2 + contact/index.html | 9 +++++ css.css | 61 ++++++++++++------------------ downloads/index.html | 1 + index.html | 73 ++++++++++++++++++++---------------- js.js | 47 +++++++++++++++++------ resources/css/cssall.css | 4 ++ resources/css/navbar.css | 18 ++++----- resources/css/shortcuts.css | 26 +++++-------- resources/js/insertNavbar.js | 4 +- resources/js/navbar.json.js | 16 +++++--- 12 files changed, 147 insertions(+), 115 deletions(-) diff --git a/canvas/index.html b/canvas/index.html index 42036ab..5ce1c18 100644 --- a/canvas/index.html +++ b/canvas/index.html @@ -19,6 +19,7 @@ + diff --git a/color/index.html b/color/index.html index 90df476..31a92f5 100644 --- a/color/index.html +++ b/color/index.html @@ -12,9 +12,11 @@ Color + + diff --git a/contact/index.html b/contact/index.html index 3b43ef2..641d5d6 100644 --- a/contact/index.html +++ b/contact/index.html @@ -18,8 +18,17 @@ + + + diff --git a/css.css b/css.css index af7de02..abaa0db 100644 --- a/css.css +++ b/css.css @@ -10,11 +10,11 @@ } } /* Main CSS */ -/* Header */ -header { - margin-top: 6rem; - color: white; - text-shadow: 2px 2px #363840; +aside { + float: left; + margin: 3rem 0 0 1rem; + display: inline-block; + width: 36%; } /* Google search */ #googleSearchBar { @@ -38,14 +38,14 @@ header { opacity: 0; top: 0px!important; } +/* Welcome */ +#welcome { + padding: 1rem; +} /* Clock */ #timeBox { - margin-top: 3rem; - display: inline-block; - margin-left: 1rem; - float: left; + margin-top: 2rem; padding: 1rem; - width: 36%; } .time { display: inline-block; @@ -55,47 +55,32 @@ header { font-size: 150%; } /* Footer */ -#footer { - margin-left: calc(50% - 45rem); - margin-top: 2rem; - height: 12rem; - display: inline-block; - margin-bottom: 2rem; -} -.footerBox::-webkit-scrollbar { +footer { + margin-top: 1rem; + float: left; + display: flex!important; + align-items: stretch; +} +footer div::-webkit-scrollbar { display: none; } -.footerBox { - height: 13rem; - display: inline-block; - float: left; +footer div { + flex-grow: 1; padding: 1rem; - margin-left: 2rem; + margin: 1rem; overflow: scroll; overflow-x: hidden; } /* Info blocks */ -#info { - width: 27rem; -} -#feedbackBox { - font-size: 1rem; - width: 27rem; -} -#feedbackTextarea { +footer div:nth-of-type(2) textarea { width: 98%; margin-top: 8px; height: 6rem; } -#feedbackSubmitButton { +footer div:nth-of-type(2) button { width: 98%; margin-top: 4px; } -#links { - width: 27rem; - padding: 1rem; - font-size: 130%; -} -#links a button { +footer div:nth-of-type(3) a button { margin-bottom: 5px; } diff --git a/downloads/index.html b/downloads/index.html index 96bae9e..4a61bef 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -22,6 +22,7 @@ + diff --git a/index.html b/index.html index 32545af..fa91374 100644 --- a/index.html +++ b/index.html @@ -18,43 +18,50 @@ - - + + - -
-


-

-
+ + - +
-
+

Youtube

 -
+

Magister

 -
+

Onedrive

 -
+

Codepanta

 -
+

Reddit

 -
+

Spotify

 -
+

W3Schools

 -
+

Maps

 -
+

Translate

 @@ -62,26 +69,26 @@
-