JasTobi/WeihnachtsKalenderMelly
3
0
Fork 0
Code Issues 3 Pull Requests Releases 4 Activity

Merge-Konflikte gelöst: Remote-Version übernommen

Browse Source
This commit is contained in:
root
2025-11-05 11:40:16 +01:00
parent 1e30dac000
commit 88b6e35593
3 changed files with 242 additions and 2534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
index.php
View File

@@ -25,17 +25,15 @@ if ($tab == "") {$tab = "home";}
<link rel="stylesheet" type="text/css" href="main/min-style.css"> <link rel="stylesheet" type="text/css" href="main/min-style.css">
<script src="main/lightbox-plus-jquery.min.js"></script> <script src="main/lightbox-plus-jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="main/lightbox.min.css"> <link rel="stylesheet" type="text/css" href="main/lightbox.min.css">
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet">
<script src="main/nav2.js"></script> <script src="main/nav2.js"></script>
<script src="main/.js"></script> <script src="main/.js"></script>
<script src="main/schnee.js"></script> <script src="main/schnee.js"></script>
<!--script src="main/schneeTeet.js"></script--> <!--script src="main/schneeTeet.js"></script-->
<link rel="preload" as="image" href="inc/bg/hufeisen_pattern_1024.webp">
</head> </head>
<!--?php include('main/overlayDebug.js');?-->
<!--header in tap/nav2.php --> <!--header in tap/nav2.php -->
@@ -45,11 +43,9 @@ if ($tab == "") {$tab = "home";}
<body> <body>
<div class="develop">
<div class="bg-layer"></div>
<!--div class="develop">
<h1>!!! Develop !!!</h1> <h1>!!! Develop !!!</h1>
</div--> </div>
<article> <article>
@@ -58,15 +54,8 @@ if ($tab == "") {$tab = "home";}
</article> </article>
<div id="snowman">
<img src="./inc/bg/1605110464788.png" alt="Schneemann" />
</div>
<footer> <footer>
<!--img class="bgTree" src="./inc/bg/golden_christmas_tree.png"></img--> <img src="./inc/bg/1605110464788.png"></img>
<!--img src="./inc/bg/1605110464788.png"></img-->
<a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span> <a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span>
<a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span> <a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span>
<!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span--> <!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span-->

10
tab/home.php
View File

@@ -14,8 +14,6 @@
</div> </div>
<div class="TimeContainer"> <div class="TimeContainer">
<div id="clockdiv"> <div id="clockdiv">
<div> <div>
@@ -64,10 +62,10 @@
console.log(images); console.log(images);
var deadline = new Date("Dec1, 2025 00:00").getTime(); var deadline = new Date("Dec1, 2025 00:00").getTime();
var advent1 = new Date("2025-11-30"); var advent1 = new Date("2024-12-01");
var advent2 = new Date("2025-12-07"); var advent2 = new Date("2024-12-08");
var advent3 = new Date("2025-12-14"); var advent3 = new Date("2024-12-15");
var advent4 = new Date("2025-12-21"); var advent4 = new Date("2024-12-22");
if(advent1.getTime()<=getNow().getTime()) { if(advent1.getTime()<=getNow().getTime()) {
$("#kerze1").show(); $("#kerze1").show();
} }

2631
tab/tuer.php
View File

File diff suppressed because it is too large Load Diff