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

Merge branch 'main' of https://git.bib.de/PBA3H22AJO/ProbelaufZoo

Browse Source
This commit is contained in:
JoulianALS 2024-04-17 09:54:37 +02:00
commit a2fa71799e
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
index.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<<<<<<< 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">
@ -26,6 +27,28 @@
</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>
@ -45,8 +68,24 @@
<div class="swiper-pagination"></div> <div class="swiper-pagination"></div>
</div> </div>
</div> </div>
<<<<<<< HEAD
</nav> </nav>
</section> </section>
=======
<!-- Text content -->
<div class="col-md-6">
<h2>Text on the Right</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed gravida, justo eget sagittis malesuada, leo velit lobortis orci, ac sodales lectus ipsum in libero. Phasellus hendrerit justo et risus blandit, nec ultricies ligula facilisis. Pellentesque luctus, justo id vehicula consectetur, metus tortor auctor felis, eget eleifend lorem neque eget lectus. Cras semper, velit non gravida pellentesque, elit lectus rhoncus eros, nec malesuada est nulla eu metus.</p>
</div>
</div>
</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">
@ -84,6 +123,7 @@
<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">
@ -95,6 +135,18 @@
<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>