Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge development into production #2218

Merged
merged 2 commits into from
Apr 2, 2024
Merged

merge development into production #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb908f
Revert "april fools 2024"
metalcupcake5 Apr 2, 2024
d72e0b7
Merge pull request #2217 from SkyCryptWebsite/revert-2214-april-surprise
metalcupcake5 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions includes/footer.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,17 @@
}
});
</script>

<% if (extra.isFoolsDay) { %>
<style>
#player_model {
transform: scaleY(-1);
}
.profile-avatar {
transition: transform 0.2s ease-in-out;
}
:hover > .profile-avatar {
transform: rotate(180deg);
}
</style>
<% } %>
12 changes: 6 additions & 6 deletions includes/header.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<header>
<div data-tippy-content="Supporting LGBTQ+ rights all around the year! ❤️<br><br>Click for a surprise. :)" class="pride-flag"></div>
<script>document.querySelector(".pride-flag").classList.add(localStorage.getItem("currentFlag") ?? "logo");</script>
<a href="/" id="site_name">SkyCwipt</a>
<a href="/" id="site_name">SkyCrypt</a>
<button class="header-button expander" id="info-button" aria-expanded="false">
ABOUWUT
About
</button>
<div id="info-box" class="expandable">
<div id="info_box_content">
Expand Down Expand Up @@ -75,9 +75,9 @@
</div>
</div>

