diff --git a/src/js/tribe/tribe-online-stats.js b/src/js/tribe/tribe-online-stats.js
index 964e865b8..0a5a91da3 100644
--- a/src/js/tribe/tribe-online-stats.js
+++ b/src/js/tribe/tribe-online-stats.js
@@ -32,12 +32,24 @@ export function setInQueue(newNum) {
export function updateQueueButtons() {
let buttons = $(".pageTribe .prelobby .matchmaking .buttons .button");
inQueueNumbers.forEach((num, index) => {
- $(buttons[index])
- .find(".subtext")
- .text("In queue: " + num);
+ $(buttons[index]).find(".subtext .waiting").text(`Waiting: ${num}`);
+ // .html(`
+ // Races: 0
+ //
+ // `);
});
}
+export function updateRaces(races) {
+ let buttons = $(".pageTribe .prelobby .matchmaking .buttons .button");
+ races.public.forEach((num, index) => {
+ $(buttons[index]).find(".subtext .races").text(`Races: ${num}`);
+ });
+ $(
+ ".pageTribe .prelobby .privateRooms #createPrivateRoom .subtext .rooms"
+ ).text(`Rooms: ${races.private}`);
+}
+
export function refresh() {
showLoading();
Tribe.socket.emit("mp_get_online_stats");
diff --git a/src/js/tribe/tribe.js b/src/js/tribe/tribe.js
index 578d99bd4..a4b6fb128 100644
--- a/src/js/tribe/tribe.js
+++ b/src/js/tribe/tribe.js
@@ -1003,13 +1003,11 @@ socket.on("mp_room_name_update", (data) => {
socket.on("mp_update_online_stats", (data) => {
OnlineStats.hideLoading();
OnlineStats.setInQueue(data[2]);
+ OnlineStats.updateRaces(data[1]);
$(".pageTribe .prelobby .welcome .stats").empty();
$(".pageTribe .prelobby .welcome .stats").append(
`Online ${data[0]}
`
);
- $(".pageTribe .prelobby .welcome .stats").append(
- `Active Races ${data[1]}
`
- );
$(".pageTribe .prelobby .welcome .stats").append(
`Version ${data[3]}
`
);
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 590cd0e81..6f9802a80 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -3636,7 +3636,7 @@ key {
grid-area: mm;
display: grid;
gap: 1rem;
- grid-template-rows: auto 2.4fr 1fr auto;
+ grid-template-rows: auto 2fr auto;
.title,
.subtitle {
color: var(--sub-color);
@@ -3649,6 +3649,7 @@ key {
display: grid;
gap: 0.25rem;
height: 100%;
+ padding: 1rem;
.icon {
font-size: 1.5rem;
line-height: 1.5rem;
@@ -3671,12 +3672,24 @@ key {
grid-area: priv;
display: grid;
gap: 1rem;
- grid-template-rows: auto auto auto 1fr;
+ grid-template-rows: auto 2fr auto;
.title {
color: var(--sub-color);
}
#createPrivateRoom {
- padding: 2.4rem 0;
+ height: 100%;
+ padding: 1rem;
+ display: grid;
+ gap: 0.25rem;
+ .icon {
+ font-size: 1.5rem;
+ line-height: 1.5rem;
+ }
+ .subtext {
+ opacity: 0.5;
+ font-size: 0.75rem;
+ line-height: 0.75rem;
+ }
}
}
#joinByCode {
@@ -4305,10 +4318,15 @@ key {
.matchmaking .buttons {
grid-template-columns: 1fr 1fr;
.button {
- grid-template-columns: 1fr auto;
+ padding: 1rem;
+ grid-template-rows: 1fr;
+ grid-template-columns: auto auto 1fr;
align-items: center;
+ .subtext {
+ text-align: right;
+ }
.icon {
- display: none;
+ // display: none;
font-size: 1rem;
line-height: 1rem;
}
@@ -4320,13 +4338,19 @@ key {
}
}
-@media only screen and (max-width: 800px) {
+@media only screen and (max-width: 850px) {
.pageTribe .prelobby {
- grid-template-areas:
- "welcome welcome"
- "mm mm"
- "priv priv";
+ grid-template-columns: 2fr 1fr;
+ .matchmaking .buttons {
+ grid-template-columns: 1fr;
+ }
+ #joinByCode .customInput {
+ font-size: 1rem;
+ }
}
+}
+
+@media only screen and (max-width: 800px) {
#centerContent {
#top {
grid-template-areas:
@@ -4355,8 +4379,30 @@ key {
}
@media only screen and (max-width: 650px) {
- .pageTribe .prelobby .matchmaking .buttons {
- grid-template-columns: 1fr;
+ .pageTribe .prelobby {
+ grid-template-areas:
+ "welcome welcome"
+ "mm mm"
+ "priv priv";
+ }
+ .pageTribe .prelobby {
+ .privateRooms #createPrivateRoom {
+ padding: 1rem;
+ grid-template-rows: 1fr;
+ grid-template-columns: auto auto 1fr;
+ align-items: center;
+ .subtext {
+ text-align: right;
+ }
+ .icon {
+ // display: none;
+ font-size: 1rem;
+ line-height: 1rem;
+ }
+ }
+ #joinByCode .customInput {
+ font-size: 1.25rem;
+ }
}
.pageSettings .section {
grid-template-columns: 1fr;
diff --git a/static/index.html b/static/index.html
index 60355c439..a084f9f79 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3918,22 +3918,34 @@