From b131e5127804ddd30e692a2e77bf2d68bab37477 Mon Sep 17 00:00:00 2001 From: gooseman <16601315+geese-suck@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:33:27 -0800 Subject: [PATCH 1/5] rework awards --- files/assets/css/main.css | 28 ++++----- files/templates/awards.html | 109 +++++++++++++++--------------------- 2 files changed, 59 insertions(+), 78 deletions(-) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 959ff605c..242b6ffba 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5022,20 +5022,21 @@ img[src="/i/hand.webp"]+img[glow]:not([data-src]) { pat-pfp-anim .3s infinite; } -@keyframes rb { - 10% { color: red; } - 20% { color: orange; } - 30% { color: yellow; } - 40% { color: green; } - 50% { color: cyan; } - 70% { color: blue; } - 80% { color: indigo; } - 90% { color: violet; } +.glow .post-title, .glow a, .glow .post-meta *, .glow .user-info *, .glow .comment-text, .glow .comment-actions *, .glow { + color:lightgreen !important; + text-shadow:1px 1px 1px darkgreen, 0 0 5px green; } - -.zozbot { - font-weight: bold; - animation: rb 8s linear infinite; +.glow .score-up, .glow .active.arrow-up::before, .glow .arrow-up::after, .glow .arrow-up:hover::before { + color: lime !important; +} +.glow .score-down, .glow .active.arrow-down::before, .glow .arrow-down::after, .glow .arrow-down:hover::before { + color: lime !important; +} +.glow .arrow-up::before, .glow .arrow-down::before, .glow .score { + color: lightgreen; +} +.glow .post-body a, .glow .comment-text a { + text-decoration: underline; } .text-black { @@ -5999,7 +6000,6 @@ g { .fa-discord:before{content:"\f392"} .fa-github:before{content:"\f09b"} .fa-twitter:before{content:"\f099"} -.fa-git-alt:before{content:"\f841"} .fa-head-side:before{content:"\f6e9"} .fa-crab:before{content:"\e3ff"} .fa-socks:before{content:"\f696"} diff --git a/files/templates/awards.html b/files/templates/awards.html index 738cb320f..8b2c7a92f 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -1,40 +1,52 @@ -{% if SITE_NAME == 'PCM' %} - {% set wholesome = '/i/wholesome.webp' %} -{% else %} - {% set wholesome = '/e/marseywholesome.webp' %} +
+{% macro stackable_award(award, src, alt) %} + {% for i in range(min(p.award_count(award, v), 4)) %} +
+ {{alt}} +
+ {% endfor %} +{% endmacro %} + +{% if p.award_count("wholesome", v) %} + {% set wholesome = '/i/wholesome.webp' if SITE_NAME == PCM else '/e/marseywholesome.webp' %} + {{ stackable_award('wholesome', wholesome, ':#marseywholesome:') }} {% endif %} -{% for i in range(min(p.award_count("wholesome", v), 4)) %} - {% if g.inferior_browser %} -
- :#marseywholesome: +{% if p.award_count("train", v) %} + {{ stackable_award('train', '/e/marseytrain.webp', ':#marseytrain:') }} +{% endif %} + +{% if p.award_count("scooter", v) %} + {{ stackable_award('scooter', '/e/marseyscooter.webp', ':#marseyscooter:') }} +{% endif %} + +{% if p.award_count("firework", v) %} + + {{ stackable_award('firework', i) }} +{% endif %} + +{% if p.award_count("confetti", v) %} +
+{% endif %} + +{% if p.award_count("ricardo", v) %} + + {% for i in range(min(p.award_count("ricardo", v), 3)) %} +
+
- {% else %} - {% set seal_vertical = 'up' if (i % 2) == 0 else 'down' %} - {% set seal_horizontal = 'right' if i < 2 else 'left' %} - - - :#marseywholesome: - - - {% endif %} -{% endfor %} + {% endfor %} +{% endif %} -{% for i in range(min(p.award_count("train", v), 4)) %} - {% set train_dir = 'left' if (i % 2) == 0 else 'right' %} - {% set train_mirror = ' mirrored' if (i % 2) == 0 else '' %} - - :#marseytrain: - -{% endfor %} +{% if p.award_count("shit", v) %} + + +{% endif %} -{% for i in range(min(p.award_count("scooter", v), 4)) %} - {% set scooter_dir = 'right' if (i % 2) == 0 else 'left' %} - {% set scooter_mirror = '' if (i % 2) == 0 else ' mirrored' %} - - :#marseyscooter: - -{% endfor %} +{% if p.award_count("fireflies", v) %} + + +{% endif %} {% if p.award_count("tilt", v) %} {% endif %} -{% if p.award_count("confetti", v) %} -
-{% endif %} - -{% if p.award_count("firework", v) %} - - {% for i in range(min(p.award_count("firework", v), 4)) %} -
- -
- {% endfor %} -{% endif %} - -{% if p.award_count("ricardo", v) %} - - {% for i in range(min(p.award_count("ricardo", v), 3)) %} -
- -
- {% endfor %} -{% endif %} - -{% if p.award_count("shit", v) %} - - -{% endif %} - -{% if p.award_count("fireflies", v) %} - - -{% endif %} - +
-- 2.34.1 From 187251eb01a627fa047292bc5bfba1f9d08d4b6c Mon Sep 17 00:00:00 2001 From: gooseman <16601315+geese-suck@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:53:41 -0800 Subject: [PATCH 2/5] oops forgot lol --- files/assets/css/awards.css | 249 +++++++++++++----------------------- 1 file changed, 89 insertions(+), 160 deletions(-) diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index 56e7b4a45..cce79688b 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -1,47 +1,103 @@ +#awards-container { + position:fixed; + pointer-events: none; + z-index:9999; +} +#awards-container > div { + position: absolute; +} + +/*seal*/ +.wholesome img { + width: 100px !important; + height: 89.5px !important; +} +@media (max-width: 992px) { + .wholesome img { + width: 40px !important; + height: 27px !important; + } +} + +.wholesome {animation: sealX 9s linear 0s infinite} +.wholesome img {animation: sealY 10s linear 0s infinite} + +.wholesome1 {animation-direction: alternate} +.wholesome1 img {animation-direction: alternate} +.wholesome2 {animation-direction: alternate-reverse} +.wholesome2 img {animation-direction: alternate-reverse} +.wholesome3 {animation-direction: alternate} +.wholesome3 img {animation-direction: alternate-reverse} +.wholesome4 {animation-direction: alternate-reverse} +.wholesome4 img {animation-direction: alternate} + +@keyframes sealX { + from {} to {transform: translateX(98vw)} +} +@keyframes sealY { + from {} to {transform: translateY(85vh)} +} + +/*train common*/ +.train1, .scooter1 {top:2%} +.train2, .scooter2 {top:27%} +.train3, .scooter3 {top:52%} +.train4, .scooter4 {top:77%} + +@keyframes train { + from {transform: translateX(-3vw)} + to {transform: translateX(99vw)} +} + +/*train*/ +.train img { + width: 100px !important; + height: 51px !important; +} +@media (max-width: 992px) { + .train img { + width: 40px !important; + height: 20px !important; + } +} +.train{animation: train 11s linear 0s infinite;} +.train:nth-of-type(odd) {animation-direction: reverse;} +.train:nth-of-type(odd) img {transform: scaleX(-1);} + +/*scooter*/ +.scooter img { + width: 100px !important; + height: 135px !important; +} +@media (max-width: 992px) { + .scooter img { + width: 40px !important; + height: 54px !important; + } +} + +.scooter {animation: train 11s linear 0s infinite;} +.scooter:nth-of-type(even) {animation-direction: reverse;} +.scooter:nth-of-type(even) img {transform: scaleX(-1);} + /*confetti*/ -#post-award-confetti { - position: fixed; - z-index: 9998; - width: 100%; - height: 100%; - pointer-events: none !important; +.confetti { background-image: url(/assets/images/confetti2.webp); background-repeat: repeat; } /*fireworks*/ -.firework { - position:fixed; - z-index:9999; - pointer-events: none; - width: 100% !important; - height: 100% !important; - pointer-events: none !important; -} - .firework img { max-width: 15rem; } /*ricardo*/ -.ricardo { - position: fixed; - z-index: 9997; - pointer-events: none !important; -} - .ricardo img { - max-height: 15rem !important; - max-height: min(30vw,15rem) !important; + max-height: min(30vw,15rem); } -.ricardoleft { - animation: ricardoleft 2.9s 2 alternate !important; -} - -.ricardoright { - animation: ricardoright 2.9s 2 alternate !important; -} +.ricardoleft {animation: ricardoleft 2.9s 2 alternate !important;} +.ricardoright {animation: ricardoright 2.9s 2 alternate !important;} @keyframes ricardoleft { from {} @@ -54,19 +110,19 @@ } #ricardo1 { - top:70%; + top:60%; left:-10%; } #ricardo2 { - top:80%; + top:70%; left:50%; animation: ricardo2 1.7s linear infinite !important; max-height:200px; } #ricardo3 { - top:85%; + top:75%; animation: ricardo3 10s linear infinite !important; max-height:150px; } @@ -90,130 +146,3 @@ 100% {transform: translate(-70vw,-86vh) rotate(180deg);} } } - -/*glow*/ -.glow .post-title, .glow a, .glow .post-meta *, .glow .user-info *, .glow .comment-text, .glow .comment-actions *, .glow { - color:lightgreen !important; - text-shadow:1px 1px 1px darkgreen, 0 0 5px green; -} - -.glow .score-up, .glow .active.arrow-up::before, .glow .arrow-up::after, .glow .arrow-up:hover::before { - color: lime !important; -} - -.glow .score-down, .glow .active.arrow-down::before, .glow .arrow-down::after, .glow .arrow-down:hover::before { - color: lime !important; -} - -.glow .arrow-up::before, .glow .arrow-down::before, .glow .score { - color: lightgreen; -} - -.glow .post-body a, .glow .comment-text a { - text-decoration: underline; -} - -/*train*/ -.train { - position:fixed; - z-index:9999; - pointer-events: none; -} - -.trainimg { - width: 100px !important; - height: 51px !important; -} - -@media (max-width: 992px) { - .trainimg { - width: 40px !important; - height: 20px !important; - } -} - -.train1 { - top: 10% -} - -.train2 { - top: 35% -} - -.train3 { - top: 60% -} - -.train4 { - top: 85% -} - -/*scooter*/ -.scooterimg { - width: 100px !important; - height: 135px !important; -} -@media (max-width: 992px) { - .scooterimg { - width: 40px !important; - height: 54px !important; - } -} - -/*seal*/ -.seal { - position:fixed; - z-index:9999; - pointer-events: none; - width: 100% !important; - height: 100% !important; -} - -.sealimg { - width: 100px !important; - height: 89.5px !important; -} -@media (max-width: 992px) { - .sealimg { - width: 30px !important; - height: 27px !important; - } -} - -@keyframes moveX { - from {} to {transform: translateX(98vw)} -} - -@keyframes moveY { - from {} to {transform: translateY(90vh)} -} - -.seal1 { - animation: moveX 4s linear 0s infinite alternate !important; -} - -.seal1 > img { - animation: moveY 6.8s linear 0s infinite alternate !important; -} - -.seal2 { - animation: moveX 5s linear 0s infinite alternate-reverse !important; -} - -.seal2 > img { - animation: moveY 8s linear 0s infinite alternate-reverse !important; -} - -.seal3 { - animation: moveX 4s linear 0s infinite alternate !important; -} -.seal3 > img { - animation: moveY 5s linear 0s infinite alternate-reverse !important; -} - -.seal4 { - animation: moveX 5s linear 0s infinite alternate-reverse !important; -} -.seal4 > img { - animation: moveY 6.8s linear 0s infinite alternate !important; -} -- 2.34.1 From 218a571b2c2d43c858d3ce55c8d3dd59c0ae4579 Mon Sep 17 00:00:00 2001 From: geese_suck <16601315+geese-suck@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:12:59 -0800 Subject: [PATCH 3/5] make ricardo less retardo --- files/assets/css/awards.css | 93 +++++++++++++++++++++---------------- files/assets/js/ricardo.js | 26 ----------- files/templates/awards.html | 3 +- 3 files changed, 53 insertions(+), 69 deletions(-) delete mode 100644 files/assets/js/ricardo.js diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index cce79688b..93f540411 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -3,6 +3,7 @@ pointer-events: none; z-index:9999; } + #awards-container > div { position: absolute; } @@ -19,8 +20,8 @@ } } -.wholesome {animation: sealX 9s linear 0s infinite} -.wholesome img {animation: sealY 10s linear 0s infinite} +.wholesome {animation: sealX 9s linear infinite} +.wholesome img {animation: sealY 10s linear infinite} .wholesome1 {animation-direction: alternate} .wholesome1 img {animation-direction: alternate} @@ -60,7 +61,8 @@ height: 20px !important; } } -.train{animation: train 11s linear 0s infinite;} + +.train{animation: train 11s linear infinite;} .train:nth-of-type(odd) {animation-direction: reverse;} .train:nth-of-type(odd) img {transform: scaleX(-1);} @@ -76,7 +78,7 @@ } } -.scooter {animation: train 11s linear 0s infinite;} +.scooter {animation: train 11s linear infinite;} .scooter:nth-of-type(even) {animation-direction: reverse;} .scooter:nth-of-type(even) img {transform: scaleX(-1);} @@ -92,57 +94,66 @@ } /*ricardo*/ +.ricardo { + position: fixed !important; + bottom: 0; +} .ricardo img { max-height: min(30vw,15rem); } -.ricardoleft {animation: ricardoleft 2.9s 2 alternate !important;} -.ricardoright {animation: ricardoright 2.9s 2 alternate !important;} +.ricardo1 {animation: ricardo1Xa 5.8s linear infinite, ricardo1Xb 11.6s linear infinite, ricardo1Y 23.2s linear infinite;} +.ricardo2 {animation: ricardo2 8.5s linear infinite;} +.ricardo3 {animation: ricardo3 10s linear infinite;} -@keyframes ricardoleft { - from {} - to {transform: translateX(200px);} +@keyframes ricardo1Xa { + 0% {right: -200px} + 50% {right: 200px} + 100% {right: -200px} } -@keyframes ricardoright { - from {transform: translateX(110vw);} - to {transform: translateX(95vw);} +@keyframes ricardo1Xb { + 0%{left:unset} + 49% {left: unset} + 50% {left: -200px} + 75% {left:200px} + 100% {left: -200px} } -#ricardo1 { - top:60%; - left:-10%; +@keyframes ricardo1Y { + 0% {bottom:20vh} + 24% {bottom: 20vh} + 25% {bottom: 60vh} + 49% {bottom: 60vh} + 50% {bottom: 10vh} + 74% {bottom: 10vh} + 75% {bottom: 50vh} + 99% {bottom: 50vh} + 100% {bottom: 20vh} } -#ricardo2 { - top:70%; - left:50%; - animation: ricardo2 1.7s linear infinite !important; - max-height:200px; -} - -#ricardo3 { - top:75%; - animation: ricardo3 10s linear infinite !important; - max-height:150px; -} @keyframes ricardo2 { - 0% {opacity:20%} - 50% {opacity:100%} - 100% {opacity:0%} + 0% { opacity: 1; left: 0; right: unset;} + 18% {opacity: 0; left: 0; right: unset;} + 19% {opacity: 0; left: unset; right: 20vw;} + 20% {opacity: 1; left: unset; right: 20vw;} + 38% {opacity: 0; left: unset; right: 20vw;} + 39% {opacity: 0; left: 20vw; right: unset;} + 40% {opacity: 1; left: 20vw; right: unset;} + 58% {opacity: 0; left: 20vw; right: unset;} + 59% {opacity: 0; left: unset;right: 60vw;} + 60% {opacity: 1; left: unset; right: 60vw;} + 78% {opacity: 0; left: unset; right: 60vw;} + 79% {opacity: 0; left: 80vw; right: unset;} + 80% {opacity: 1; left: 80vw; right: unset;} + 98% {opacity: 0; left: 80vw; right: unset;} + 99% {opacity: 0; left: 0; right: unset;} + 100% {opacity: 1; left: 0; right: unset;} } @keyframes ricardo3 { - 50% {transform: translateX(105vw);} - 51% {transform: translate(105vw,-86vh) rotate(180deg);} - 100% {transform: translate(-15vw,-86vh) rotate(180deg);} -} - -@media (max-width: 768px) { - @keyframes ricardo3 { - 50% {transform: translateX(105vw);} - 51% {transform: translate(105vw,-86vh) rotate(180deg);} - 100% {transform: translate(-70vw,-86vh) rotate(180deg);} - } + 50% {transform: translateX(100vw); top: unset; bottom: 0;} + 51% {transform: translateX(100vw) rotate(180deg); top: 0; bottom: unset;} + 100% {transform: translateX(-15vw) rotate(180deg); top: 0; bottom: unset;} } diff --git a/files/assets/js/ricardo.js b/files/assets/js/ricardo.js deleted file mode 100644 index a7b178d6d..000000000 --- a/files/assets/js/ricardo.js +++ /dev/null @@ -1,26 +0,0 @@ -var isleft = true -setInterval(() => { - let ricardo1 = document.getElementById("ricardo1") - var height = Math.floor(Math.random()*60)+10 - if (ricardo1) { - ricardo1.firstElementChild.src = "" - - if (isleft == true) { - ricardo1.className = "ricardo ricardoright" - isleft = false - } else { - ricardo1.className = "ricardo ricardoleft" - isleft = true - } - - ricardo1.firstElementChild.src = "/i/ricardo1.webp" - ricardo1.style.top=height+"%" - } -}, 5800) - -setInterval(() => { - let ricardo2 = document.getElementById("ricardo2") - var xpos = Math.floor(Math.random()*9)*10 - - if (ricardo2) ricardo2.style.left=xpos+"%" -}, 1700) \ No newline at end of file diff --git a/files/templates/awards.html b/files/templates/awards.html index 8b2c7a92f..425735cd3 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -30,9 +30,8 @@ {% endif %} {% if p.award_count("ricardo", v) %} - {% for i in range(min(p.award_count("ricardo", v), 3)) %} -
+
{% endfor %} -- 2.34.1 From f75958144ae8718acd70ffc5ea1f6e500eef7899 Mon Sep 17 00:00:00 2001 From: geese_suck <16601315+geese-suck@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:16:35 -0800 Subject: [PATCH 4/5] add that back in idk how it got deleted --- files/assets/css/main.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 242b6ffba..6bb5fdfe2 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5039,6 +5039,22 @@ img[src="/i/hand.webp"]+img[glow]:not([data-src]) { text-decoration: underline; } +@keyframes rb { + 10% { color: red; } + 20% { color: orange; } + 30% { color: yellow; } + 40% { color: green; } + 50% { color: cyan; } + 70% { color: blue; } + 80% { color: indigo; } + 90% { color: violet; } +} + +.zozbot { + font-weight: bold; + animation: rb 8s linear infinite; +} + .text-black { color: var(--black); } -- 2.34.1 From 4631c72c2cce88050fea6addc261f3a68d227f04 Mon Sep 17 00:00:00 2001 From: geese_suck <16601315+geese-suck@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:18:44 -0800 Subject: [PATCH 5/5] bro --- files/assets/css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 6bb5fdfe2..f45d05064 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6016,6 +6016,7 @@ g { .fa-discord:before{content:"\f392"} .fa-github:before{content:"\f09b"} .fa-twitter:before{content:"\f099"} +.fa-git-alt:before{content:"\f841"} .fa-head-side:before{content:"\f6e9"} .fa-crab:before{content:"\e3ff"} .fa-socks:before{content:"\f696"} -- 2.34.1