<a href="/api" style="text-decoration: none;" class="header-button" id="api_button">APWII</a>
<a href="/api" style="text-decoration: none;" class="header-button" id="api_button">API</a>
<form class="lookup-player">
<input name="ign" type="search" enterkeyhint="go" placeholder="Entew usewname" aria-label="username" required>
<input name="ign" type="search" enterkeyhint="go" placeholder="Enter username" aria-label="username" required>
<button type="submit">
<svg style="width:24px;height:24px" viewBox="0 0 24 24">
<title>search</title>
Expand All @@ -90,15 +90,15 @@
<svg viewBox="0 0 24 24">
<path fill="currentColor" d="M19,11.5C19,11.5 17,13.67 17,15A2,2 0 0,0 19,17A2,2 0 0,0 21,15C21,13.67 19,11.5 19,11.5M5.21,10L10,5.21L14.79,10M16.56,8.94L7.62,0L6.21,1.41L8.59,3.79L3.44,8.94C2.85,9.5 2.85,10.47 3.44,11.06L8.94,16.56C9.23,16.85 9.62,17 10,17C10.38,17 10.77,16.85 11.06,16.56L16.56,11.06C17.15,10.47 17.15,9.5 16.56,8.94Z" />
</svg>
<span>Thwemes</span>
<span>Themes</span>
</button>
<theme-list id="themes-box" class="expandable list"></theme-list>
<% if (page != 'api') { %>
<button id="packs-button" class="expander" aria-expanded="false">
<svg viewBox="0 0 24 24">
<path fill="currentColor" d="M2,10.96C1.5,10.68 1.35,10.07 1.63,9.59L3.13,7C3.24,6.8 3.41,6.66 3.6,6.58L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.66,6.72 20.82,6.88 20.91,7.08L22.36,9.6C22.64,10.08 22.47,10.69 22,10.96L21,11.54V16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V10.96C2.7,11.13 2.32,11.14 2,10.96M12,4.15V4.15L12,10.85V10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V12.69L14,15.59C13.67,15.77 13.3,15.76 13,15.6V19.29L19,15.91M13.85,13.36L20.13,9.73L19.55,8.72L13.27,12.35L13.85,13.36Z" />
</svg>
<span>Pawcks</span>
<span>Packs</span>
<script>
if (sessionStorage.getItem("open packs")) {
sessionStorage.removeItem("open packs");
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"prismarine-nbt": "^2.5.0",
"progress": "^2.0.3",
"relaxed-json": "^1.0.3",
"seedrandom": "^3.0.5",
"sharp": "^0.33.2",
"sitemap": "^7.1.1",
"skinview3d": "^3.0.1",
Expand Down
7 changes: 0 additions & 7 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified ..._Plus/assets/minecraft/mcpatcher/cit/skyblock/accessories/general_medallion.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/resources/img/themes/owo/bg.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/resources/img/themes/owo/bg2.webp
View file
Open in desktop
Binary file not shown.
94 changes: 47 additions & 47 deletions public/resources/scss/stats.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,36 +902,36 @@ a.additional-player-stat:hover {
.stat-health,
.stat-health-regen,
.stat-strength {
color: #dc143c;
color: var(--§c);
}

.stat-defense,
.stat-mending,
.color-defense,
.color-mending {
color: #ff1493;
color: var(--§a);
}

.stat-speed,
.color-speed {
color: #ff1493;
color: var(--§f);
}

.stat-crit-chance,
.stat-crit-damage,
.color-crit-chance,
.color-crit-damage {
color: #ff69b4;
color: var(--§9);
}

.stat-bonus-attack-speed,
.color-bonus-attack-speed {
color: #ff69b4;
color: var(--§e);
}

.stat-intelligence,
.color-intelligence {
color: #ff69b4;
color: var(--§b);
}

.stat-alchemy-wisdom,
Expand All @@ -956,58 +956,58 @@ a.additional-player-stat:hover {
.color-sea-creature-chance,
.stat-social-wisdom,
.color-social-wisdom {
color: #dc143c;
color: var(--§3);
}

.stat-magic-find,
.color-magic-find,
.stat-fishing-speed,
.color-fishing-speed {
color: #ff69b4;
color: var(--§b);
}
.stat-pet-luck,
.color-pet-luck {
color: #ff0000;
color: var(--§d);
}

.stat-ability-damage,
.color-ability-damage {
color: #dc143c;
color: var(--§c);
}

.stat-mining-speed,
.color-mining-speed {
color: #ff69b4;
color: var(--§6);
}

.stat-mining-fortune,
.color-mining-fortune {
color: #ff69b4;
color: var(--§6);
}

.stat-farming-fortune,
.color-farming-fortune {
color: #ff69b4;
color: var(--§6);
}

.stat-foraging-fortune,
.color-foraging-fortune {
color: #ff69b4;
color: var(--§6);
}

.stat-pristine,
.color-pristine {
color: #ff6347;
color: var(--§5);
}

.stat-true-defense,
.color-true-defense {
color: #ff6347;
color: var(--§f);
}

.stat-vitality,
.color-vitality {
color: #ff1493;
color: var(--§4);
}

.stat-container {
Expand Down Expand Up @@ -1358,13 +1358,13 @@ a.additional-player-stat:hover {

.piece-admin-bg,
.style-scrollbar .piece-admin-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #4c0b1d;
background-color: var(--§4);
}
.piece-admin-bg + .item-lore {
scrollbar-color: #4c0b1d transparent;
scrollbar-color: var(--§4) transparent;
}
.piece-admin-fg {
color: #4c0b1d !important;
color: var(--§4) !important;
}

.piece-supreme-bg,
Expand All @@ -1380,101 +1380,101 @@ a.additional-player-stat:hover {

.piece-very_special-bg,
.style-scrollbar .piece-very_special-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #4c0b1d;
background-color: var(--§c);
}
.piece-very_special-bg + .item-lore {
scrollbar-color: #4c0b1d transparent;
scrollbar-color: var(--§c) transparent;
}
.piece-very_special-fg {
color: #4c0b1d !important;
color: var(--§c) !important;
}

.piece-special-bg,
.style-scrollbar .piece-special-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #a82c5a;
background-color: var(--§c);
}
.piece-special-bg + .item-lore {
scrollbar-color: #a82c5a transparent;
scrollbar-color: var(--§c) transparent;
}
.piece-special-fg {
color: #a82c5a !important;
color: var(--§c) !important;
}

.piece-divine-bg,
.style-scrollbar .piece-divine-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #8f1f47;
background-color: var(--§b);
}
.piece-divine-bg + .item-lore {
scrollbar-color: #8f1f47 transparent;
scrollbar-color: var(--§b) transparent;
}
.piece-divine-fg {
color: #8f1f47 !important;
color: var(--§b) !important;
}

.piece-mythic-bg,
.style-scrollbar .piece-mythic-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #b93e6d;
background-color: var(--§d);
}
.piece-mythic-bg + .item-lore {
scrollbar-color: #b93e6d transparent;
scrollbar-color: var(--§d) transparent;
}
.piece-mythic-fg {
color: #b93e6d !important;
color: var(--§d) !important;
}

.piece-legendary-bg,
.style-scrollbar .piece-legendary-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #d95c8f;
background-color: var(--§6);
}
.piece-legendary-bg + .item-lore {
scrollbar-color: v#d95c8f transparent;
scrollbar-color: var(--§6) transparent;
}
.piece-legendary-fg {
color: #d95c8f !important;
color: var(--§6) !important;
}

.piece-epic-bg,
.style-scrollbar .piece-epic-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #e87da7;
background-color: var(--§5);
}
.piece-epic-bg + .item-lore {
scrollbar-color: #e87da7 transparent;
scrollbar-color: var(--§5) transparent;
}
.piece-epic-fg {
color: #e87da7 !important;
color: var(--§5) !important;
}

