resolve conflicts

This commit is contained in:
2025-06-19 07:28:29 +02:00
403 changed files with 100820 additions and 3088 deletions

View File

@@ -1,6 +1,15 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";
@theme {
--color-co-blue: #00727e;
--color-co-lightblue: #907eff;
--color-co-red: #de1581;
--color-co-green: #6cc11f;
--color-co-yellow: #ffdd00;
--color-co-orange: #ff5300;
--radius-co: 40%;
}
@font-face {
font-family: "Manometer";
@@ -16,4 +25,7 @@
html {
font-family: Bitter, serif;
}
}
input {
padding: 2px;
}
}

View File

@@ -1,6 +1,11 @@
import '@kingshott/iodine';
import Alpine from 'alpinejs'
import { Protocol } from "pmtiles";
import { layers, namedFlavor } from '@protomaps/basemaps';
window.Alpine = Alpine
Alpine.start()
Alpine.start()
let protocol = new Protocol();
maplibregl.addProtocol("pmtiles",protocol.tile);