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

fix: restore head content deleted during merge

Browse Source
This commit is contained in:
Estelle Köhler 2026-03-29 08:22:10 +02:00
parent 27fd12562e
commit d9847a907b
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
index.html
View File

@ -4,40 +4,25 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Social Cooking Wireframe</title> <title>Social Cooking Wireframe</title>
<<<<<<< HEAD:index.html
<link rel="stylesheet" href="css/landingpage.css" /> <link rel="stylesheet" href="css/landingpage.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-dU7ZrF1pFq5kVnPzlV9+04YhARzNjCX5Q5P1shgMpuN4s5I8mI8QD4981h7kYtV7sSgNldR0z5pZW5bS2ZpY3Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
</head> </head>
=======
<link rel="stylesheet" href="stylesheet.css" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-dU7ZrF1pFq5kVnPzlV9+04YhARzNjCX5Q5P1shgMpuN4s5I8mI8QD4981h7kYtV7sSgNldR0z5pZW5bS2ZpY3Q==" crossorigin="anonymous" referrerpolicy="no-referrer" /></head>
>>>>>>> feature/landing-page:landing-page.html
<body> <body>
<div class="page-wrapper"> <div class="page-wrapper">
<header class="header"> <header class="header">
<<<<<<< HEAD
<div class="header__brand">Invité</div> <div class="header__brand">Invité</div>
<div class="header__actions"> <div class="header__actions">
<a class="nav__link" href="#">Event finden</a> <a class="nav__link" href="#">Event finden</a>
<button class="btn btn--outline" type="button">Login</button> <button class="btn btn--outline" type="button">Login</button>
</div> </div>
</header> </header>
=======
<div class="header__brand">LOGO</div>
<div class="header__actions">
<nav class="nav">
<a class="nav__link btn btn--outline" href="event_overview.html">Event finden</a>
</nav>
<a class="btn btn--outline" href="login.html">Login</a>
</div>
</header>
>>>>>>> 434d0f34b927873523861ef29092aabcd3573ade
<main class="main-content"> <main class="main-content">
<section class="hero"> <section class="hero">
<div class="hero__left"> <div class="hero__left">
<h1 class="hero__title">Zu Tisch mit Fremden – bereit für die nächste kulinarische Begegnung?</h1> <h1 class="hero__title">Zu Tisch mit Fremden – bereit für die nächste kulinarische Begegnung?</h1>
<p class="hero__description">Dein Ort um neue Leute kennen zu lernen! Erstelle eigene Events und lade Gäste zu dir nach Hause ein.</p> <p class="hero__description">Dein Ort um neue Leute kennen zu lernen! Erstelle eigene Events und lade Gäste zu dir nach Hause ein.</p>
<a class="btn btn--primary" href="signup.html">Anmelden</a> <button class="btn btn--primary" type="button">Anmelden</button>
</div> </div>
<div class="hero__right"> <div class="hero__right">