Resolve merge conflicts and fix styling issues

- Resolve all merge conflicts from main branch pull
- Fix CSS load order: global stylesheet before page-specific on all pages
- Add navigation.js to impressum.html and datenschutz.html
- Unify nav classes across all pages (nav-tab-links + button-small)
- Add footer styles to global stylesheet
- Remove duplicate landingpage.css (redundant with index.css)
- Fix duplicate head/body tags in event_detail.html
- Merge login.js: keep user auth logic + snackbar support
- Merge index-carousel.js: keep dots + responsive resize handling
This commit is contained in:
Estelle Köhler committed 2026-04-12 10:49:17 +02:00
commit 5ee62ff604
27 files changed
+2823 -356

No files matched your search

+7 -9
View File
@@ -5,24 +5,22 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Event-Overview</title>
<!-- Stylesheet für diese Seite-->
<link rel="stylesheet" href="css/stylesheet_global.css">
<!-- Globales Stylesheet -->
<link rel="stylesheet" href="css/stylesheet_global.css">
<!-- Stylesheet für diese Seite-->
<link rel="stylesheet" href="css/event_overview.css">
<script src="js/navigation.js" defer></script>
</head>
<body>
<!-- Top navigation: global entry points and current page indicator -->
<!-- Top Navigation mit Seitenlinks -->
<header class="top-nav-wrap">
<div class="top-nav">
<a class="brand" href="index.html" aria-label="Zur Startseite">
<img src="assets/logo_invite.svg" alt="Invite Logo">
</a>
<nav class="top-nav-links" aria-label="Hauptnavigation">
<a class="nav-link active" href="event_overview.html" aria-current="page">Event finden</a>
<a class="nav-link" href="event_create.html">Event erstellen</a>
<a class="profile-pill" href="login.html" aria-label="Profil">M</a>
<nav class="nav-tab-links" aria-label="Hauptnavigation">
<a class="button-small" href="login.html" aria-label="Login">Login</a>
</nav>
</div>
</header>