Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkenJaden committed May 22, 2024
2 parents 2b1e216 + 4cc5001 commit bd243a2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion SAMT-Website/Pages/Datenschutz.razor

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions SAMT-Website/Pages/Impressum.razor
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<div class='impressum'>
<h1>Impressum</h1><p>Angaben gemäß § 5 TMG</p><p>
Jan Jaden Schmidt <br>
Sinnerbach 19<br>
57080 Siegen <br> <br>
Johannes-Rau-Weg 17<br>
57223 Kreuztal <br> <br>
jaden.schmidt@jumaev.de <br>
+49 151 10268749 <br>
</p><p>
<strong>Vertreten durch: </strong><br>
Jan Jaden Schmidt<br>
Mamdouh Maduar<br>
Julian Menn<br>
</p><p>
<strong>Registereintrag: </strong><br>
Eintragung im Vereinsregister.<br>
Expand Down
2 changes: 1 addition & 1 deletion SAMT-Website/Pages/Index.razor
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</header><!-- Start: Brands -->
<section class="py-5">
<div class="container text-center py-5">
<p class="mb-4" style="font-size: 1.6rem;">Mehr als&nbsp;<span class="text-success"><strong>250+</strong></span>&nbsp;Besucher auf dem Sommer-SAMT 2023.</p>
<p class="mb-4" style="font-size: 1.6rem;">Mehr als&nbsp;<span class="text-success"><strong>320+</strong></span>&nbsp;Besucher auf dem Frühlings-SAMT 2024.</p>
<h2><strong>Unterstützer</strong></h2><a href="https://www.instagram.com/germanitasha/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/66421977_1088481654675469_8640168765717217280_n.jpg" width="100"></a><a href="https://manga-mafia.de/store-siegen" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="https://manga-mafia.de/skin/frontend/manga-mafia/default/images/logo_manga.png" width="150"></a><a href="http://bluebox-siegen.de/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/bluebox_1jpg_waifu2x_6x_2n_jpg.png" width="200"></a><a href="https://www.instagram.com/kpop.in.siegen/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/kpopinsiegen_logo-modified.png" width="100"></a><a href="https://paperadventures.de/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/Paper%20Adventures.png" width="100"></a><a href="http://fischkrieg.de/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/logo.png" width="200"></a><a href="https://www.instagram.com/zockernight/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" src="assets/img/Logos/simple_round.png" width="100"></a><a href="https://ha.si/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" width="150" src="assets/img/brands/HaSi_logo_variant_thick.svg" style="background: #ffffff;border-radius: 10px;"></a><a href="https://heyalter.com/siegen/" target="_blank" rel="external"> <img class="img-fluid m-3" data-bss-hover-animate="pulse" width="100" src="assets/img/brands/HeySiegen.svg" style="background: #ffffff;border-radius: 10px;"></a>
</div>
</section><!-- End: Brands -->
Expand Down
12 changes: 6 additions & 6 deletions SAMT-Website/Shared/NavMenu.razor
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<div class="collapse navbar-collapse text-center" id="navcol-1">
<ul class="navbar-nav mx-auto">
<li class="nav-item"><NavLink ActiveClass="active" Match="NavLinkMatch.All" class="nav-link" href="/">Start</NavLink></li>
<li class="nav-item dropdown">
<a class="dropdown-toggle nav-link" aria-expanded="true" data-bs-toggle="dropdown">Programm</a>
<div class="dropdown-menu" data-bs-popper="none">
@* <li class="nav-item dropdown"> *@
@* <a class="dropdown-toggle nav-link" aria-expanded="true" data-bs-toggle="dropdown">Programm</a> *@
@* <div class="dropdown-menu" data-bs-popper="none"> *@
@* <NavLink class="dropdown-item" href="flyer">Flyer</NavLink> *@
<NavLink class="dropdown-item" href="wettbewerbe">Wettbewerbe</NavLink>
@* <NavLink class="dropdown-item" href="wettbewerbe">Wettbewerbe</NavLink> *@
@* <NavLink class="dropdown-item" href="gala">DanPa-Gala</NavLink> *@
</div>
</li>
@* </div> *@
@* </li> *@
<li class="nav-item"><NavLink ActiveClass="active" class="nav-link" href="anfahrt">Wann & Wo?</NavLink></li>
<li class="nav-item"><NavLink ActiveClass="active" class="nav-link" href="tickets">Tickets & Preise</NavLink></li>
<li class="nav-item"><NavLink ActiveClass="active" class="nav-link" href="bnb">Bring & Buy</NavLink></li>
Expand Down

0 comments on commit bd243a2

Please sign in to comment.