Fix header

stvncode · stvncode · commit 9f07278e42be · 2025-10-24T08:40:59.000+02:00
diff --git a/src-11ty/_includes/base.html b/src-11ty/_includes/base.html
@@ -14,6 +14,7 @@
     />
     {% if additionalScripts %}{{ additionalScripts }}{% endif %}
     <script type="module" src="/src/utils/dark-mode.ts"></script>
+    <script type="module" src="/src/components/app-header.ts"></script>
     <style>
       @import url('/src/styles/shoelace.css');
       @import url('/src/styles/theme.css');
@@ -23,6 +24,7 @@
     </style>
   </head>
   <body class="wa-palette-shoelace wa-theme-shoelace">
+    <app-header></app-header>
     {{ content }}
   </body>
 </html>
diff --git a/src-11ty/_includes/home.html b/src-11ty/_includes/home.html
@@ -0,0 +1,28 @@
+{% capture full_title -%} {%- if title -%} {{ title }} – Device Toolbox {%- else
+-%} Device Toolbox {%- endif -%} {%- endcapture %}
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>{{ full_title }}</title>
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <meta name="description" content="{{ description }}" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link
+      rel="stylesheet"
+      href="https://early.webawesome.com/webawesome@3.0.0-beta.6/dist/styles/webawesome.css"
+    />
+    {% if additionalScripts %}{{ additionalScripts }}{% endif %}
+    <script type="module" src="/src/utils/dark-mode.ts"></script>
+    <style>
+      @import url('/src/styles/shoelace.css');
+      @import url('/src/styles/theme.css');
+      body {
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body class="wa-palette-shoelace wa-theme-shoelace">
+    {{ content }}
+  </body>
+</html>
diff --git a/src-11ty/home-assistant-connect-zwa-2/index.njk b/src-11ty/home-assistant-connect-zwa-2/index.njk
@@ -6,7 +6,5 @@ permalink: /home-assistant-connect-zwa-2/index.html
 ---
 
 <script type="module" src="/src/pages/zwa2-details.ts"></script>
-<script type="module" src="/src/components/app-header.ts"></script>
 
-<app-header></app-header>
 <zwa2-details></zwa2-details>
diff --git a/src-11ty/home-assistant-connect-zwa-2/install-portable.njk b/src-11ty/home-assistant-connect-zwa-2/install-portable.njk
@@ -5,14 +5,12 @@ description: Install portable Z-Wave firmware on your Home Assistant Connect ZWA
 permalink: /home-assistant-connect-zwa-2/install-portable/index.html
 ---
 
-<script type="module" src="/src/components/app-header.ts"></script>
 <script type="module" src="/src/pages/zwa2-install-portable.ts"></script>
 <script
   type="module"
   src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-esphome-firmware.js"
 ></script>
 
-<app-header></app-header>
 <zwa2-install-portable></zwa2-install-portable>
 
 <div class="installer-wrapper" id="installer-container">
diff --git a/src-11ty/home-assistant-connect-zwa-2/install.njk b/src-11ty/home-assistant-connect-zwa-2/install.njk
@@ -7,7 +7,6 @@ additionalScripts: |
   <script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-esp-bridge-firmware.js"></script>
 ---
 
-<script type="module" src="/src/components/app-header.ts"></script>
 <script type="module" src="/src/pages/zwa2-install-original.ts"></script>
 
 <style>
@@ -61,7 +60,6 @@ additionalScripts: |
   }
 </style>
 
-<app-header></app-header>
 <zwa2-install-original></zwa2-install-original>
 
 <div class="installer-wrapper" id="installer-container">
diff --git a/src-11ty/home-assistant-connect-zwa-2/use-poe.njk b/src-11ty/home-assistant-connect-zwa-2/use-poe.njk
@@ -5,14 +5,12 @@ description: Connect your ZWA-2 via PoE for optimal placement
 permalink: /home-assistant-connect-zwa-2/use-poe/index.html
 ---
 
