Fertiger Commit/Merge
This commit is contained in:
parent
a2fa71799e
commit
239204677c
49
index.html
49
index.html
@ -1,6 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<<<<<<< HEAD
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
@ -11,7 +10,6 @@
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navbar -->
|
||||
|
||||
<nav class="navbar sticky-top navbar-expand-lg bg-body-tertiary bg-dark border-bottom border-body" data-bs-theme="dark">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="#"><img src="Src/zoowebseite-high-resolution-logo-transparent.png" alt="Logo" width="120" height="120" class="d-inline-block align-text"></a>
|
||||
@ -27,31 +25,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
=======
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" href="Styles/style.css">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.css"/>
|
||||
<title>ZooWebsite</title>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navbar -->
|
||||
<nav>
|
||||
<a><img>logo</a>
|
||||
<ul>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
</ul>
|
||||
</nav>
|
||||
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
|
||||
|
||||
<!-- Über Uns Section -->
|
||||
<section>
|
||||
<section class="container" id="ueberUns">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
@ -68,10 +43,8 @@
|
||||
<div class="swiper-pagination"></div>
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
</nav>
|
||||
</section>
|
||||
=======
|
||||
<!-- Text content -->
|
||||
<div class="col-md-6">
|
||||
<h2>Text on the Right</h2>
|
||||
@ -80,13 +53,6 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Öffnungszeiten Section -->
|
||||
<section>
|
||||
<h1>Öffnungszeiten</h1>
|
||||
<p>Öffnungszeiten</p>
|
||||
</section>
|
||||
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
|
||||
|
||||
<!-- Öffnungszeiten Section -->
|
||||
<section class="container d-flex" id="openingHours">
|
||||
<div class="row justify-content-center align-self-center">
|
||||
@ -123,7 +89,6 @@
|
||||
<p>Patenshop</p>
|
||||
</section>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<!-- Footer -->
|
||||
<footer class="container-fluid d-flex bg-dark">
|
||||
<img src="Src/zoowebseite-high-resolution-logo-transparent.png" height="200" class="align-self-center">
|
||||
@ -135,18 +100,6 @@
|
||||
<li></li>
|
||||
</div>
|
||||
</footer>
|
||||
=======
|
||||
<!-- Footer -->
|
||||
<footer>
|
||||
<ul>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
<li></li>
|
||||
</ul>
|
||||
</footer>
|
||||
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
|
||||
|
||||
<!-- JavaScript -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
|
||||
|
Loading…
Reference in New Issue
Block a user