chore: resolve merge conflicts

Added attributes to indicate that div.label is the label for
ul.options-list in the selection component.

README.md

@@ -4,8 +4,4 @@ The frontend of the search engine Seekra.
 
 ## Setup
 
-Please execute the setup script in `scripts/` for your platform when cloning the repository.
+Please execute the setup script in `scripts/` for your platform when cloning the repository.
-
-## Legal
-
-After each update to the dependencies, please run the script `scripts/generate-license-files.js` to regenerate the third-party license files.

scripts/generate-license-files.js

@@ -1,58 +0,0 @@
-#!/usr/bin/env node
-
-/*
-Copyright 2026 Seekra
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import fs from 'node:fs/promises';
-import { generateLicenseFile } from 'generate-license-file';
-
-const packageJson = './package.json';
-const packageJsonBackup = `${packageJson}~`;
-
-await generateLicenseFile(
-    packageJson,
-    'THIRD_PARTY_LICENSES'
-);
-
-const pkg = JSON.parse(
-    await fs.readFile(packageJson, 'utf-8')
-);
-
-await fs.rename(packageJson, packageJsonBackup);
-
-const devPackage = {
-    ...pkg,
-    dependencies: pkg.devDependencies ?? {},
-    devDependencies: {}
-};
-
-/*
-  The file including the dependencies for the current license file has
-  to be always package.json due to a bug of generate-license file. See
-
-    https://github.com/TobyAndToby/generate-license-file/issues/752
-*/
-await fs.writeFile(
-    packageJson,
-    JSON.stringify(devPackage)
-);
-
-await generateLicenseFile(
-    packageJson,
-    './THIRD_PARTY_LICENSES_DEV'
-);
-
-await fs.rename(packageJsonBackup, packageJson);

src/App.vue

@@ -18,40 +18,21 @@ limitations under the License.
 import Navbar from './features/nav/components/Navbar.vue';
 import Footer from './features/footer/components/Footer.vue';
 
-import { updatePageTitle } from './router';
 import { useColorScheme } from './features/colorScheme/composables/useColorScheme';
-import { ref, provide, watch, watchEffect } from 'vue';
+import { ref, provide, watch } from 'vue';
-import { useRoute } from 'vue-router';
-
-const route = useRoute();
 
 const { getColorScheme, updateColorScheme } = useColorScheme();
 const colorScheme = ref(getColorScheme());
 provide('colorScheme', colorScheme);
-watch(colorScheme, (newValue) => {
+watch(colorScheme, val => updateColorScheme(val))
-    updateColorScheme(newValue);
-    document.body.style.setProperty(colorScheme, {
-        auto: 'normal',
-        dark: 'dark',
-        light: 'light'
-    });
-    if (newValue === 'dark') {
-        document.body.classList.add('dark');
-    } else {
-        document.body.classList.remove('dark');
-    }
-    if (newValue === 'auto') {
-        document.body.classList.add('color-scheme-auto');
-    } else {
-        document.body.classList.remove('color-scheme-auto');
-    }
-});
-
-watchEffect(() => updatePageTitle(route));
 </script>
 
 <template>
-    <div id="app-wrapper">
+    <div
+        :style="{ colorScheme: colorScheme === 'auto' ? 'normal' : (colorScheme === 'dark' ? 'dark' : 'light')}"
+        :class="{ dark: colorScheme === 'dark', 'color-scheme-auto': colorScheme === 'auto' }"
+        id="app-wrapper"
+    >
         <Navbar />
 
         <router-view class="main-content" />
@@ -65,11 +46,6 @@ watchEffect(() => updatePageTitle(route));
     --main-content-padding-x: 30px;
     --main-content-padding-y: 40px;
     --main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    background-color: var(--light-bg);
-    color: var(--dark);
 }
 
 .main-content {
@@ -81,4 +57,12 @@ watchEffect(() => updatePageTitle(route));
         --main-content-padding-x: 15px;
     }
 }
+
+#app-wrapper {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: var(--light-bg);
+    color: var(--dark);
+}
 </style>

src/main.js

@@ -31,13 +31,13 @@ import './styles/variables/colors.css';
 (async () => {
     await loadLanguage(fallbackLocale);
     await loadLanguage(getCurrentLanguage());
-    
+
     const pinia = createPinia();
     pinia.use(piniaPluginPersistedstate);
-    
+
     createApp(App)
         .use(router)
         .use(i18n)
         .use(pinia)
         .mount('#app');
-})();
+})();

src/styles/common.css

@@ -15,8 +15,6 @@ limitations under the License.
 */
 
 body {
-    background-color: var(--light-bg);
-    color: var(--dark);
     margin: 0;
     font-size: 16px;
 }

src/styles/variables/colors.css

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-body {
+#app-wrapper {
     --primary-color-l-8:  oklch(0.897 0.202 260);
     --primary-color-l-7:  oklch(0.847 0.202 260);
     --primary-color-l-6:  oklch(0.797 0.202 260);
@@ -87,7 +87,7 @@ body {
 }
 
 @media (prefers-color-scheme: dark) {
-    body.color-scheme-auto {
+    #app-wrapper.color-scheme-auto {
         --dark-l-8:             var(--white-d-8);
         --dark-l-7:             var(--white-d-7);
         --dark-l-6:             var(--white-d-6);
@@ -121,7 +121,7 @@ body {
     }
 }
 
-body.dark {
+#app-wrapper.dark {
     --dark-l-8:             var(--white-d-8);
     --dark-l-7:             var(--white-d-7);
     --dark-l-6:             var(--white-d-6);