-<script type="module" src="/src/components/app-header.ts"></script>
 <script type="module" src="/src/pages/zwa2-install-poe.ts"></script>
 <script
   type="module"
   src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-esp-bridge-firmware.js"
 ></script>
 
-<app-header></app-header>
 <zwa2-install-poe></zwa2-install-poe>
 
 <div class="installer-wrapper" id="installer-container">
diff --git a/src-11ty/improv.njk b/src-11ty/improv.njk
@@ -6,7 +6,5 @@ permalink: /improv.html
 ---
 
 <script type="module" src="/src/pages/improv-details.ts"></script>
-<script type="module" src="/src/components/app-header.ts"></script>
 
-<app-header></app-header>
 <improv-details></improv-details>
diff --git a/src-11ty/index.njk b/src-11ty/index.njk
@@ -1,5 +1,5 @@
 ---
-layout: base.html
+layout: home.html
 title: Device Toolbox
 description: Flash firmware, configure devices, and manage your smart home hardware directly from your browser
 permalink: /index.html
diff --git a/src-11ty/vpe/index.njk b/src-11ty/vpe/index.njk
@@ -6,7 +6,5 @@ permalink: /vpe/index.html
 ---
 
 <script type="module" src="/src/pages/vpe-details.ts"></script>
-<script type="module" src="/src/components/app-header.ts"></script>
 
-<app-header></app-header>
 <vpe-details></vpe-details>
diff --git a/src-11ty/vpe/install.njk b/src-11ty/vpe/install.njk
@@ -8,7 +8,5 @@ additionalScripts: |
 ---
 
 <script type="module" src="/src/pages/vpe-install.ts"></script>
-<script type="module" src="/src/components/app-header.ts"></script>
 
-<app-header></app-header>
 <vpe-install></vpe-install>
diff --git a/src-11ty/zbt1/index.njk b/src-11ty/zbt1/index.njk
@@ -6,7 +6,5 @@ permalink: /zbt1/index.html
 ---
 
 <script type="module" src="/src/pages/zbt1-details.ts"></script>
-<script type="module" src="/src/components/app-header.ts"></script>
 
-<app-header></app-header>
 <zbt1-details></zbt1-details>
diff --git a/src-11ty/zbt1/install.njk b/src-11ty/zbt1/install.njk
@@ -7,7 +7,6 @@ additionalScripts: |
   <script type="module" src="https://home-assistant.github.io/zwa2-toolbox/standalone/install-esp-bridge-firmware.js"></script>
 ---
 
-<script type="module" src="/src/components/app-header.ts"></script>
 <script type="module" src="/src/pages/zbt1-install.ts"></script>
 
 <style>
@@ -61,5 +60,4 @@ additionalScripts: |
   }
 </style>
 
-<app-header></app-header>
 <zbt1-install></zbt1-install>
diff --git a/src/components/app-header.ts b/src/components/app-header.ts
@@ -8,7 +8,6 @@ export class AppHeader extends LitElement {
     :host {
       display: block;
       background: var(--app-bg-header);
-      border-bottom: 1px solid var(--app-border);
       position: sticky;
       top: 0;
       z-index: 100;
@@ -19,6 +18,7 @@ export class AppHeader extends LitElement {
       align-items: center;
       justify-content: space-between;
       padding: 0 20px;
+      border-bottom: 1px solid var(--app-border);
       height: 64px;
       max-width: 1200px;
       margin: 0 auto;
diff --git a/src/main-app.ts b/src/main-app.ts
@@ -1,8 +1,6 @@
 import { LitElement, css, html } from 'lit';
 import { customElement } from 'lit/decorators.js';
 
-import './components/app-header.js';
-
 import './pages/home-page.js';
 @customElement('main-app')
 export class MainApp extends LitElement {
@@ -16,11 +14,6 @@ export class MainApp extends LitElement {
   `;
 
   render() {
-    return html`
-      <div>
-        <app-header></app-header>
-        <home-page></home-page>
-      </div>
-    `;
+    return html` <home-page></home-page> `;
   }
 }
