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

+11 -10
View File
@@ -9,18 +9,19 @@
<link rel="stylesheet" href="css/stylesheet_global.css">
<!-- Stylesheet für diese Seite -->
<link rel="stylesheet" href="css/login_signup.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="Invité">
</a>
<nav class="top-nav-links" aria-label="Hauptnavigation">
<a class="nav-link nav-link--login" href="login.html">Anmelden</a>
<nav class="nav-tab-links" aria-label="Hauptnavigation">
<a class="button-small auth-nav-button auth-nav-button--active" href="login.html" aria-label="Login" aria-current="page">Login</a>
<a class="button-small auth-nav-button auth-nav-button--default" href="signup.html" aria-label="Signup">Signup</a>
</nav>
</div>
</header>
@@ -33,25 +34,25 @@
</div>
<div class="form-section">
<h1>Willkommen zurück</h1>
<h1>Login</h1>
<form id="loginForm">
<div class="form-group">
<label for="email">Deine E-Mail Adresse *</label>
<label for="email">E-Mail</label>
<input type="email" id="email" name="email" required placeholder="deine.email@example.com">
<div class="error-message" id="emailError">Bitte gib eine gültige E-Mail Adresse ein.</div>
</div>
<div class="form-group">
<label for="passwort">Dein Passwort *</label>
<label for="passwort">Passwort</label>
<input type="password" id="passwort" name="passwort" required placeholder="Gib dein Passwort ein">
<div class="error-message" id="passwortError">Bitte gib dein Passwort ein.</div>
</div>
<button type="submit">Login</button>
<button type="submit" class="button">Login</button>
<div class="signup-hint">
Du hast noch keinen Account? <a href="signup.html">Hier geht es zur Anmeldung</a>
Du hast noch keinen Account? <a href="signup.html">Hier geht es zur Anmeldung.</a>
</div>
</form>
</div>
@@ -64,4 +65,4 @@
<a href="datenschutz.html" class="footer__link">Datenschutz</a>
</footer>
</body>
</html>
</html>