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

Update 23 #32

Merged
Jason merged 14 commits from Develop into master 2023-11-06 14:40:24 +01:00
Conversation 0 Commits 14 Files Changed 7029 +18 -14
11 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1164c17a0 - Show all commits

BIN
inc/bg/snow3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 533 KiB

4
index.php
View File

@@ -43,9 +43,9 @@ if ($tab == "") {$tab = "home";}
<body> <body>
<div class="develop"> <!--div class="develop">
<h1>!!! Develop !!!</h1> <h1>!!! Develop !!!</h1>
</div> </div-->
<article> <article>

2
main/min-style.css
View File

File diff suppressed because one or more lines are too long

2
main/min-style.css.map
View File

File diff suppressed because one or more lines are too long

2
main/schnee.js
View File

@@ -75,7 +75,7 @@ function initsnow() {
function movesnow() { function movesnow() {
marginright = window.innerWidth; marginright = window.innerWidth;
marginbottom = window.innerHeight marginbottom = window.innerHeight
$("#kstart").html(marginbottom); //$("#kstart").html(marginbottom);
for (i=0;i<=snowmax;i++) { for (i=0;i<=snowmax;i++) {
crds[i] += x_mv[i]; crds[i] += x_mv[i];
snow[i].posy+=snow[i].sink; snow[i].posy+=snow[i].sink;

BIN
src/images/bibi/packa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 KiB

6
src/sass/_kalender.sass
View File

@@ -25,11 +25,11 @@ $doorWidth: ($kalenderWidth - 3.5*$marginLeftRight - 3*$marginBetween)/4
div div
position: absolute position: absolute
//border: $doorBorderSize solid darkred border: $doorBorderSize solid darkred
width: $doorWidth width: $doorWidth
height: $doorWidth height: $doorWidth
overflow: hidden overflow: hidden
//background: #fff background: hsla(0, 0%, 100%, 0.5)
h3 h3
padding-top: 1.5rem padding-top: 1.5rem
@@ -98,3 +98,5 @@ $doorWidth: ($kalenderWidth - 3.5*$marginLeftRight - 3*$marginBetween)/4
.left .left
background-position: #{-($leftCalc+$doorBorderSize)} #{-($topCalc+$doorBorderSize)} background-position: #{-($leftCalc+$doorBorderSize)} #{-($topCalc+$doorBorderSize)}
#türPlus
display: none

1
src/sass/_tueren.sass
View File

@@ -58,3 +58,4 @@
#false #false
color: red color: red
font-weight: 500 font-weight: 500

2
src/sass/main.sass
View File

@@ -8,7 +8,7 @@ $headerRadios: 2rem
body body
text-align: center text-align: center
margin: 0 margin: 0
//background-image: url("../inc/bg/snow3.png") background-image: url("../inc/bg/snow3.jpg")
background-size: 90% background-size: 90%
background-color: darkgray //hsla(190, 50%, 80%, 0.7) background-color: darkgray //hsla(190, 50%, 80%, 0.7)
//height: 100vh //height: 100vh

5
tab/kalender.php
View File

@@ -147,7 +147,7 @@
<!-- Zusatz Türen--> <!-- Zusatz Türen-->
<div class="türPlus"> <div id="türPlus">
<div class="active" id="ak25"> <div class="active" id="ak25">
<a href="?tab=tuer&nr=25"> <a href="?tab=tuer&nr=25">
@@ -202,7 +202,8 @@
"22-walpurgia_besenstiel", "22-walpurgia_besenstiel",
"23-mania_flippinger", "23-mania_flippinger",
"24-erzaehler", "24-erzaehler",
"scheniiW" "scheniiW",
"packa"
]; ];
console.log(dayMap); console.log(dayMap);
for(let i=1; i<=24; i++) { for(let i=1; i<=24; i++) {

6
tab/tuer.php
View File

@@ -951,9 +951,9 @@ echo('
break; break;
case 26: case 26:
echo(' echo('
<div class="packa"> <!--div class="packa">
<img id="SRechts" src="inc/bg/schneeiRechts.png"</img> <img id="SRechts" src="inc/bg/schneeiRechts.png"</img-->
<div id="txt"><h3>Von Schneei</h3> <div id="txt"><h3>Von Packa</h3>
<p> <p>
<u>Erzähler:</u> <u>Erzähler:</u>
<br> <br>