diff --git a/files/assets/css/event b/files/assets/css/event deleted file mode 120000 index 809b0c4bb..000000000 --- a/files/assets/css/event +++ /dev/null @@ -1 +0,0 @@ -../../events/assets/css \ No newline at end of file diff --git a/files/events/assets/css/banner.css b/files/assets/event/css/banner.css similarity index 92% rename from files/events/assets/css/banner.css rename to files/assets/event/css/banner.css index a0b5dd73c..168e6ca1f 100644 --- a/files/events/assets/css/banner.css +++ b/files/assets/event/css/banner.css @@ -1,7 +1,7 @@ /* text */ @font-face{ font-family: "Plakat-Fraktur"; - src: url("/assets/fonts/event/Plakat-Fraktur-Black.woff") format("woff"); + src: url("/assets/event/fonts/Plakat-Fraktur-Black.woff") format("woff"); } @media (max-width: 767.98px) { diff --git a/files/events/assets/css/blizzard.css b/files/assets/event/css/blizzard.css similarity index 93% rename from files/events/assets/css/blizzard.css rename to files/assets/event/css/blizzard.css index 36667e8d9..55036e4ac 100644 --- a/files/events/assets/css/blizzard.css +++ b/files/assets/event/css/blizzard.css @@ -3,9 +3,9 @@ /* Fonts */ @font-face { font-family: "Burbank Small Medium"; - src: url("/assets/fonts/event/Burbank-Small-Medium.woff2") format("woff2"), - url("/assets/fonts/event/Burbank-Small-Medium.woff") format("woff"), - url("/assets/fonts/event/Burbank-Small-Medium.ttf") format("truetype"); + src: url("/assets/event/fonts/Burbank-Small-Medium.woff2") format("woff2"), + url("/assets/event/fonts/Burbank-Small-Medium.woff") format("woff"), + url("/assets/event/fonts/Burbank-Small-Medium.ttf") format("truetype"); } :root { @@ -34,7 +34,7 @@ body { font-family: 'Burbank Small Medium', sans-serif; background-color: rgb(var(--background)) !important; - background-image: url('/i/event/pattern.png') !important; + background-image: url('/assets/event/images/pattern.png') !important; overflow-x: hidden; } @@ -136,15 +136,15 @@ color: #7a7a7a !important; } body { - cursor: url(/assets/images/event/cursor.png?v=1), auto !important; + cursor: url(/assets/event/images/cursor.png?v=1), auto !important; } textarea, input[type=textbox], input[type=search] { - cursor: url(/assets/images/event/text.png?v=1), auto !important; + cursor: url(/assets/event/images/text.png?v=1), auto !important; } .btn, input[type=button], button, a, img { - cursor: url(/assets/images/event/pointer.png?v=1), auto !important; + cursor: url(/assets/event/images/pointer.png?v=1), auto !important; } .fa-moon-over-sun:before{content:"\f74a"} @@ -171,7 +171,7 @@ textarea, input[type=textbox], input[type=search] { left: 0; height: 57px; width: 100%; - background: url('/i/event/lights.png?v=1'); + background: url('/assets/event/images/lights.png?v=1'); animation: lights 1s infinite steps(2); pointer-events: none; } @@ -196,7 +196,7 @@ textarea, input[type=textbox], input[type=search] { .btn::after, .snow-cap::after { content: ''; pointer-events: none; - background: url("/i/event/snowcap.png?v=1") repeat-x; + background: url("/assets/event/images/snowcap.png?v=1") repeat-x; background-size: contain; position: absolute; bottom: -18px; @@ -262,7 +262,7 @@ body { bottom: -9px; transform: rotate(15deg); transition: 200ms ease-out; - background-image: url("/i/event/candy-cane.svg"); + background-image: url("/assets/event/images/candy-cane.svg"); background-repeat: no-repeat; background-size: contain; } @@ -563,7 +563,7 @@ footer::after { left: 0; height: 320px; width: 100%; - background-image: url("/i/event/footer.svg"); + background-image: url("/assets/event/images/footer.svg"); background-size: cover; background-repeat: no-repeat; pointer-events: none; diff --git a/files/events/assets/css/themes/dark.css b/files/assets/event/css/themes/dark.css similarity index 100% rename from files/events/assets/css/themes/dark.css rename to files/assets/event/css/themes/dark.css diff --git a/files/events/assets/css/themes/light.css b/files/assets/event/css/themes/light.css similarity index 100% rename from files/events/assets/css/themes/light.css rename to files/assets/event/css/themes/light.css diff --git a/files/events/assets/fonts/Burbank-Small-Medium.eot b/files/assets/event/fonts/Burbank-Small-Medium.eot similarity index 100% rename from files/events/assets/fonts/Burbank-Small-Medium.eot rename to files/assets/event/fonts/Burbank-Small-Medium.eot diff --git a/files/events/assets/fonts/Burbank-Small-Medium.ttf b/files/assets/event/fonts/Burbank-Small-Medium.ttf similarity index 100% rename from files/events/assets/fonts/Burbank-Small-Medium.ttf rename to files/assets/event/fonts/Burbank-Small-Medium.ttf diff --git a/files/events/assets/fonts/Burbank-Small-Medium.woff2 b/files/assets/event/fonts/Burbank-Small-Medium.woff2 similarity index 100% rename from files/events/assets/fonts/Burbank-Small-Medium.woff2 rename to files/assets/event/fonts/Burbank-Small-Medium.woff2 diff --git a/files/events/assets/fonts/GermaniaOne-Regular.woff b/files/assets/event/fonts/GermaniaOne-Regular.woff similarity index 100% rename from files/events/assets/fonts/GermaniaOne-Regular.woff rename to files/assets/event/fonts/GermaniaOne-Regular.woff diff --git a/files/events/assets/fonts/Plakat-Fraktur-Black.woff b/files/assets/event/fonts/Plakat-Fraktur-Black.woff similarity index 100% rename from files/events/assets/fonts/Plakat-Fraktur-Black.woff rename to files/assets/event/fonts/Plakat-Fraktur-Black.woff diff --git a/files/events/assets/images/awards/gingerbread.png b/files/assets/event/images/awards/gingerbread.png similarity index 100% rename from files/events/assets/images/awards/gingerbread.png rename to files/assets/event/images/awards/gingerbread.png diff --git a/files/events/assets/images/banner_new.webp b/files/assets/event/images/banner_new.webp old mode 100755 new mode 100644 similarity index 100% rename from files/events/assets/images/banner_new.webp rename to files/assets/event/images/banner_new.webp diff --git a/files/events/assets/images/candy-cane.svg b/files/assets/event/images/candy-cane.svg similarity index 100% rename from files/events/assets/images/candy-cane.svg rename to files/assets/event/images/candy-cane.svg diff --git a/files/events/assets/images/cursor.png b/files/assets/event/images/cursor.png similarity index 100% rename from files/events/assets/images/cursor.png rename to files/assets/event/images/cursor.png diff --git a/files/events/assets/images/footer.svg b/files/assets/event/images/footer.svg similarity index 100% rename from files/events/assets/images/footer.svg rename to files/assets/event/images/footer.svg diff --git a/files/events/assets/images/hats/1.png b/files/assets/event/images/hats/1.png similarity index 100% rename from files/events/assets/images/hats/1.png rename to files/assets/event/images/hats/1.png diff --git a/files/events/assets/images/hats/2.png b/files/assets/event/images/hats/2.png similarity index 100% rename from files/events/assets/images/hats/2.png rename to files/assets/event/images/hats/2.png diff --git a/files/events/assets/images/hats/3.png b/files/assets/event/images/hats/3.png similarity index 100% rename from files/events/assets/images/hats/3.png rename to files/assets/event/images/hats/3.png diff --git a/files/events/assets/images/icon/marseychristmaself2.webp b/files/assets/event/images/icon/marseychristmaself2.webp similarity index 100% rename from files/events/assets/images/icon/marseychristmaself2.webp rename to files/assets/event/images/icon/marseychristmaself2.webp diff --git a/files/events/assets/images/icon/marseypartyxmas.webp b/files/assets/event/images/icon/marseypartyxmas.webp similarity index 100% rename from files/events/assets/images/icon/marseypartyxmas.webp rename to files/assets/event/images/icon/marseypartyxmas.webp diff --git a/files/events/assets/images/icon/marseysanta3.webp b/files/assets/event/images/icon/marseysanta3.webp similarity index 100% rename from files/events/assets/images/icon/marseysanta3.webp rename to files/assets/event/images/icon/marseysanta3.webp diff --git a/files/events/assets/images/icon/marseysnowman.webp b/files/assets/event/images/icon/marseysnowman.webp similarity index 100% rename from files/events/assets/images/icon/marseysnowman.webp rename to files/assets/event/images/icon/marseysnowman.webp diff --git a/files/events/assets/images/lights.png b/files/assets/event/images/lights.png similarity index 100% rename from files/events/assets/images/lights.png rename to files/assets/event/images/lights.png diff --git a/files/events/assets/images/pattern.png b/files/assets/event/images/pattern.png similarity index 100% rename from files/events/assets/images/pattern.png rename to files/assets/event/images/pattern.png diff --git a/files/events/assets/images/pointer.png b/files/assets/event/images/pointer.png similarity index 100% rename from files/events/assets/images/pointer.png rename to files/assets/event/images/pointer.png diff --git a/files/events/assets/images/sidebar/2.webp b/files/assets/event/images/sidebar/2.webp similarity index 100% rename from files/events/assets/images/sidebar/2.webp rename to files/assets/event/images/sidebar/2.webp diff --git a/files/events/assets/images/sign.svg b/files/assets/event/images/sign.svg similarity index 100% rename from files/events/assets/images/sign.svg rename to files/assets/event/images/sign.svg diff --git a/files/events/assets/images/snowcap.png b/files/assets/event/images/snowcap.png similarity index 100% rename from files/events/assets/images/snowcap.png rename to files/assets/event/images/snowcap.png diff --git a/files/events/assets/images/snowflake.png b/files/assets/event/images/snowflake.png similarity index 100% rename from files/events/assets/images/snowflake.png rename to files/assets/event/images/snowflake.png diff --git a/files/events/assets/images/snowman.png b/files/assets/event/images/snowman.png similarity index 100% rename from files/events/assets/images/snowman.png rename to files/assets/event/images/snowman.png diff --git a/files/events/assets/images/text.png b/files/assets/event/images/text.png similarity index 100% rename from files/events/assets/images/text.png rename to files/assets/event/images/text.png diff --git a/files/events/assets/js/darkmode.js b/files/assets/event/js/darkmode.js similarity index 100% rename from files/events/assets/js/darkmode.js rename to files/assets/event/js/darkmode.js diff --git a/files/events/assets/js/neko.js b/files/assets/event/js/neko.js similarity index 100% rename from files/events/assets/js/neko.js rename to files/assets/event/js/neko.js diff --git a/files/events/assets/js/snow.js b/files/assets/event/js/snow.js similarity index 100% rename from files/events/assets/js/snow.js rename to files/assets/event/js/snow.js diff --git a/files/events/assets/js/snowed-in.js b/files/assets/event/js/snowed-in.js similarity index 100% rename from files/events/assets/js/snowed-in.js rename to files/assets/event/js/snowed-in.js diff --git a/files/events/assets/media/music/arianalastxmas.mp3 b/files/assets/event/media/music/arianalastxmas.mp3 similarity index 100% rename from files/events/assets/media/music/arianalastxmas.mp3 rename to files/assets/event/media/music/arianalastxmas.mp3 diff --git a/files/events/assets/media/music/avriloholy.mp3 b/files/assets/event/media/music/avriloholy.mp3 similarity index 100% rename from files/events/assets/media/music/avriloholy.mp3 rename to files/assets/event/media/music/avriloholy.mp3 diff --git a/files/events/assets/media/music/bandaidxmas.mp3 b/files/assets/event/media/music/bandaidxmas.mp3 similarity index 100% rename from files/events/assets/media/music/bandaidxmas.mp3 rename to files/assets/event/media/music/bandaidxmas.mp3 diff --git a/files/events/assets/media/music/bells.mp3 b/files/assets/event/media/music/bells.mp3 similarity index 100% rename from files/events/assets/media/music/bells.mp3 rename to files/assets/event/media/music/bells.mp3 diff --git a/files/events/assets/media/music/bingcrosbells.mp3 b/files/assets/event/media/music/bingcrosbells.mp3 similarity index 100% rename from files/events/assets/media/music/bingcrosbells.mp3 rename to files/assets/event/media/music/bingcrosbells.mp3 diff --git a/files/events/assets/media/music/bongshit.mp3 b/files/assets/event/media/music/bongshit.mp3 similarity index 100% rename from files/events/assets/media/music/bongshit.mp3 rename to files/assets/event/media/music/bongshit.mp3 diff --git a/files/events/assets/media/music/bows.mp3 b/files/assets/event/media/music/bows.mp3 similarity index 100% rename from files/events/assets/media/music/bows.mp3 rename to files/assets/event/media/music/bows.mp3 diff --git a/files/events/assets/media/music/buble.mp3 b/files/assets/event/media/music/buble.mp3 similarity index 100% rename from files/events/assets/media/music/buble.mp3 rename to files/assets/event/media/music/buble.mp3 diff --git a/files/events/assets/media/music/bubleholly.mp3 b/files/assets/event/media/music/bubleholly.mp3 similarity index 100% rename from files/events/assets/media/music/bubleholly.mp3 rename to files/assets/event/media/music/bubleholly.mp3 diff --git a/files/events/assets/media/music/carol.mp3 b/files/assets/event/media/music/carol.mp3 similarity index 100% rename from files/events/assets/media/music/carol.mp3 rename to files/assets/event/media/music/carol.mp3 diff --git a/files/events/assets/media/music/charliebrownxmas.mp3 b/files/assets/event/media/music/charliebrownxmas.mp3 similarity index 100% rename from files/events/assets/media/music/charliebrownxmas.mp3 rename to files/assets/event/media/music/charliebrownxmas.mp3 diff --git a/files/events/assets/media/music/cold.mp3 b/files/assets/event/media/music/cold.mp3 similarity index 100% rename from files/events/assets/media/music/cold.mp3 rename to files/assets/event/media/music/cold.mp3 diff --git a/files/events/assets/media/music/crosbydrummer.mp3 b/files/assets/event/media/music/crosbydrummer.mp3 similarity index 100% rename from files/events/assets/media/music/crosbydrummer.mp3 rename to files/assets/event/media/music/crosbydrummer.mp3 diff --git a/files/events/assets/media/music/crosbyrudolf.mp3 b/files/assets/event/media/music/crosbyrudolf.mp3 similarity index 100% rename from files/events/assets/media/music/crosbyrudolf.mp3 rename to files/assets/event/media/music/crosbyrudolf.mp3 diff --git a/files/events/assets/media/music/deck.mp3 b/files/assets/event/media/music/deck.mp3 similarity index 100% rename from files/events/assets/media/music/deck.mp3 rename to files/assets/event/media/music/deck.mp3 diff --git a/files/events/assets/media/music/deckthehalls.mp3 b/files/assets/event/media/music/deckthehalls.mp3 similarity index 100% rename from files/events/assets/media/music/deckthehalls.mp3 rename to files/assets/event/media/music/deckthehalls.mp3 diff --git a/files/events/assets/media/music/deckthetrap.mp3 b/files/assets/event/media/music/deckthetrap.mp3 similarity index 100% rename from files/events/assets/media/music/deckthetrap.mp3 rename to files/assets/event/media/music/deckthetrap.mp3 diff --git a/files/events/assets/media/music/dinahsilent.mp3 b/files/assets/event/media/music/dinahsilent.mp3 similarity index 100% rename from files/events/assets/media/music/dinahsilent.mp3 rename to files/assets/event/media/music/dinahsilent.mp3 diff --git a/files/events/assets/media/music/earthasantabb.mp3 b/files/assets/event/media/music/earthasantabb.mp3 similarity index 100% rename from files/events/assets/media/music/earthasantabb.mp3 rename to files/assets/event/media/music/earthasantabb.mp3 diff --git a/files/events/assets/media/music/elsababy.mp3 b/files/assets/event/media/music/elsababy.mp3 similarity index 100% rename from files/events/assets/media/music/elsababy.mp3 rename to files/assets/event/media/music/elsababy.mp3 diff --git a/files/events/assets/media/music/elton.mp3 b/files/assets/event/media/music/elton.mp3 similarity index 100% rename from files/events/assets/media/music/elton.mp3 rename to files/assets/event/media/music/elton.mp3 diff --git a/files/events/assets/media/music/elvisbethlehem.mp3 b/files/assets/event/media/music/elvisbethlehem.mp3 similarity index 100% rename from files/events/assets/media/music/elvisbethlehem.mp3 rename to files/assets/event/media/music/elvisbethlehem.mp3 diff --git a/files/events/assets/media/music/elviswhite.mp3 b/files/assets/event/media/music/elviswhite.mp3 similarity index 100% rename from files/events/assets/media/music/elviswhite.mp3 rename to files/assets/event/media/music/elviswhite.mp3 diff --git a/files/events/assets/media/music/fireplace.mp3 b/files/assets/event/media/music/fireplace.mp3 similarity index 100% rename from files/events/assets/media/music/fireplace.mp3 rename to files/assets/event/media/music/fireplace.mp3 diff --git a/files/events/assets/media/music/firstnoelrem.mp3 b/files/assets/event/media/music/firstnoelrem.mp3 similarity index 100% rename from files/events/assets/media/music/firstnoelrem.mp3 rename to files/assets/event/media/music/firstnoelrem.mp3 diff --git a/files/events/assets/media/music/frosty.mp3 b/files/assets/event/media/music/frosty.mp3 similarity index 100% rename from files/events/assets/media/music/frosty.mp3 rename to files/assets/event/media/music/frosty.mp3 diff --git a/files/events/assets/media/music/grinch.mp3 b/files/assets/event/media/music/grinch.mp3 similarity index 100% rename from files/events/assets/media/music/grinch.mp3 rename to files/assets/event/media/music/grinch.mp3 diff --git a/files/events/assets/media/music/hark.mp3 b/files/assets/event/media/music/hark.mp3 similarity index 100% rename from files/events/assets/media/music/hark.mp3 rename to files/assets/event/media/music/hark.mp3 diff --git a/files/events/assets/media/music/hark2.mp3 b/files/assets/event/media/music/hark2.mp3 similarity index 100% rename from files/events/assets/media/music/hark2.mp3 rename to files/assets/event/media/music/hark2.mp3 diff --git a/files/events/assets/media/music/hark3.mp3 b/files/assets/event/media/music/hark3.mp3 similarity index 100% rename from files/events/assets/media/music/hark3.mp3 rename to files/assets/event/media/music/hark3.mp3 diff --git a/files/events/assets/media/music/herecumssanta.mp3 b/files/assets/event/media/music/herecumssanta.mp3 similarity index 100% rename from files/events/assets/media/music/herecumssanta.mp3 rename to files/assets/event/media/music/herecumssanta.mp3 diff --git a/files/events/assets/media/music/herecumstrap.mp3 b/files/assets/event/media/music/herecumstrap.mp3 similarity index 100% rename from files/events/assets/media/music/herecumstrap.mp3 rename to files/assets/event/media/music/herecumstrap.mp3 diff --git a/files/events/assets/media/music/holiday.mp3 b/files/assets/event/media/music/holiday.mp3 similarity index 100% rename from files/events/assets/media/music/holiday.mp3 rename to files/assets/event/media/music/holiday.mp3 diff --git a/files/events/assets/media/music/kissing.mp3 b/files/assets/event/media/music/kissing.mp3 similarity index 100% rename from files/events/assets/media/music/kissing.mp3 rename to files/assets/event/media/music/kissing.mp3 diff --git a/files/events/assets/media/music/lindplum.mp3 b/files/assets/event/media/music/lindplum.mp3 similarity index 100% rename from files/events/assets/media/music/lindplum.mp3 rename to files/assets/event/media/music/lindplum.mp3 diff --git a/files/events/assets/media/music/low.mp3 b/files/assets/event/media/music/low.mp3 similarity index 100% rename from files/events/assets/media/music/low.mp3 rename to files/assets/event/media/music/low.mp3 diff --git a/files/events/assets/media/music/lowxmas.mp3 b/files/assets/event/media/music/lowxmas.mp3 similarity index 100% rename from files/events/assets/media/music/lowxmas.mp3 rename to files/assets/event/media/music/lowxmas.mp3 diff --git a/files/events/assets/media/music/mariah.mp3 b/files/assets/event/media/music/mariah.mp3 similarity index 100% rename from files/events/assets/media/music/mariah.mp3 rename to files/assets/event/media/music/mariah.mp3 diff --git a/files/events/assets/media/music/marysboykid.mp3 b/files/assets/event/media/music/marysboykid.mp3 similarity index 100% rename from files/events/assets/media/music/marysboykid.mp3 rename to files/assets/event/media/music/marysboykid.mp3 diff --git a/files/events/assets/media/music/navidad.mp3 b/files/assets/event/media/music/navidad.mp3 similarity index 100% rename from files/events/assets/media/music/navidad.mp3 rename to files/assets/event/media/music/navidad.mp3 diff --git a/files/events/assets/media/music/nightcore.mp3 b/files/assets/event/media/music/nightcore.mp3 similarity index 100% rename from files/events/assets/media/music/nightcore.mp3 rename to files/assets/event/media/music/nightcore.mp3 diff --git a/files/events/assets/media/music/nightcore2.mp3 b/files/assets/event/media/music/nightcore2.mp3 similarity index 100% rename from files/events/assets/media/music/nightcore2.mp3 rename to files/assets/event/media/music/nightcore2.mp3 diff --git a/files/events/assets/media/music/nightcore3.mp3 b/files/assets/event/media/music/nightcore3.mp3 similarity index 100% rename from files/events/assets/media/music/nightcore3.mp3 rename to files/assets/event/media/music/nightcore3.mp3 diff --git a/files/events/assets/media/music/nightmare.mp3 b/files/assets/event/media/music/nightmare.mp3 similarity index 100% rename from files/events/assets/media/music/nightmare.mp3 rename to files/assets/event/media/music/nightmare.mp3 diff --git a/files/events/assets/media/music/nkcchestnuts.mp3 b/files/assets/event/media/music/nkcchestnuts.mp3 similarity index 100% rename from files/events/assets/media/music/nkcchestnuts.mp3 rename to files/assets/event/media/music/nkcchestnuts.mp3 diff --git a/files/events/assets/media/music/pentatonix.mp3 b/files/assets/event/media/music/pentatonix.mp3 similarity index 100% rename from files/events/assets/media/music/pentatonix.mp3 rename to files/assets/event/media/music/pentatonix.mp3 diff --git a/files/events/assets/media/music/perryholy.mp3 b/files/assets/event/media/music/perryholy.mp3 similarity index 100% rename from files/events/assets/media/music/perryholy.mp3 rename to files/assets/event/media/music/perryholy.mp3 diff --git a/files/events/assets/media/music/rockin.mp3 b/files/assets/event/media/music/rockin.mp3 similarity index 100% rename from files/events/assets/media/music/rockin.mp3 rename to files/assets/event/media/music/rockin.mp3 diff --git a/files/events/assets/media/music/rockintrap.mp3 b/files/assets/event/media/music/rockintrap.mp3 similarity index 100% rename from files/events/assets/media/music/rockintrap.mp3 rename to files/assets/event/media/music/rockintrap.mp3 diff --git a/files/events/assets/media/music/rudolph.mp3 b/files/assets/event/media/music/rudolph.mp3 similarity index 100% rename from files/events/assets/media/music/rudolph.mp3 rename to files/assets/event/media/music/rudolph.mp3 diff --git a/files/events/assets/media/music/rudolphtrap.mp3 b/files/assets/event/media/music/rudolphtrap.mp3 similarity index 100% rename from files/events/assets/media/music/rudolphtrap.mp3 rename to files/assets/event/media/music/rudolphtrap.mp3 diff --git a/files/events/assets/media/music/santa.mp3 b/files/assets/event/media/music/santa.mp3 similarity index 100% rename from files/events/assets/media/music/santa.mp3 rename to files/assets/event/media/music/santa.mp3 diff --git a/files/events/assets/media/music/santababy.mp3 b/files/assets/event/media/music/santababy.mp3 similarity index 100% rename from files/events/assets/media/music/santababy.mp3 rename to files/assets/event/media/music/santababy.mp3 diff --git a/files/events/assets/media/music/santacumtownn.mp3 b/files/assets/event/media/music/santacumtownn.mp3 similarity index 100% rename from files/events/assets/media/music/santacumtownn.mp3 rename to files/assets/event/media/music/santacumtownn.mp3 diff --git a/files/events/assets/media/music/simply.mp3 b/files/assets/event/media/music/simply.mp3 similarity index 100% rename from files/events/assets/media/music/simply.mp3 rename to files/assets/event/media/music/simply.mp3 diff --git a/files/events/assets/media/music/simplyhaving.mp3 b/files/assets/event/media/music/simplyhaving.mp3 similarity index 100% rename from files/events/assets/media/music/simplyhaving.mp3 rename to files/assets/event/media/music/simplyhaving.mp3 diff --git a/files/events/assets/media/music/sinatra.mp3 b/files/assets/event/media/music/sinatra.mp3 similarity index 100% rename from files/events/assets/media/music/sinatra.mp3 rename to files/assets/event/media/music/sinatra.mp3 diff --git a/files/events/assets/media/music/sinatra2.mp3 b/files/assets/event/media/music/sinatra2.mp3 similarity index 100% rename from files/events/assets/media/music/sinatra2.mp3 rename to files/assets/event/media/music/sinatra2.mp3 diff --git a/files/events/assets/media/music/sinatramerry.mp3 b/files/assets/event/media/music/sinatramerry.mp3 similarity index 100% rename from files/events/assets/media/music/sinatramerry.mp3 rename to files/assets/event/media/music/sinatramerry.mp3 diff --git a/files/events/assets/media/music/steve.mp3 b/files/assets/event/media/music/steve.mp3 similarity index 100% rename from files/events/assets/media/music/steve.mp3 rename to files/assets/event/media/music/steve.mp3 diff --git a/files/events/assets/media/music/sugarplum.mp3 b/files/assets/event/media/music/sugarplum.mp3 similarity index 100% rename from files/events/assets/media/music/sugarplum.mp3 rename to files/assets/event/media/music/sugarplum.mp3 diff --git a/files/events/assets/media/music/sugartrap.mp3 b/files/assets/event/media/music/sugartrap.mp3 similarity index 100% rename from files/events/assets/media/music/sugartrap.mp3 rename to files/assets/event/media/music/sugartrap.mp3 diff --git a/files/events/assets/media/music/taytayxmas.mp3 b/files/assets/event/media/music/taytayxmas.mp3 similarity index 100% rename from files/events/assets/media/music/taytayxmas.mp3 rename to files/assets/event/media/music/taytayxmas.mp3 diff --git a/files/events/assets/media/music/trans.mp3 b/files/assets/event/media/music/trans.mp3 similarity index 100% rename from files/events/assets/media/music/trans.mp3 rename to files/assets/event/media/music/trans.mp3 diff --git a/files/events/assets/media/music/waitresses.mp3 b/files/assets/event/media/music/waitresses.mp3 similarity index 100% rename from files/events/assets/media/music/waitresses.mp3 rename to files/assets/event/media/music/waitresses.mp3 diff --git a/files/events/assets/media/music/waitresseswrapping.mp3 b/files/assets/event/media/music/waitresseswrapping.mp3 similarity index 100% rename from files/events/assets/media/music/waitresseswrapping.mp3 rename to files/assets/event/media/music/waitresseswrapping.mp3 diff --git a/files/events/assets/media/music/wham.mp3 b/files/assets/event/media/music/wham.mp3 similarity index 100% rename from files/events/assets/media/music/wham.mp3 rename to files/assets/event/media/music/wham.mp3 diff --git a/files/events/assets/media/music/womblexmas.mp3 b/files/assets/event/media/music/womblexmas.mp3 similarity index 100% rename from files/events/assets/media/music/womblexmas.mp3 rename to files/assets/event/media/music/womblexmas.mp3 diff --git a/files/events/assets/media/music/wonderland.mp3 b/files/assets/event/media/music/wonderland.mp3 similarity index 100% rename from files/events/assets/media/music/wonderland.mp3 rename to files/assets/event/media/music/wonderland.mp3 diff --git a/files/assets/fonts/event b/files/assets/fonts/event deleted file mode 120000 index fa7ac2ce6..000000000 --- a/files/assets/fonts/event +++ /dev/null @@ -1 +0,0 @@ -../../events/assets/fonts \ No newline at end of file diff --git a/files/assets/images/event b/files/assets/images/event deleted file mode 120000 index 4ee15241b..000000000 --- a/files/assets/images/event +++ /dev/null @@ -1 +0,0 @@ -../../events/assets/images \ No newline at end of file diff --git a/files/assets/js/event b/files/assets/js/event deleted file mode 120000 index 7e146b4d9..000000000 --- a/files/assets/js/event +++ /dev/null @@ -1 +0,0 @@ -../../events/assets/js \ No newline at end of file diff --git a/files/assets/media/event b/files/assets/media/event deleted file mode 120000 index a651b69d4..000000000 --- a/files/assets/media/event +++ /dev/null @@ -1 +0,0 @@ -../../events/assets/media \ No newline at end of file diff --git a/files/events/assets/css/.gitkeep b/files/events/assets/css/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/events/assets/fonts/.gitkeep b/files/events/assets/fonts/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/events/assets/images/.gitkeep b/files/events/assets/images/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/events/assets/js/.gitkeep b/files/events/assets/js/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/events/assets/media/.gitkeep b/files/events/assets/media/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/events/templates/.gitkeep b/files/events/templates/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/helpers/assetcache.py b/files/helpers/assetcache.py index 2c9e4f6c1..150c2d0bb 100644 --- a/files/helpers/assetcache.py +++ b/files/helpers/assetcache.py @@ -13,7 +13,7 @@ ASSET_URL = '/assets/' ASSET_CACHE = defaultdict(lambda: None) if HOLIDAY_EVENT: - ASSET_SUBDIRS.extend(['/css/event', '/js/event']) + ASSET_SUBDIRS.extend(['/event/css', '/event/js']) def assetcache_build(asset_dir, subdirs): for subdir in subdirs: diff --git a/files/templates/event b/files/templates/event deleted file mode 120000 index bfac8cddf..000000000 --- a/files/templates/event +++ /dev/null @@ -1 +0,0 @@ -../events/templates \ No newline at end of file diff --git a/files/events/templates/awards.html b/files/templates/event/awards.html similarity index 87% rename from files/events/templates/awards.html rename to files/templates/event/awards.html index 9fbdf456a..058774a69 100644 --- a/files/events/templates/awards.html +++ b/files/templates/event/awards.html @@ -2,13 +2,13 @@ {% set gingerbread_count = p.award_count("gingerbread", v) * 2 if p.award_count("gingerbread", v) <= 10 else 20 %} {% for i in range(gingerbread_count) %}
- animate marsey gingerbread icon + animate marsey gingerbread icon
{% endfor %} {# idk why snow isn't working vvvvvvvvvv #} {% if p.award_count("snow", v) %} - + {% endif %} @@ -59,7 +59,7 @@ pointer-events: none; } - + {% endif %} @@ -72,7 +72,7 @@ left: 0; height: 57px; width: 100%; - background: url('/i/event/lights.png?v=1'); + background: url('/assets/event/images/lights.png?v=1'); animation: lights 1s infinite steps(2); pointer-events: none; z-index: 1; diff --git a/files/events/templates/banner.svg b/files/templates/event/banner.svg similarity index 100% rename from files/events/templates/banner.svg rename to files/templates/event/banner.svg diff --git a/files/events/templates/banner_rDrama.html b/files/templates/event/banner_rDrama.html similarity index 62% rename from files/events/templates/banner_rDrama.html rename to files/templates/event/banner_rDrama.html index e5df8abb3..708c90bec 100644 --- a/files/events/templates/banner_rDrama.html +++ b/files/templates/event/banner_rDrama.html @@ -1,13 +1,13 @@ -{# #} +{# #} {% if request.path == '/' %} - + {% endif %}
- +