From eb537e7d522ec2ceaf4397020922108a98b016e7 Mon Sep 17 00:00:00 2001
From: oswaldsimona <simona.oswald@stud.fhgr.ch>
Date: Tue, 21 Apr 2026 22:12:13 +0200
Subject: [PATCH] =?UTF-8?q?Konflikt=20l=C3=B6sen=20=C3=9Cbersicht=20HEAD?=
 =?UTF-8?q?=20/=20=C3=9Cbersicht=20Startseit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/stylesheet_global.css | 79 ---------------------------------------
 event_detail.html         |  4 --
 event_overview.html       | 15 --------
 js/event_detail.js        | 14 -------
 4 files changed, 112 deletions(-)

diff --git a/css/stylesheet_global.css b/css/stylesheet_global.css
index 581614e..e23df86 100644
--- a/css/stylesheet_global.css
+++ b/css/stylesheet_global.css
@@ -221,7 +221,6 @@ label {
     width: 75%;
     max-width: 1200px;
     margin: 82px auto 0 auto;
-    gap: 120px;
 }
 
 .layout-narrow {
@@ -250,19 +249,6 @@ label {
     }
 }
 
-/* 
-  Content pages with sticky nav require top padding to avoid overlap.
-  Used on event_overview, event_detail, and similar pages.
- */
-.container.page-content-safe {
-    padding-top: 6.5rem;
-}
-
-/* Detail pages with back button need less top padding. */
-.container.page-content-safe.detail-page {
-    padding-top: 3.5rem;
-}
-
 .icon {
     width: 20px;
     height: 20px;
@@ -473,29 +459,6 @@ label {
     border-color: var(--olive-dark);
 }
 
-/* Butter-colored back button for detail pages. */
-.btn-back-to-overview {
-    display: inline-block;
-    padding: 0.5rem 1.5rem;
-    background-color: var(--butter);
-    border: 1.5px solid var(--olive-light);
-    border-radius: var(--radius-lg);
-    font-family: var(--font-main);
-    font-weight: 400;
-    font-size: 1.125rem;
-    color: var(--olive);
-    cursor: pointer;
-    text-decoration: none;
-    transition: background-color 0.2s ease, border-color 0.2s ease;
-    margin-bottom: var(--space-4);
-}
-
-.btn-back-to-overview:hover,
-.btn-back-to-overview:focus-visible {
-    background-color: var(--butter-light);
-    border-color: var(--olive);
-}
-
 
 .button--outline {
     background-color: transparent;
@@ -684,32 +647,6 @@ label {
     gap: 8px;
 }
 
-/* Info button for event overview page */
-.btn-info {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 2.5rem;
-    height: 2.5rem;
-    border: 1.5px solid var(--olive-light);
-    border-radius: 999px;
-    background-color: var(--butter);
-    color: var(--olive);
-    font-family: var(--font-main);
-    font-size: 1.5rem;
-    font-weight: 600;
-    line-height: 1;
-    cursor: pointer;
-    transition: background-color 0.2s ease, border-color 0.2s ease;
-    flex-shrink: 0;
-}
-
-.btn-info:hover,
-.btn-info:focus-visible {
-    background-color: var(--butter-light);
-    border-color: var(--olive);
-}
-
 /* Modal / Popup */
 .modal {
     display: none;
@@ -774,22 +711,6 @@ label {
     justify-content: center;
 }
 
-.modal-close {
-    position: absolute;
-    right: 0;
-    top: 0;
-    font-size: 28px;
-    color: var(--black);
-    background: none;
-    border: none;
-    cursor: pointer;
-    width: 30px;
-    height: 30px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
 .modal-body {
     padding: var(--space-20) var(--space-20) var(--space-4) var(--space-20);
 }
diff --git a/event_detail.html b/event_detail.html
index dbd8ce9..a13ab96 100644
--- a/event_detail.html
+++ b/event_detail.html
@@ -28,11 +28,7 @@
 </header>
 
 <!-- Main content: detail page gets fully injected by JavaScript -->
-<<<<<<< HEAD
 <main class="container layout-wide">
-=======
-<main class="container page-content-safe detail-page">
->>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
     <!-- Render target: loading, error state or full detail layout -->
     <div id="detail-view">
         <p>Lädt Event-Details...</p>
diff --git a/event_overview.html b/event_overview.html
index 916827d..2e76569 100644
--- a/event_overview.html
+++ b/event_overview.html
@@ -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>
diff --git a/js/event_detail.js b/js/event_detail.js
index cee4a73..3559066 100644
--- a/js/event_detail.js
+++ b/js/event_detail.js
@@ -407,12 +407,7 @@
 
         // Render complete detail page layout including:
         // hero metadata, host card, menu, participants, gallery and sticky action bar.
-<<<<<<< HEAD
         detailcontainer.innerHTML = `
-=======
-        detailContainer.innerHTML = `
-                <button type="button" class="btn-back-to-overview" data-navigate-back>Zurück</button>
->>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
 
                 <section class="detail-hero">
                     <div class="detail-top-row">
@@ -540,20 +535,11 @@
         // Lightbox behavior for gallery images:
         // open on image click, close via backdrop, close button or ESC.
         // ---------------------------------------------------------
-<<<<<<< HEAD
         const lightbox = detailcontainer.querySelector('.detail-lightbox');
         const lightboxImage = detailcontainer.querySelector('.detail-lightbox-image');
         const lightboxClose = detailcontainer.querySelector('.detail-lightbox-close');
         const galleryButtons = detailcontainer.querySelectorAll('.detail-gallery-item');
         const registerButton = detailcontainer.querySelector('[data-register-button]');
-=======
-        const backButton = detailContainer.querySelector('[data-navigate-back]');
-        const lightbox = detailContainer.querySelector('.detail-lightbox');
-        const lightboxImage = detailContainer.querySelector('.detail-lightbox-image');
-        const lightboxClose = detailContainer.querySelector('.detail-lightbox-close');
-        const galleryButtons = detailContainer.querySelectorAll('.detail-gallery-item');
-        const registerButton = detailContainer.querySelector('[data-register-button]');
->>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
 
         // Harte Absicherung: Eigene Events sind auf der Detailseite immer deaktiviert.
         if (registerButton && isOwnEvent) {