Skip to content

Commit 86dc06c

Browse files
matteioomatteioo
authored
Merge pull request #13 from M00nD3v/dev
Dev
2 parents d7f8e88 + 6692ecb commit 86dc06c

32 files changed

+3245
-1796
lines changed

‎build/README.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Your Favicon Package
2+
3+
This package was generated with [RealFaviconGenerator](https://realfavicongenerator.net/) [v0.16](https://realfavicongenerator.net/change_log#v0.16)
4+
5+
## Install instructions
6+
7+
To install this package:
8+
9+
Extract this package in the root of your web site. If your site is <code>http://www.example.com</code>, you should be able to access a file named <code>http://www.example.com/favicon.ico</code>.
10+
11+
Insert the following code in the `head` section of your pages:
12+
13+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=1.1">
14+
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=1.1">
15+
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=1.1">
16+
<link rel="manifest" href="/site.webmanifest?v=1.1">
17+
<link rel="mask-icon" href="/safari-pinned-tab.svg?v=1.1" color="#006599">
18+
<link rel="shortcut icon" href="/favicon.ico?v=1.1">
19+
<meta name="apple-mobile-web-app-title" content="FET - Fachschaft Elektrotechnik">
20+
<meta name="application-name" content="FET - Fachschaft Elektrotechnik">
21+
<meta name="msapplication-TileColor" content="#2b5797">
22+
<meta name="theme-color" content="#006599">
23+
24+
*Optional* - Check your favicon with the [favicon checker](https://realfavicongenerator.net/favicon_checker)

‎build/admin.html

+59-59
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
<meta property="og:title" content="Fachschaft Elektrotechnik (FET)">
1414
<meta name="twitter:title" content="Fachschaft Elektrotechnik (FET)">
1515
<meta name="theme-color" content="#006599">
16-
<!-- third-generation iPad with high-resolution Retina display: -->
17-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="#">
18-
<!-- iPhone with high-resolution Retina display: -->
19-
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="#">
20-
<!-- first- and second-generation iPad: -->
21-
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="#">
22-
<!-- non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
23-
<link rel="apple-touch-icon-precomposed" href="#">
24-
<!-- basic favicon -->
25-
<link rel="icon" href="#">
26-
<link rel="shortcut icon" type="image/png" href="https://fet.at/assets/img/fet_logo_white.png">
16+
17+
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?v=1.1">
18+
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=1.1">
19+
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=1.1">
20+
<link rel="manifest" href="site.webmanifest?v=1.1">
21+
<link rel="mask-icon" href="safari-pinned-tab.svg?v=1.1" color="#006599">
22+
<link rel="shortcut icon" href="favicon.ico?v=1.1">
23+
<meta name="apple-mobile-web-app-title" content="FET - Fachschaft Elektrotechnik">
24+
<meta name="application-name" content="FET - Fachschaft Elektrotechnik">
25+
<meta name="msapplication-TileColor" content="#2b5797">
2726

2827
<link rel="stylesheet" href="css/styles.css">
2928
<!--<link rel="stylesheet" href="../css/tailwind.css">-->
@@ -40,7 +39,8 @@
4039
<nav class="navbar" x-data="{ showNavBar: false }">
4140
<div>
4241
<a href="index.html">
43-
<img src="img/logo2014_64.png" alt="FET-Logo" class="navbar-logo">
42+
<img src="img/FET-Logo-2014_64_light.svg" alt="FET-Logo" class="navbar-logo p-2 dark:hidden">
43+
<img src="img/FET-Logo-2014_64_dark.svg" alt="FET-Logo" class="navbar-logo p-2 hidden dark:block">
4444
</a>
4545
<button class="navbar-toggle"
4646
@click="showNavBar = ! showNavBar"
@@ -50,11 +50,11 @@
5050
<ul id="navBarContent" class="navbar-content sm:block"
5151
x-show="showNavBar || $screen('sm')"
5252
x-transition:enter="transition ease-out duration-300"
53-
x-transition:enter-start="transform opacity-0"
54-
x-transition:enter-end="transform opacity-100"
53+
x-transition:enter-start="transform opacity-0 scale-90"
54+
x-transition:enter-end="transform opacity-100 scale-100"
5555
x-transition:leave="transition ease-in duration-150"
56-
x-transition:leave-start="transform opacity-100"
57-
x-transition:leave-end="transform opacity-0"
56+
x-transition:leave-start="transform opacity-100 scale-100"
57+
x-transition:leave-end="transform opacity-0 scale-90"
5858
>
5959
<li><a href="posts.html">News</a></li>
6060
<li><a href="members.html">Fachschaft</a></li>
@@ -65,13 +65,13 @@
6565
x-data="{ showPopupNav: false }"
6666
@click.outside="showPopupNav = false"
6767
>
68-
<div class="sm:inline-flex items-center divide-x divide-blue-200 bg-proprietary text-blue-50 rounded">
69-
<a class="hidden sm:block flex-1 px-2 py-1 hover:bg-proprietary-dark active:bg-proprietary-darker rounded-l" href="#"
68+
<div class="sm:inline-flex items-center divide-x divide-blue-200 dark:divide-proprietary-light bg-proprietary-dark text-blue-50 rounded">
69+
<a class="hidden sm:block flex-1 px-2 py-1 hover:bg-proprietary-dark dark:hover:bg-proprietary-darker active:bg-proprietary-dark dark:active:bg-proprietary-darker rounded-l" href="#"
7070
@click="showPopupNav = !showPopupNav"
7171
>Hallo moses</a>
72-
<a class="hidden sm:block flex-0 px-2 py-1 hover:bg-proprietary-dark focus:bg-proprietary-darker rounded-r" href="#"><i class="fa-regular fa-power-off"></i></a>
72+
<a class="hidden sm:block flex-0 px-2 py-1 hover:bg-proprietary-dark dark:hover:bg-proprietary-darker active:bg-proprietary-dark dark:active:bg-proprietary-darker rounded-r" href="#"><i class="fa-regular fa-power-off"></i></a>
7373
</div>
74-
<div class="sm:block sm:absolute z-20 top-9 right-0 bg-white sm:shadow-md sm:rounded w-full"
74+
<div class="sm:block sm:absolute z-20 top-9 right-0 bg-white dark:bg-transparent dark:sm:bg-gray-700 sm:shadow-md sm:rounded w-full dark:sm:text-proprietary-lightest"
7575
x-show="showPopupNav || !$screen('sm')"
7676
x-transition:enter="transition ease-out duration-300"
7777
x-transition:enter-start="transform origin-top opacity-0 scale-95"
@@ -92,39 +92,39 @@
9292
</div>
9393
</nav>
9494
<!--Hero section-->
95-
<section class="hero-image relative z-0 w-full h-56 sm:h-80 lg:h-96 bg-cover-image bg-cover bg-center bg-no-repeat flex-none">
96-
<div class="absolute z-10 w-full h-full bg-blue-50 opacity-60"></div>
95+
<section class="xl:h-[30rem] relative z-0 w-full h-56 sm:h-80 lg:h-96 bg-cover-image bg-cover bg-center bg-no-repeat flex-none">
96+
<div class="absolute z-10 w-full h-full bg-blue-50 dark:bg-black opacity-60"></div>
9797
<div class="relative container px-4 mx-auto z-20 w-full h-full flex flex-wrap items-center gap-x-2">
98-
<h1 class="w-3/5 flex-1 uppercase font-semibold text-xl sm:text-2xl lg:text-3xl text-center text-gray-900">
98+
<h1 class="w-3/5 flex-1 uppercase font-semibold text-xl sm:text-2xl lg:text-3xl text-center text-gray-900 dark:text-gray-100">
9999
<span class="hidden">Willkommen bei der </span><span>Fachschaft</span><br>
100-
<span class="text-proprietary-darker">Elektrotechnik</span>
100+
<span class="text-proprietary-darker dark:text-proprietary-lightest">Elektrotechnik</span>
101101
</h1>
102-
<div class="hidden sm:block flex-none w-2/5 lg:w-1/3 bg-white p-2 lg:p-4 rounded shadow-xl">
103-
<h2 class="section-title sm:text-left"><i class="fas fa-comments text-gray-300 mr-2"></i>Events</h2>
104-
<div class="-mb-2 text-gray-700 text-sm md:text-base">
102+
<div class="hidden sm:block flex-none w-2/5 lg:w-1/3 bg-white dark:bg-gray-800 p-2 lg:p-4 rounded shadow-xl dark:border-2 dark:border-gray-700">
103+
<h2 class="section-title sm:text-left"><i class="fas fa-comments text-gray-300 dark:text-gray-400 mr-2"></i>Events</h2>
104+
<div class="-mb-2 text-gray-700 dark:text-gray-200 text-sm md:text-base">
105105
<div class="my-2">
106106
<a href="#">
107107
<h3 class="">AGru Studierbarkeit</h3>
108-
<p class="py-1 text-sm lg:text-base text-gray-600">
109-
<i class="fas fa-calendar-alt text-gray-500"></i>
108+
<p class="py-1 text-sm lg:text-base text-gray-600 dark:text-gray-300">
109+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
110110
<span>20. Juli 2021</span>
111111
</p>
112112
</a>
113113
</div>
114114
<div class="my-2">
115115
<a href="#">
116116
<h3 class="">Fachschaftssitzung</h3>
117-
<p class="py-1 text-sm lg:text-base text-gray-600">
118-
<i class="fas fa-calendar-alt text-gray-500"></i>
117+
<p class="py-1 text-sm lg:text-base text-gray-600 dark:text-gray-300">
118+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
119119
<span>21. August 2021 · 20:30 Uhr</span>
120120
</p>
121121
</a>
122122
</div>
123123
<div class="my-2">
124124
<a href="#">
125125
<h3 class="">Online Mentoring für Studentinnen und Schülerinnen</h3>
126-
<p class="py-1 text-sm lg:text-base text-gray-600">
127-
<i class="fas fa-calendar-alt text-gray-500"></i>
126+
<p class="py-1 text-sm lg:text-base text-gray-600 dark:text-gray-300">
127+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
128128
<span>20. Juli 2021</span>
129129
</p>
130130
</a>
@@ -148,23 +148,23 @@ <h2 class="alert-title">Achtung:</h2>
148148
<h2 class="section-title section-title-margins">Events</h2>
149149
<div class="flex flex-col gap-4">
150150
<a href="#" class="block">
151-
<h3 class="text-gray-700">AGru Studierbarkeit</h3>
152-
<p class="my-1 text-sm text-gray-600">
153-
<i class="fas fa-calendar-alt text-gray-500"></i>
151+
<h3 class="text-gray-700 dark:text-gray-200">AGru Studierbarkeit</h3>
152+
<p class="my-1 text-sm text-gray-600 dark:text-gray-300">
153+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
154154
<span>20. Juli 2021</span>
155155
</p>
156156
</a>
157157
<a href="#" class="block">
158-
<h3 class="text-gray-700">Fachschaftssitzung</h3>
159-
<p class="my-1 text-sm text-gray-600">
160-
<i class="fas fa-calendar-alt text-gray-500"></i>
158+
<h3 class="text-gray-700 dark:text-gray-200">Fachschaftssitzung</h3>
159+
<p class="my-1 text-sm text-gray-600 dark:text-gray-300">
160+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
161161
<span>21. August 2021 · 18:00 Uhr</span>
162162
</p>
163163
</a>
164164
<a href="#" class="block">
165-
<h3 class="text-gray-700">Online Mentoring für Studentinnen und Schülerinnen</h3>
166-
<p class="my-1 text-sm text-gray-600">
167-
<i class="fas fa-calendar-alt text-gray-500"></i>
165+
<h3 class="text-gray-700 dark:text-gray-200">Online Mentoring für Studentinnen und Schülerinnen</h3>
166+
<p class="my-1 text-sm text-gray-600 dark:text-gray-300">
167+
<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
168168
<span>20. Juli 2021 · 23:30 Uhr</span>
169169
</p>
170170
</a>
@@ -260,47 +260,47 @@ <h2 class="section-title section-title-margins">Zuletzt veröffentlicht</h2>
260260
</section>
261261
</div>
262262

263-
<div id="infoBox" class="sticky bottom-4 p-4 rounded-lg shadow-lg bg-gray-600 text-gray-200 flex gap-x-4 items-center leading-none">
263+
<div id="infoBox" class="sticky bottom-4 p-4 rounded-lg shadow-lg bg-gray-600 dark:bg-gray-800 text-gray-200 dark:text-gray-300 flex gap-x-4 items-center leading-none dark:border-2 dark:border-gray-700">
264264
<div class="flex-none relative">
265-
<span class="absolute flex h-3 w-3 -right-1 -top-1">
266-
<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-proprietary opacity-80"></span>
267-
<span class="relative inline-flex rounded-full h-3 w-3 bg-proprietary"></span>
265+
<span class="absolute flex h-3 w-3 right-0 top-0">
266+
<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-sky-600 dark:bg-proprietary opacity-80"></span>
267+
<span class="relative inline-flex rounded-full h-3 w-3 bg-sky-600 dark:bg-proprietary"></span>
268268
</span>
269269
<i class="fab fa-discord text-4xl"></i>
270270
</div>
271271
<a href="https://discord.fet.at/" class="flex-1">
272272
FET Discord-Server<br>
273-
<span class="hidden lg:inline text-sm text-gray-300">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span>
273+
<span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span>
274274
</a>
275-
<button id="infoBox-closeButton" class="flex-none self-stretch px-2 -mr-2" onclick="hideInfoBox()"><i class="fas fa-times text-gray-500"></i></button>
275+
<button id="infoBox-closeButton" class="flex-none self-stretch px-2 -mr-2" onclick="hideInfoBox()"><i class="fas fa-times text-gray-300 dark:text-gray-500"></i></button>
276276
</div>
277277
</main>
278278

279-
<footer class="bg-proprietary p-4 text-blue-100 flex-none">
280-
<ul class="flex justify-center mb-4 text-2xl">
281-
<li class="mx-4">
279+
<footer>
280+
<ul class="icon-list">
281+
<li>
282282
<a href="https://facebook.fet.at/"><i class="fab fa-facebook"></i></a>
283283
</li>
284-
<li class="mx-4">
284+
<li>
285285
<a href="https://instagram.fet.at/"><i class="fab fa-instagram"></i></a>
286286
</li>
287-
<li class="mx-4">
287+
<li>
288288
<a href="https://discord.fet.at/"><i class="fab fa-discord"></i></a>
289289
</li>
290-
<li class="mx-4">
290+
<li>
291291
<a href="https://telegram.fet.at/"><i class="fab fa-telegram"></i></a>
292292
</li>
293-
<li class="mx-4">
293+
<li>
294294
<a href="mailto:[email protected]"><i class="fas fa-envelope"></i></a>
295295
</li>
296296
</ul>
297-
<div class="flex justify-center my-4">
297+
<div class="legal">
298298
<a href="impressum.html" class="text-center text-sm sm:text-base">Impressum</a>
299299
</div>
300-
<hr class="border-blue-300 -mx-4">
301-
<p class="mt-4 uppercase text-center text-sm sm:text-base">© 2021 FET - Alle Rechte vorbehalten.</p>
300+
<hr class="legal-divider">
301+
<p class="copyright">© 2021 FET - Alle Rechte vorbehalten.</p>
302302
</footer>
303-
<div class="text-center p-2 bg-gray-800 text-gray-400 font-light" x-data="{ counter: 0 }">
303+
<div class="super-duper-awesome-signature" x-data="{ counter: 0 }">
304304
<span :class="counter>=4 && 'text-purple-300'">Handcrafted </span><span :class="counter>=5 && 'text-green-400'">with </span><i class="fa-solid fa-heart" aria-label="love" @click="counter++" :class="counter>=2 ? 'text-proprietary hover:text-proprietary-dark' : 'text-red-600 hover:text-red-700'"></i><span :class="counter>=6 && 'text-pink-400'"> by</span><span class="font-normal" :class="counter>=3 && 'text-yellow-500'"> Matteo Duchscher</span>
305305
</div>
306306

‎build/android-chrome-192x192.png

6.25 KB
Loading

‎build/android-chrome-512x512.png

16.2 KB
Loading

‎build/apple-touch-icon.png

5.66 KB
Loading

0 commit comments

Comments
 (0)