From f19840d9d295abd0aa0d79619fd2627204355206 Mon Sep 17 00:00:00 2001
From: suroh <mx@suroh.tk>
Date: Sat, 28 Oct 2023 23:10:39 +0200
Subject: [PATCH] rebased webc to main

---
 _includes/components/nav-primary.webc | 17 ++++++++++-
 assets/css/main.css                   | 42 ++++-----------------------
 package.json                          |  5 ----
 3 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/_includes/components/nav-primary.webc b/_includes/components/nav-primary.webc
index 3139081..6709885 100644
--- a/_includes/components/nav-primary.webc
+++ b/_includes/components/nav-primary.webc
@@ -36,10 +36,17 @@
   display: grid;
   grid-template-columns: auto 1fr auto;
   gap: 1em 0.25em;
-  margin-block: 0.5em 0.5em;
+  margin-block: 2em 0.5em;
   margin-inline: var(--page-margin-inline);
 }
 
+@media (max-width: 780px) {
+  :host {
+    margin-block: 1em 0.5em;
+    margin-inline: calc(var(--page-margin-inline) * 0.5);
+  }
+}
+
 /* => CONTAINER */
 nav {
   display: grid;
@@ -87,6 +94,14 @@ nav-link[data-name="<~"] {
   margin: 0;
 }
 
+@media (max-width: 780px) {
+  #sub {
+    grid-column: 1 / -1;
+    font-size: 1.25em;
+  }
+}
+
+
 #sub > ul {
   grid-row: 1 / span 1;
   grid-column: 1 / span 1;
diff --git a/assets/css/main.css b/assets/css/main.css
index 4b81cdd..27e97aa 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -41,6 +41,7 @@ a, a:visited {
 img {
   max-width: 100%;
   height: auto;
+  outline: 1px dotted var(--neutral-900);
 }
 
 hr {
@@ -63,7 +64,6 @@ ul {
 
 li {
   padding: 0.2em 0 0.2em 1em;
-  text-indent: -0.5em;
 }
 
 li:before {
@@ -128,8 +128,8 @@ nav#sub > ul > li {
 }
 
 nav#sub > ul > li:before {
-  content: "";
-  padding-right: 16px;
+  content: '';
+  padding: unset;
 }
 
 nav#sub > ul > li:hover {
@@ -209,20 +209,6 @@ section.page h1 {
     padding: 0;
   }
 
-  /* --> NAVIGATION <-- */
-  nav {
-    margin: 23px 0px 8px;
-    font-size: 1.5em;
-  }
-
-  nav>span {
-    margin-right: 8px;
-  }
-
-  nav>span.active::after {
-    margin-left: 8px;
-  }
-
   /* --> MAINPAGE CONSTRUCTION <-- */
   section ul.subMenu {
     font-size: 1.5em;
@@ -270,29 +256,11 @@ section.page h1 {
     padding: 0;
   }
 
-  /* --> NAVIGATION <-- */
-  nav {
-    margin: 23px 0px 8px;
-    font-size: 1.75em;
-  }
-
-  nav>span {
-    margin-right: 8px;
-  }
-
-  nav>span.active::after {
-    position: relative;
-    top: 2px;
-    margin-left: 8px;
-  }
-
-  /* --> MAINPAGE CONSTRUCTION <-- */
-
   /* --> SUBCONTENT CONSTRUCTION <-- */
   section.page {
     display: inherit;
-    max-width: 650px;
-    grid-gap: 24px;
+    grid-gap: 1em;
+    margin-inline: calc(var(--page-margin-inline) * 0.5);
   }
 
   section.page h1 {
diff --git a/package.json b/package.json
index 7c73a63..6ec8db4 100644
--- a/package.json
+++ b/package.json
@@ -10,13 +10,8 @@
     "markdown-it-link-attributes": "^4.0.1"
   },
   "scripts": {
-<<<<<<< HEAD
-    "dev": "eleventy --serve --incremental",
-    "test": "echo \"Error: no test specified\" && exit 1"
-=======
     "dev": "eleventy --serve",
     "build": "eleventy"
->>>>>>> main
   },
   "repository": {
     "type": "git",