Merge-Konflikte gelöst: Remote-Version übernommen
This commit is contained in:
10
tab/home.php
10
tab/home.php
@@ -14,8 +14,6 @@
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="TimeContainer">
|
||||
<div id="clockdiv">
|
||||
<div>
|
||||
@@ -64,10 +62,10 @@
|
||||
|
||||
console.log(images);
|
||||
var deadline = new Date("Dec1, 2025 00:00").getTime();
|
||||
var advent1 = new Date("2025-11-30");
|
||||
var advent2 = new Date("2025-12-07");
|
||||
var advent3 = new Date("2025-12-14");
|
||||
var advent4 = new Date("2025-12-21");
|
||||
var advent1 = new Date("2024-12-01");
|
||||
var advent2 = new Date("2024-12-08");
|
||||
var advent3 = new Date("2024-12-15");
|
||||
var advent4 = new Date("2024-12-22");
|
||||
if(advent1.getTime()<=getNow().getTime()) {
|
||||
$("#kerze1").show();
|
||||
}
|
||||
|
||||
2747
tab/tuer.php
2747
tab/tuer.php
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user