From 8f3d1933dc00bd1d1dffd2bd2230bae6c4a5e148 Mon Sep 17 00:00:00 2001
From: Guuq <50501321+Guuq@users.noreply.github.com>
Date: Wed, 13 Nov 2019 15:00:36 +0100
Subject: [PATCH] 13-11 #1
---
contact/index.html | 13 -------------
css.css | 37 +++++++++++++++++++++---------------
index.html | 8 ++++----
js.js | 4 ++--
resources/css/navbar.css | 3 ++-
resources/css/shortcuts.css | 11 ++++++-----
resources/js/insertNavbar.js | 2 +-
7 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/contact/index.html b/contact/index.html
index 641d5d6..fd3395f 100644
--- a/contact/index.html
+++ b/contact/index.html
@@ -13,19 +13,6 @@
-
-
-
-
- - Coffee
- - Tea
-
-
- Milk
-
-
-
diff --git a/css.css b/css.css
index abaa0db..3251de4 100644
--- a/css.css
+++ b/css.css
@@ -1,20 +1,9 @@
-/* Mobile support */
-@viewport {
- width: device-width;
- zoom: 1.0;
-}
-/* Support for normal mobile devices */
-@media screen and (min-width:0px) and (max-width:960px) {
- #timeBox {
- width: 94%!important
- }
-}
/* Main CSS */
aside {
float: left;
- margin: 3rem 0 0 1rem;
display: inline-block;
width: 36%;
+ background-color: #454752;
}
/* Google search */
#googleSearchBar {
@@ -41,10 +30,11 @@ aside {
/* Welcome */
#welcome {
padding: 1rem;
+ margin-left: 1rem;
}
/* Clock */
#timeBox {
- margin-top: 2rem;
+ margin: 2rem 0 0 1rem;
padding: 1rem;
}
.time {
@@ -59,13 +49,11 @@ footer {
margin-top: 1rem;
float: left;
display: flex!important;
- align-items: stretch;
}
footer div::-webkit-scrollbar {
display: none;
}
footer div {
- flex-grow: 1;
padding: 1rem;
margin: 1rem;
overflow: scroll;
@@ -84,3 +72,22 @@ footer div:nth-of-type(2) button {
footer div:nth-of-type(3) a button {
margin-bottom: 5px;
}
+/* Mobile support */
+@viewport {
+ width: device-width;
+ zoom: 1.0;
+}
+/* Support for normal mobile devices */
+@media screen and (min-width:0px) and (max-width:1000px) {
+ aside {
+ width: 96%!important;
+ }
+ footer {
+ width: 98%!important;
+ display: block!important;
+ margin: 0!important;
+ }
+ footer div {
+ margin-top: 2rem!important;
+ }
+}
diff --git a/index.html b/index.html
index fa91374..86db1d7 100644
--- a/index.html
+++ b/index.html
@@ -23,13 +23,13 @@