koehleestell/Social_Cooking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Konflikt lösen Übersicht HEAD / Übersicht Startseit

Browse Source
This commit is contained in:
Simona Oswald 2026-04-21 22:12:13 +02:00
parent 17c26b1cb5
commit eb537e7d52
4 changed files with 0 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
css/stylesheet_global.css
View File

@ -221,7 +221,6 @@ label {
width: 75%; width: 75%;
max-width: 1200px; max-width: 1200px;
margin: 82px auto 0 auto; margin: 82px auto 0 auto;
gap: 120px;
} }
.layout-narrow { .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 { .icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
@ -473,29 +459,6 @@ label {
border-color: var(--olive-dark); 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 { .button--outline {
background-color: transparent; background-color: transparent;
@ -684,32 +647,6 @@ label {
gap: 8px; 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 / Popup */
.modal { .modal {
display: none; display: none;
@ -774,22 +711,6 @@ label {
justify-content: center; 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 { .modal-body {
padding: var(--space-20) var(--space-20) var(--space-4) var(--space-20); padding: var(--space-20) var(--space-20) var(--space-4) var(--space-20);
} }

4
event_detail.html
View File

@ -28,11 +28,7 @@
</header> </header>
<!-- Main content: detail page gets fully injected by JavaScript --> <!-- Main content: detail page gets fully injected by JavaScript -->
<<<<<<< HEAD
<main class="container layout-wide"> <main class="container layout-wide">
=======
<main class="container page-content-safe detail-page">
>>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
<!-- Render target: loading, error state or full detail layout --> <!-- Render target: loading, error state or full detail layout -->
<div id="detail-view"> <div id="detail-view">
<p>Lädt Event-Details...</p> <p>Lädt Event-Details...</p>

15
event_overview.html
View File

@ -11,7 +11,6 @@
<!-- Globales Stylesheet --> <!-- Globales Stylesheet -->
<link rel="stylesheet" href="css/stylesheet_global.css"> <link rel="stylesheet" href="css/stylesheet_global.css">
</head> </head>
<body> <body>
@ -28,19 +27,10 @@
</header> </header>
<!-- Main content: page headline, filter controls and dynamic event list --> <!-- Main content: page headline, filter controls and dynamic event list -->
<<<<<<< HEAD
<main class="container layout-wide"> <main class="container layout-wide">
<!-- Page headline --> <!-- Page headline -->
<p class="badge margin-bottom-40">Event finden</p> <p class="badge margin-bottom-40">Event finden</p>
<h1>Was darf es sein?</h1> <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 --> <!-- Filter section: category chips + location/date filters -->
<section class="filter-section"> <section class="filter-section">
@ -73,14 +63,9 @@
</div> </div>
</div> </div>
<<<<<<< HEAD
<p class="filter-label">Ernährungsform</p> <p class="filter-label">Ernährungsform</p>
<div class="filter-row"> <div class="filter-row">
<!-- Primary category filter buttons --> <!-- Primary category filter buttons -->
=======
<div class="filter-row">
<!-- Diet filter buttons -->
>>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
<div class="category-group"> <div class="category-group">
<button class="category-item" type="button" data-diet="Fleisch">Fleisch</button> <button class="category-item" type="button" data-diet="Fleisch">Fleisch</button>
<button class="category-item" type="button" data-diet="Fisch">Fisch</button> <button class="category-item" type="button" data-diet="Fisch">Fisch</button>

14
js/event_detail.js
View File

@ -407,12 +407,7 @@
// Render complete detail page layout including: // Render complete detail page layout including:
// hero metadata, host card, menu, participants, gallery and sticky action bar. // hero metadata, host card, menu, participants, gallery and sticky action bar.
<<<<<<< HEAD
detailcontainer.innerHTML = ` detailcontainer.innerHTML = `
=======
detailContainer.innerHTML = `
<button type="button" class="btn-back-to-overview" data-navigate-back>Zurück</button>
>>>>>>> e3ac1a11f091bcc9b224ce4ae81743564e160e37
<section class="detail-hero"> <section class="detail-hero">
<div class="detail-top-row"> <div class="detail-top-row">
@ -540,20 +535,11 @@
// Lightbox behavior for gallery images: // Lightbox behavior for gallery images:
// open on image click, close via backdrop, close button or ESC. // open on image click, close via backdrop, close button or ESC.
// --------------------------------------------------------- // ---------------------------------------------------------
<<<<<<< HEAD
const lightbox = detailcontainer.querySelector('.detail-lightbox'); const lightbox = detailcontainer.querySelector('.detail-lightbox');
const lightboxImage = detailcontainer.querySelector('.detail-lightbox-image'); const lightboxImage = detailcontainer.querySelector('.detail-lightbox-image');
const lightboxClose = detailcontainer.querySelector('.detail-lightbox-close'); const lightboxClose = detailcontainer.querySelector('.detail-lightbox-close');
const galleryButtons = detailcontainer.querySelectorAll('.detail-gallery-item'); const galleryButtons = detailcontainer.querySelectorAll('.detail-gallery-item');
const registerButton = detailcontainer.querySelector('[data-register-button]'); 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. // Harte Absicherung: Eigene Events sind auf der Detailseite immer deaktiviert.
if (registerButton && isOwnEvent) { if (registerButton && isOwnEvent) {