Konflikt lösen Übersicht HEAD / Übersicht Startseit
This commit is contained in:
1 parent
17c26b1cb5
commit
eb537e7d52
4 files changed
-112
No files matched your search
@@ -11,7 +11,6 @@
|
||||
|
||||
<!-- Globales Stylesheet -->
|
||||
<link rel="stylesheet" href="css/stylesheet_global.css">
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@@ -28,19 +27,10 @@
|
||||
</header>
|
||||
|
||||
<!-- Main content: page headline, filter controls and dynamic event list -->
|
||||
<<<<<<< HEAD
|
||||
<main class="container layout-wide">
|
||||
<!-- Page headline -->
|
||||
<p class="badge margin-bottom-40">Event finden</p>
|
||||
<h1>Was darf es sein?</h1>
|
||||
=======
|
||||
<main class="container page-content-safe">
|
||||
<!-- Page headline with info button -->
|
||||
<div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 2rem;">
|
||||
<h1 style="margin-bottom: 0;">Events</h1>
|
||||
<button type="button" class="btn-info" id="info-button" aria-label="Information über kostenlose Events">?</button>
|
||||
</div>
|
||||
>>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
|
||||
|
||||
<!-- Filter section: category chips + location/date filters -->
|
||||
<section class="filter-section">
|
||||
@@ -73,14 +63,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<p class="filter-label">Ernährungsform</p>
|
||||
<div class="filter-row">
|
||||
<!-- Primary category filter buttons -->
|
||||
=======
|
||||
<div class="filter-row">
|
||||
<!-- Diet filter buttons -->
|
||||
>>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
|
||||
<div class="category-group">
|
||||
<button class="category-item" type="button" data-diet="Fleisch">Fleisch</button>
|
||||
<button class="category-item" type="button" data-diet="Fisch">Fisch</button>
|
||||
|
||||
Reference in new issue
Block a user