.piece-rare-bg,
.style-scrollbar .piece-rare-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #f5b0c7;
background-color: var(--§9);
}
.piece-rare-bg + .item-lore {
scrollbar-color: #f5b0c7 transparent;
scrollbar-color: var(--§9) transparent;
}
.piece-rare-fg {
color: #f5b0c7 !important;
color: var(--§9) !important;
}

.piece-uncommon-bg,
.style-scrollbar .piece-uncommon-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #f9d5e1;
background-color: var(--§a);
}
.piece-uncommon-bg + .item-lore {
scrollbar-color: #f9d5e1 transparent;
scrollbar-color: var(--§a) transparent;
}
.piece-uncommon-fg {
color: #f9d5e1 !important;
color: var(--§a) !important;
}

.piece-common-bg,
.style-scrollbar .piece-common-bg + .item-lore::-webkit-scrollbar-thumb {
background-color: #fcf0f5;
background-color: var(--§f);
}
.piece-common-bg + .item-lore {
scrollbar-color: #fcf0f5 transparent;
scrollbar-color: var(--§f) transparent;
}
.piece-common-fg {
color: #fcf0f5 !important;
color: var(--§f) !important;
}

.piece.piece-rarity-upgrade-1 {
Expand Down
21 changes: 3 additions & 18 deletions public/resources/themes/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
{
"name": "April Fools Theme",
"author": "DuckySoLucky",
"schema": 2,
"images": {
"bg": "/resources/img/themes/owo/bg2.webp"
},
"backgrounds": {
"skillbar": { "type": "stripes", "angle": "45deg", "colors": ["#fc46aa", "#F699CD"], "width": 10 },
"maxedbar": { "type": "stripes", "angle": "45deg", "colors": ["#fa86c4", "#F25278"], "width": 10 }
},
"colors": {
"logo": "#fc46aa",
"link": "#fc46aa",
"icon": "#fc46aa",
"hover": "#fc46aa",
"maxed": "#d95c8f",
"gold": "#e87da7"
}
"name": "Default Theme",
"author": "SkyCrypt Team",
"schema": 2
}
1 change: 0 additions & 1 deletion public/resources/ts/common-defer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export function eraseCookie(name: string) {
document.cookie = name + "=; SameSite=Lax; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;";
}

import("./elements/pack-list");
const expanders = document.querySelectorAll(".expander");
for (const expander of expanders) {
expander.addEventListener("click", () => {
Expand Down
Loading
Loading