PBA3H22AJO/ProbelaufZoo
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects 2 Releases Wiki Activity

Fertiger Commit/Merge

Browse Source
This commit is contained in:
JoulianALS 2024-04-17 09:56:58 +02:00
parent a2fa71799e
commit 239204677c
1 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
index.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="de">
<<<<<<< HEAD
<head> <head>
<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">
@ -10,8 +9,7 @@
<title>ZooWebsite</title> <title>ZooWebsite</title>
</head> </head>
<body> <body>
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar sticky-top navbar-expand-lg bg-body-tertiary bg-dark border-bottom border-body" data-bs-theme="dark"> <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"> <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> <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,32 +25,9 @@
</div> </div>
</div> </div>
</nav> </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 --> <!-- Über Uns Section -->
<section> <section class="container" id="ueberUns">
<section class="container" id="ueberUns">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<!-- Gallery --> <!-- Gallery -->
@ -68,10 +43,8 @@
<div class="swiper-pagination"></div> <div class="swiper-pagination"></div>
</div> </div>
</div> </div>
<<<<<<< HEAD
</nav> </nav>
</section> </section>
=======
<!-- Text content --> <!-- Text content -->
<div class="col-md-6"> <div class="col-md-6">
<h2>Text on the Right</h2> <h2>Text on the Right</h2>
@ -80,13 +53,6 @@
</div> </div>
</section> </section>
<!-- Öffnungszeiten Section -->
<section>
<h1>Öffnungszeiten</h1>
<p>Öffnungszeiten</p>
</section>
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
<!-- Öffnungszeiten Section --> <!-- Öffnungszeiten Section -->
<section class="container d-flex" id="openingHours"> <section class="container d-flex" id="openingHours">
<div class="row justify-content-center align-self-center"> <div class="row justify-content-center align-self-center">
@ -123,7 +89,6 @@
<p>Patenshop</p> <p>Patenshop</p>
</section> </section>
<<<<<<< HEAD
<!-- Footer --> <!-- Footer -->
<footer class="container-fluid d-flex bg-dark"> <footer class="container-fluid d-flex bg-dark">
<img src="Src/zoowebseite-high-resolution-logo-transparent.png" height="200" class="align-self-center"> <img src="Src/zoowebseite-high-resolution-logo-transparent.png" height="200" class="align-self-center">
@ -135,18 +100,6 @@
<li></li> <li></li>
</div> </div>
</footer> </footer>
=======
<!-- Footer -->
<footer>
<ul>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
</footer>
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
<!-- JavaScript --> <!-- JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
@ -154,4 +107,4 @@
<script src="Javascript/app.js"></script> <script src="Javascript/app.js"></script>
</body> </body>
</html> </html>