Reduce to one CSS File

3 files changed, 57 insertions, 107 deletions

diff --git a/css/xengineering.css b/css/xengineering.css
index 422f58b..e54061c 100644
--- a/css/xengineering.css
+++ b/css/xengineering.css
@@ -74,6 +74,33 @@ head {
   display: none;  /* do not display anything from the head section */
 }
 
+/* body */
+
+nav {
+	background-color: var(--background-color-dark);
+}
+
+#menu-button {
+  width: 100%;
+  padding-top: 1em;
+  padding-bottom: 1em;
+	margin: 0;
+  text-align: center;
+  color: var(--font-color-light);
+  background-color: var(--background-color-dark);
+}
+
+.menu-anchor {
+  padding-top: 1em;
+  padding-bottom: 1em;
+	padding-left: 0;
+	padding-right: 0;
+	margin: 0;
+  text-align: center;
+  color: var(--font-color-light);
+  background-color: var(--background-color-dark);
+}
+
 main {
   padding-left: 3vw;
   padding-right: 3vw;
@@ -213,9 +240,37 @@ footer {
 
 @media only screen and (min-aspect-ratio: 14/9) {
 
+nav {
+	display: inline-block;
+  height: 100%;
+  width: 15vw;
+  position: fixed;
+	margin 0;
+	padding 0;
+}
+
+#menu-button {
+  display: none;
+}
+
+.menu-anchor {
+  text-align: left;
+	padding-left: 1em;
+	padding-right: 1em;
+}
+
+.menu-anchor:hover {
+  color: black;
+  background-color: lightgray;
+}
+
 main {
-  padding-left: 20vw;
-  padding-right: 20vw;
+	width: auto;
+  margin: 0;
+	margin-left: 15vw;
+	padding: 0;
+	padding-left: 15vw;
+	padding-right: 15vw;
 }
 
 h1 {
diff --git a/css/xengineering_nav_main.css b/css/xengineering_nav_main.css
deleted file mode 100644
index ac0ebe1..0000000
--- a/css/xengineering_nav_main.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-vim: shiftwidth=2 tabstop=2 expandtab
-
-libweb - reusable code for websites
-
-    Copyright (C) 2021  xengineering
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-contact via mail: me@xengineering.eu
-*/
-
-/***************************** DEFAULT / MOBILE *******************************/
-
-nav {
-	background-color: var(--background-color-dark);
-}
-
-#menu-button {
-  width: 100%;
-  padding-top: 1em;
-  padding-bottom: 1em;
-	margin: 0;
-  text-align: center;
-  color: var(--font-color-light);
-  background-color: var(--background-color-dark);
-}
-
-.menu-anchor {
-  padding-top: 1em;
-  padding-bottom: 1em;
-	padding-left: 0;
-	padding-right: 0;
-	margin: 0;
-  text-align: center;
-  color: var(--font-color-light);
-  background-color: var(--background-color-dark);
-}
-
-/******************************************************************************/
-
-
-
-/********************************** TABLET ************************************/
-
-@media only screen and (min-aspect-ratio: 11/12) {
-
-}
-
-/******************************************************************************/
-
-
-
-/********************************* DESKTOP ************************************/
-
-@media only screen and (min-aspect-ratio: 14/9) {
-
-nav {
-	display: inline-block;
-  height: 100%;
-  width: 15vw;
-  position: fixed;
-	margin 0;
-	padding 0;
-}
-
-#menu-button {
-  display: none;
-}
-
-.menu-anchor {
-  text-align: left;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-.menu-anchor:hover {
-  color: black;
-  background-color: lightgray;
-}
-
-main {
-	width: auto;
-  margin: 0;
-	margin-left: 15vw;
-	padding: 0;
-	padding-left: 15vw;
-	padding-right: 15vw;
-}
-
-}
-
-/******************************************************************************/
diff --git a/html/test_nav_main.html b/html/test_nav_main.html
index 1b99eca..7016efc 100644
--- a/html/test_nav_main.html
+++ b/html/test_nav_main.html
@@ -32,7 +32,6 @@ contact via mail: me@xengineering.eu
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<link rel="stylesheet" href="../css/xengineering.css" type="text/css">
-		<link rel="stylesheet" href="../css/xengineering_nav_main.css" type="text/css">
 
 	</head>