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:
commit
5ee62ff604
27 files changed
+2823
-356
No files matched your search
+9
-10
@@ -5,20 +5,19 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Invité | Impressum</title>
|
||||
<link rel="stylesheet" href="css/stylesheet_global.css" />
|
||||
<link rel="stylesheet" href="css/index.css" />
|
||||
<script src="js/navigation.js" defer></script>
|
||||
</head>
|
||||
<body>
|
||||
<header class="top-nav-wrap">
|
||||
<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" href="event_create.html">Event erstellen</a>
|
||||
<a class="nav-link nav-link--login" href="login.html">Login</a>
|
||||
</nav>
|
||||
<a class="brand" href="index.html" aria-label="Zur Startseite">
|
||||
<img src="assets/logo_invite.svg" alt="Invité">
|
||||
</a>
|
||||
<nav class="nav-tab-links" aria-label="Hauptnavigation">
|
||||
<a class="button-small" href="login.html" aria-label="Login">Login</a>
|
||||
</nav>
|
||||
</div>
|
||||
</header>
|
||||
</header>
|
||||
|
||||
<main class="main-content" style="padding: 40px 20px; max-width: 800px; margin: 0 auto;">
|
||||
<h1>Impressum</h1>
|
||||
|
||||
Reference in new issue
Block a user