Compare commits

...

3 Commits

Author SHA1 Message Date
JoulianALS
a2fa71799e Merge branch 'main' of https://git.bib.de/PBA3H22AJO/ProbelaufZoo 2024-04-17 09:54:37 +02:00
JoulianALS
bd9dfaa3f5 Bitte Funktionieren 2024-04-17 09:54:22 +02:00
JoulianALS
08bfdea57a Revert "Merge branch 'main' of https://git.bib.de/PBA3H22AJO/ProbelaufZoo"
This reverts commit 7d7e130af3f901ba520affc2e630bf8afaf8bc91, reversing
changes made to 3639416d578573afcaba5d92bed516cd497b4295.
2024-04-17 09:47:58 +02:00
10 changed files with 96 additions and 29 deletions

View File

@ -1,8 +0,0 @@
const swiper = new Swiper('.swiper', {
direction: 'vertical',
loop: true,
pagination: {
el: '.swiper-pagination',
},
});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 746 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -3,11 +3,6 @@ section {
height: 100vh;
}
.swiper {
width: 600px;
height: 300px;
}
.swiper-pagination .swiper-pagination-bullet {
background-color: rgba(0, 0, 0, 1);
}
footer {
height: 240px;
}

View File

@ -1,5 +1,33 @@
<!DOCTYPE html>
<html lang="en">
<<<<<<< HEAD
<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 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>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav">
<a class="nav-link active" aria-current="page" href="#">Über uns</a>
<a class="nav-link" href="#openingHours">Öffnungszeiten</a>
<a class="nav-link" href="#">Patenshop</a>
</div>
</div>
</div>
</nav>
=======
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -20,9 +48,11 @@
<li></li>
</ul>
</nav>
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
<!-- Über Uns Section -->
<section class="container" id="ueberUns">
<!-- Über Uns Section -->
<section>
<section class="container" id="ueberUns">
<div class="row">
<div class="col-md-6">
<!-- Gallery -->
@ -38,6 +68,10 @@
<div class="swiper-pagination"></div>
</div>
</div>
<<<<<<< HEAD
</nav>
</section>
=======
<!-- Text content -->
<div class="col-md-6">
<h2>Text on the Right</h2>
@ -51,13 +85,57 @@
<h1>Öffnungszeiten</h1>
<p>Öffnungszeiten</p>
</section>
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
<!-- Patenshop Section -->
<section>
<h1>Patenshop</h1>
<p>Patenshop</p>
</section>
<!-- Öffnungszeiten Section -->
<section class="container d-flex" id="openingHours">
<div class="row justify-content-center align-self-center">
<h1 class="text-center">Öffnungszeiten</h1>
<br>
<table class="table">
<thead>
<tr>
<th>Tag</th>
<th>Uhrzeit</th>
</tr>
</thead>
<tbody>
<tr>
<td>Montag - Freitag</td>
<td>9:00 - 18:00 Uhr</td>
</tr>
<tr>
<td>Samstag</td>
<td>10:00 - 15:00 Uhr</td>
</tr>
<tr>
<td>Sonntag</td>
<td>Geschlossen</td>
</tr>
</tbody>
</table>
</div>
</section>
<!-- Patenshop Section -->
<section>
<h1>Patenshop</h1>
<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">
<div>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</div>
</footer>
=======
<!-- Footer -->
<footer>
<ul>
@ -68,10 +146,12 @@
<li></li>
</ul>
</footer>
>>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
<!-- JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="Javascript/app.js"></script>
</body>
</html>
<!-- JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="Javascript/app.js"></script>
</body>
</html>