BlueGit

timfa questward

Merge branch 'fix/trade-ui-clicks'

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
e036524510db356465329d2c73eee12465886e77
4 files changed +110 −17
client/src/play/main.js +12 −2
@@ -324,7 +324,8 @@ function uiBlocked ()
324 324 || trade?.isBlocking()
325 325 || contextMenu?.isOpen() || death?.isBlocking() || spells?.isBlocking()
326 326 || graphicsSettingsUi?.isBlocking?.()
327 || pointerOverSpellUi());
327 || pointerOverSpellUi()
328 || pointerOverToastUi());
328 329 }
329 330
330 331 function pointerOverSpellUi ()
@@ -335,6 +336,14 @@ function pointerOverSpellUi ()
335 336 return !!el.closest("#spells-panel, #spell-favorites-bar, #spells-toggle");
336 337 }
337 338
339 function pointerOverToastUi ()
340 {
341 const el = document.elementFromPoint(GameInput.mousePosition.x, GameInput.mousePosition.y);
342 if (!el)
343 { return false; }
344 return !!el.closest("#toast-stack .toast");
345 }
346
338 347 function applyGraphicsSettings (settings)
339 348 {
340 349 view?.setGraphicsPrefs(settings);
@@ -1906,7 +1915,7 @@ async function main ()
1906 1915 staminaUi = initStamina();
1907 1916 healthUi = initHealth();
1908 1917 statusEffectsUi = initStatusEffects();
1909 toasts = initToasts();
1918 toasts = initToasts({ onSuppressWorldClick: consumeWorldClick });
1910 1919 trade = initTrade({
1911 1920 socket: { send (payload) { socket.send(payload); } },
1912 1921 MessageType,
@@ -1936,6 +1945,7 @@ async function main ()
1936 1945 invite
1937 1946 };
1938 1947 },
1948 onSuppressWorldClick: consumeWorldClick,
1939 1949 resolveSpriteUrl (name)
1940 1950 {
1941 1951 return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
@@ -324,7 +324,8 @@ function uiBlocked ()
324 || trade?.isBlocking()
324 || trade?.isBlocking()
325 || contextMenu?.isOpen() || death?.isBlocking() || spells?.isBlocking()
325 || contextMenu?.isOpen() || death?.isBlocking() || spells?.isBlocking()
326 || graphicsSettingsUi?.isBlocking?.()
326 || graphicsSettingsUi?.isBlocking?.()
327 || pointerOverSpellUi());
327 || pointerOverSpellUi()
328 || pointerOverToastUi());
328}
329}
329
330
330function pointerOverSpellUi ()
331function pointerOverSpellUi ()
@@ -335,6 +336,14 @@ function pointerOverSpellUi ()
335 return !!el.closest("#spells-panel, #spell-favorites-bar, #spells-toggle");
336 return !!el.closest("#spells-panel, #spell-favorites-bar, #spells-toggle");
336}
337}
337
338
339function pointerOverToastUi ()
340{
341 const el = document.elementFromPoint(GameInput.mousePosition.x, GameInput.mousePosition.y);
342 if (!el)
343 { return false; }
344 return !!el.closest("#toast-stack .toast");
345}
346
338function applyGraphicsSettings (settings)
347function applyGraphicsSettings (settings)
339{
348{
340 view?.setGraphicsPrefs(settings);
349 view?.setGraphicsPrefs(settings);
@@ -1906,7 +1915,7 @@ async function main ()
1906 staminaUi = initStamina();
1915 staminaUi = initStamina();
1907 healthUi = initHealth();
1916 healthUi = initHealth();
1908 statusEffectsUi = initStatusEffects();
1917 statusEffectsUi = initStatusEffects();
1909 toasts = initToasts();
1918 toasts = initToasts({ onSuppressWorldClick: consumeWorldClick });
1910 trade = initTrade({
1919 trade = initTrade({
1911 socket: { send (payload) { socket.send(payload); } },
1920 socket: { send (payload) { socket.send(payload); } },
1912 MessageType,
1921 MessageType,
@@ -1936,6 +1945,7 @@ async function main ()
1936 invite
1945 invite
1937 };
1946 };
1938 },
1947 },
1948 onSuppressWorldClick: consumeWorldClick,
1939 resolveSpriteUrl (name)
1949 resolveSpriteUrl (name)
1940 {
1950 {
1941 return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
1951 return catalog?.images?.find((entry) => entry.name === name)?.url ?? null;
client/src/play/toasts.js +15 −3
@@ -7,7 +7,7 @@ const PERSISTENT_RESTART_ID = "server-restart";
7 7 /**
8 8 * Temporary top-of-screen toast messages (play HUD).
9 9 */
10 export function initToasts ()
10 export function initToasts ({ onSuppressWorldClick } = {})
11 11 {
12 12 const root = document.getElementById("toast-stack");
13 13 /** @type {Map<string, { el: HTMLElement, timer: number | null }>} */
@@ -15,6 +15,13 @@ export function initToasts ()
15 15 let restartTick = null;
16 16 let restartScheduledAt = null;
17 17
18 function suppressWorldClick (event)
19 {
20 event?.preventDefault?.();
21 event?.stopPropagation?.();
22 onSuppressWorldClick?.();
23 }
24
18 25 if (!root)
19 26 {
20 27 return {
@@ -64,6 +71,8 @@ export function initToasts ()
64 71 if (actions.length)
65 72 {
66 73 el.classList.add("toast-actions");
74 // Consume LMB before the game loop treats the press as a world order.
75 el.addEventListener("mousedown", suppressWorldClick);
67 76 const row = document.createElement("div");
68 77 row.className = "toast-action-row";
69 78 for (const action of actions)
@@ -72,9 +81,10 @@ export function initToasts ()
72 81 btn.type = "button";
73 82 btn.className = "toast-action";
74 83 btn.textContent = action.label ?? "OK";
84 btn.addEventListener("mousedown", suppressWorldClick);
75 85 btn.addEventListener("click", (event) =>
76 86 {
77 event.stopPropagation();
87 suppressWorldClick(event);
78 88 action.onClick?.();
79 89 dismiss();
80 90 });
@@ -86,8 +96,10 @@ export function initToasts ()
86 96 {
87 97 el.classList.add("toast-clickable");
88 98 el.style.cursor = "pointer";
89 el.addEventListener("click", () =>
99 el.addEventListener("mousedown", suppressWorldClick);
100 el.addEventListener("click", (event) =>
90 101 {
102 suppressWorldClick(event);
91 103 onClick();
92 104 dismiss();
93 105 });
@@ -7,7 +7,7 @@ const PERSISTENT_RESTART_ID = "server-restart";
7/**
7/**
8 * Temporary top-of-screen toast messages (play HUD).
8 * Temporary top-of-screen toast messages (play HUD).
9 */
9 */
10export function initToasts ()
10export function initToasts ({ onSuppressWorldClick } = {})
11{
11{
12 const root = document.getElementById("toast-stack");
12 const root = document.getElementById("toast-stack");
13 /** @type {Map<string, { el: HTMLElement, timer: number | null }>} */
13 /** @type {Map<string, { el: HTMLElement, timer: number | null }>} */
@@ -15,6 +15,13 @@ export function initToasts ()
15 let restartTick = null;
15 let restartTick = null;
16 let restartScheduledAt = null;
16 let restartScheduledAt = null;
17
17
18 function suppressWorldClick (event)
19 {
20 event?.preventDefault?.();
21 event?.stopPropagation?.();
22 onSuppressWorldClick?.();
23 }
24
18 if (!root)
25 if (!root)
19 {
26 {
20 return {
27 return {
@@ -64,6 +71,8 @@ export function initToasts ()
64 if (actions.length)
71 if (actions.length)
65 {
72 {
66 el.classList.add("toast-actions");
73 el.classList.add("toast-actions");
74 // Consume LMB before the game loop treats the press as a world order.
75 el.addEventListener("mousedown", suppressWorldClick);
67 const row = document.createElement("div");
76 const row = document.createElement("div");
68 row.className = "toast-action-row";
77 row.className = "toast-action-row";
69 for (const action of actions)
78 for (const action of actions)
@@ -72,9 +81,10 @@ export function initToasts ()
72 btn.type = "button";
81 btn.type = "button";
73 btn.className = "toast-action";
82 btn.className = "toast-action";
74 btn.textContent = action.label ?? "OK";
83 btn.textContent = action.label ?? "OK";
84 btn.addEventListener("mousedown", suppressWorldClick);
75 btn.addEventListener("click", (event) =>
85 btn.addEventListener("click", (event) =>
76 {
86 {
77 event.stopPropagation();
87 suppressWorldClick(event);
78 action.onClick?.();
88 action.onClick?.();
79 dismiss();
89 dismiss();
80 });
90 });
@@ -86,8 +96,10 @@ export function initToasts ()
86 {
96 {
87 el.classList.add("toast-clickable");
97 el.classList.add("toast-clickable");
88 el.style.cursor = "pointer";
98 el.style.cursor = "pointer";
89 el.addEventListener("click", () =>
99 el.addEventListener("mousedown", suppressWorldClick);
100 el.addEventListener("click", (event) =>
90 {
101 {
102 suppressWorldClick(event);
91 onClick();
103 onClick();
92 dismiss();
104 dismiss();
93 });
105 });
client/src/play/trade.js +37 −7
@@ -21,6 +21,7 @@ export function initTrade ({
21 21 clearPendingActions,
22 22 setPendingTradeRequest,
23 23 setPendingTradeAccept,
24 onSuppressWorldClick,
24 25 resolveSpriteUrl,
25 26 resolveImage,
26 27 ensureBagOpen,
@@ -41,6 +42,7 @@ export function initTrade ({
41 42 const qtyInput = document.getElementById("trade-qty-input");
42 43 const qtyConfirm = document.getElementById("trade-qty-confirm");
43 44 const qtyClose = document.getElementById("trade-qty-close");
45 const bagPanel = document.getElementById("bag-panel");
44 46
45 47 let open = false;
46 48 let partnerName = "";
@@ -55,8 +57,16 @@ export function initTrade ({
55 57 const inviteToasts = new Map();
56 58 let pendingQty = null;
57 59
60 function suppressWorldClick (event)
61 {
62 event?.preventDefault?.();
63 event?.stopPropagation?.();
64 onSuppressWorldClick?.();
65 }
66
58 67 function isBlocking ()
59 68 {
69 // Blocks world orders while trading; bag stays clickable (no full-screen capture).
60 70 return open || !!(qtyPanel && !qtyPanel.hidden);
61 71 }
62 72
@@ -65,6 +75,11 @@ export function initTrade ({
65 75 return open;
66 76 }
67 77
78 function setBagRaised (raised)
79 {
80 bagPanel?.classList.toggle("trade-bag-raised", !!raised);
81 }
82
68 83 function listSoftClaims ()
69 84 {
70 85 if (!open)
@@ -93,6 +108,7 @@ export function initTrade ({
93 108 { panel.hidden = true; }
94 109 if (backdrop)
95 110 { backdrop.hidden = true; }
111 setBagRaised(false);
96 112 partnerEntityId = null;
97 113 partnerName = "";
98 114 youAccepted = false;
@@ -204,8 +220,10 @@ export function initTrade ({
204 220 partnerEntityId = message.partnerEntityId | 0;
205 221 if (panel)
206 222 { panel.hidden = false; }
223 // Backdrop is visual-only (pointer-events: none) so the bag stays clickable.
207 224 if (backdrop)
208 225 { backdrop.hidden = false; }
226 setBagRaised(true);
209 227 ensureBagOpen?.();
210 228 applyState(message);
211 229 }
@@ -336,22 +354,34 @@ export function initTrade ({
336 354 return true;
337 355 }
338 356
339 acceptBtn?.addEventListener("click", () =>
357 acceptBtn?.addEventListener("mousedown", suppressWorldClick);
358 cancelBtn?.addEventListener("mousedown", suppressWorldClick);
359 panel?.addEventListener("mousedown", suppressWorldClick);
360 qtyPanel?.addEventListener("mousedown", suppressWorldClick);
361 qtyBackdrop?.addEventListener("mousedown", suppressWorldClick);
362 acceptBtn?.addEventListener("click", (event) =>
340 363 {
364 suppressWorldClick(event);
341 365 socket.send({ type: MessageType.tradeAccept });
342 366 });
343 cancelBtn?.addEventListener("click", () =>
367 cancelBtn?.addEventListener("click", (event) =>
344 368 {
369 suppressWorldClick(event);
345 370 socket.send({ type: MessageType.tradeCancel });
346 371 });
347 backdrop?.addEventListener("click", () =>
372 qtyClose?.addEventListener("click", (event) =>
348 373 {
349 socket.send({ type: MessageType.tradeCancel });
374 suppressWorldClick(event);
375 closeQty();
376 });
377 qtyBackdrop?.addEventListener("click", (event) =>
378 {
379 suppressWorldClick(event);
380 closeQty();
350 381 });
351 qtyClose?.addEventListener("click", () => closeQty());
352 qtyBackdrop?.addEventListener("click", () => closeQty());
353 qtyConfirm?.addEventListener("click", () =>
382 qtyConfirm?.addEventListener("click", (event) =>
354 383 {
384 suppressWorldClick(event);
355 385 if (!pendingQty)
356 386 { return; }
357 387 const qty = Math.max(1, Math.min(pendingQty.maxQty, qtyInput?.valueAsNumber || 1));
@@ -21,6 +21,7 @@ export function initTrade ({
21 clearPendingActions,
21 clearPendingActions,
22 setPendingTradeRequest,
22 setPendingTradeRequest,
23 setPendingTradeAccept,
23 setPendingTradeAccept,
24 onSuppressWorldClick,
24 resolveSpriteUrl,
25 resolveSpriteUrl,
25 resolveImage,
26 resolveImage,
26 ensureBagOpen,
27 ensureBagOpen,
@@ -41,6 +42,7 @@ export function initTrade ({
41 const qtyInput = document.getElementById("trade-qty-input");
42 const qtyInput = document.getElementById("trade-qty-input");
42 const qtyConfirm = document.getElementById("trade-qty-confirm");
43 const qtyConfirm = document.getElementById("trade-qty-confirm");
43 const qtyClose = document.getElementById("trade-qty-close");
44 const qtyClose = document.getElementById("trade-qty-close");
45 const bagPanel = document.getElementById("bag-panel");
44
46
45 let open = false;
47 let open = false;
46 let partnerName = "";
48 let partnerName = "";
@@ -55,8 +57,16 @@ export function initTrade ({
55 const inviteToasts = new Map();
57 const inviteToasts = new Map();
56 let pendingQty = null;
58 let pendingQty = null;
57
59
60 function suppressWorldClick (event)
61 {
62 event?.preventDefault?.();
63 event?.stopPropagation?.();
64 onSuppressWorldClick?.();
65 }
66
58 function isBlocking ()
67 function isBlocking ()
59 {
68 {
69 // Blocks world orders while trading; bag stays clickable (no full-screen capture).
60 return open || !!(qtyPanel && !qtyPanel.hidden);
70 return open || !!(qtyPanel && !qtyPanel.hidden);
61 }
71 }
62
72
@@ -65,6 +75,11 @@ export function initTrade ({
65 return open;
75 return open;
66 }
76 }
67
77
78 function setBagRaised (raised)
79 {
80 bagPanel?.classList.toggle("trade-bag-raised", !!raised);
81 }
82
68 function listSoftClaims ()
83 function listSoftClaims ()
69 {
84 {
70 if (!open)
85 if (!open)
@@ -93,6 +108,7 @@ export function initTrade ({
93 { panel.hidden = true; }
108 { panel.hidden = true; }
94 if (backdrop)
109 if (backdrop)
95 { backdrop.hidden = true; }
110 { backdrop.hidden = true; }
111 setBagRaised(false);
96 partnerEntityId = null;
112 partnerEntityId = null;
97 partnerName = "";
113 partnerName = "";
98 youAccepted = false;
114 youAccepted = false;
@@ -204,8 +220,10 @@ export function initTrade ({
204 partnerEntityId = message.partnerEntityId | 0;
220 partnerEntityId = message.partnerEntityId | 0;
205 if (panel)
221 if (panel)
206 { panel.hidden = false; }
222 { panel.hidden = false; }
223 // Backdrop is visual-only (pointer-events: none) so the bag stays clickable.
207 if (backdrop)
224 if (backdrop)
208 { backdrop.hidden = false; }
225 { backdrop.hidden = false; }
226 setBagRaised(true);
209 ensureBagOpen?.();
227 ensureBagOpen?.();
210 applyState(message);
228 applyState(message);
211 }
229 }
@@ -336,22 +354,34 @@ export function initTrade ({
336 return true;
354 return true;
337 }
355 }
338
356
339 acceptBtn?.addEventListener("click", () =>
357 acceptBtn?.addEventListener("mousedown", suppressWorldClick);
358 cancelBtn?.addEventListener("mousedown", suppressWorldClick);
359 panel?.addEventListener("mousedown", suppressWorldClick);
360 qtyPanel?.addEventListener("mousedown", suppressWorldClick);
361 qtyBackdrop?.addEventListener("mousedown", suppressWorldClick);
362 acceptBtn?.addEventListener("click", (event) =>
340 {
363 {
364 suppressWorldClick(event);
341 socket.send({ type: MessageType.tradeAccept });
365 socket.send({ type: MessageType.tradeAccept });
342 });
366 });
343 cancelBtn?.addEventListener("click", () =>
367 cancelBtn?.addEventListener("click", (event) =>
344 {
368 {
369 suppressWorldClick(event);
345 socket.send({ type: MessageType.tradeCancel });
370 socket.send({ type: MessageType.tradeCancel });
346 });
371 });
347 backdrop?.addEventListener("click", () =>
372 qtyClose?.addEventListener("click", (event) =>
348 {
373 {
349 socket.send({ type: MessageType.tradeCancel });
374 suppressWorldClick(event);
375 closeQty();
376 });
377 qtyBackdrop?.addEventListener("click", (event) =>
378 {
379 suppressWorldClick(event);
380 closeQty();
350 });
381 });
351 qtyClose?.addEventListener("click", () => closeQty());
382 qtyConfirm?.addEventListener("click", (event) =>
352 qtyBackdrop?.addEventListener("click", () => closeQty());
353 qtyConfirm?.addEventListener("click", () =>
354 {
383 {
384 suppressWorldClick(event);
355 if (!pendingQty)
385 if (!pendingQty)
356 { return; }
386 { return; }
357 const qty = Math.max(1, Math.min(pendingQty.maxQty, qtyInput?.valueAsNumber || 1));
387 const qty = Math.max(1, Math.min(pendingQty.maxQty, qtyInput?.valueAsNumber || 1));
client/ui/play.css +46 −5
@@ -266,6 +266,8 @@ body {
266 266
267 267 #trade-backdrop {
268 268 z-index: 20;
269 /* Dim only — bag and other HUD must stay clickable while trading. */
270 pointer-events: none;
269 271 }
270 272
271 273 #trade-panel {
@@ -274,13 +276,20 @@ body {
274 276 left: 50%;
275 277 top: 50%;
276 278 transform: translate(-50%, -50%);
277 width: min(520px, 94vw);
278 max-height: min(80vh, 640px);
279 overflow: auto;
279 width: min(560px, 94vw);
280 height: min(70vh, 520px);
281 display: flex;
282 flex-direction: column;
283 overflow: hidden;
280 284 background: rgba(16, 18, 22, 0.96);
281 285 border: 1px solid #3a4250;
282 286 padding: 0.75rem 1rem 1rem;
283 287 box-shadow: 0 12px 40px rgba(0, 0, 0, 0.5);
288 pointer-events: auto;
289 }
290
291 #bag-panel.trade-bag-raised {
292 z-index: 23;
284 293 }
285 294
286 295 #trade-panel header {
@@ -289,6 +298,7 @@ body {
289 298 justify-content: space-between;
290 299 gap: 0.75rem;
291 300 margin-bottom: 0.5rem;
301 flex: 0 0 auto;
292 302 }
293 303
294 304 #trade-panel h2 {
@@ -300,6 +310,14 @@ body {
300 310 display: grid;
301 311 grid-template-columns: 1fr 1fr;
302 312 gap: 0.75rem;
313 flex: 1 1 auto;
314 min-height: 0;
315 }
316
317 .trade-column {
318 display: flex;
319 flex-direction: column;
320 min-height: 0;
303 321 }
304 322
305 323 .trade-column h3 {
@@ -307,10 +325,12 @@ body {
307 325 font-size: 0.9rem;
308 326 font-weight: 600;
309 327 color: #c8c2b4;
328 flex: 0 0 auto;
310 329 }
311 330
312 331 .trade-offer-grid {
313 min-height: 7rem;
332 flex: 1 1 auto;
333 min-height: 8rem;
314 334 display: flex;
315 335 flex-wrap: wrap;
316 336 gap: 0.35rem;
@@ -318,6 +338,17 @@ body {
318 338 padding: 0.4rem;
319 339 border: 1px solid #2e3542;
320 340 background: rgba(8, 10, 14, 0.55);
341 overflow: auto;
342 }
343
344 .trade-offer-grid > .hint {
345 margin: 0;
346 width: 100%;
347 }
348
349 #trade-status {
350 flex: 0 0 auto;
351 margin: 0.5rem 0 0;
321 352 }
322 353
323 354 .trade-actions {
@@ -325,6 +356,7 @@ body {
325 356 gap: 0.6rem;
326 357 justify-content: flex-end;
327 358 margin-top: 0.75rem;
359 flex: 0 0 auto;
328 360 }
329 361
330 362 #trade-accept.active {
@@ -332,8 +364,13 @@ body {
332 364 border-color: #4a8a58;
333 365 }
334 366
367 #trade-qty-backdrop {
368 z-index: 24;
369 pointer-events: auto;
370 }
371
335 372 #trade-qty-panel {
336 z-index: 22;
373 z-index: 25;
337 374 }
338 375
339 376 .toast.toast-visible {
@@ -1903,6 +1940,10 @@ button.friend-account-name:hover {
1903 1940 #shop-backdrop[hidden],
1904 1941 #shop-qty-panel[hidden],
1905 1942 #shop-qty-backdrop[hidden],
1943 #trade-panel[hidden],
1944 #trade-backdrop[hidden],
1945 #trade-qty-panel[hidden],
1946 #trade-qty-backdrop[hidden],
1906 1947 #nametag[hidden],
1907 1948 #chat-bar[hidden],
1908 1949 .shop-pane[hidden],
@@ -266,6 +266,8 @@ body {
266
266
267#trade-backdrop {
267#trade-backdrop {
268 z-index: 20;
268 z-index: 20;
269 /* Dim only — bag and other HUD must stay clickable while trading. */
270 pointer-events: none;
269}
271}
270
272
271#trade-panel {
273#trade-panel {
@@ -274,13 +276,20 @@ body {
274 left: 50%;
276 left: 50%;
275 top: 50%;
277 top: 50%;
276 transform: translate(-50%, -50%);
278 transform: translate(-50%, -50%);
277 width: min(520px, 94vw);
279 width: min(560px, 94vw);
278 max-height: min(80vh, 640px);
280 height: min(70vh, 520px);
279 overflow: auto;
281 display: flex;
282 flex-direction: column;
283 overflow: hidden;
280 background: rgba(16, 18, 22, 0.96);
284 background: rgba(16, 18, 22, 0.96);
281 border: 1px solid #3a4250;
285 border: 1px solid #3a4250;
282 padding: 0.75rem 1rem 1rem;
286 padding: 0.75rem 1rem 1rem;
283 box-shadow: 0 12px 40px rgba(0, 0, 0, 0.5);
287 box-shadow: 0 12px 40px rgba(0, 0, 0, 0.5);
288 pointer-events: auto;
289}
290
291#bag-panel.trade-bag-raised {
292 z-index: 23;
284}
293}
285
294
286#trade-panel header {
295#trade-panel header {
@@ -289,6 +298,7 @@ body {
289 justify-content: space-between;
298 justify-content: space-between;
290 gap: 0.75rem;
299 gap: 0.75rem;
291 margin-bottom: 0.5rem;
300 margin-bottom: 0.5rem;
301 flex: 0 0 auto;
292}
302}
293
303
294#trade-panel h2 {
304#trade-panel h2 {
@@ -300,6 +310,14 @@ body {
300 display: grid;
310 display: grid;
301 grid-template-columns: 1fr 1fr;
311 grid-template-columns: 1fr 1fr;
302 gap: 0.75rem;
312 gap: 0.75rem;
313 flex: 1 1 auto;
314 min-height: 0;
315}
316
317.trade-column {
318 display: flex;
319 flex-direction: column;
320 min-height: 0;
303}
321}
304
322
305.trade-column h3 {
323.trade-column h3 {
@@ -307,10 +325,12 @@ body {
307 font-size: 0.9rem;
325 font-size: 0.9rem;
308 font-weight: 600;
326 font-weight: 600;
309 color: #c8c2b4;
327 color: #c8c2b4;
328 flex: 0 0 auto;
310}
329}
311
330
312.trade-offer-grid {
331.trade-offer-grid {
313 min-height: 7rem;
332 flex: 1 1 auto;
333 min-height: 8rem;
314 display: flex;
334 display: flex;
315 flex-wrap: wrap;
335 flex-wrap: wrap;
316 gap: 0.35rem;
336 gap: 0.35rem;
@@ -318,6 +338,17 @@ body {
318 padding: 0.4rem;
338 padding: 0.4rem;
319 border: 1px solid #2e3542;
339 border: 1px solid #2e3542;
320 background: rgba(8, 10, 14, 0.55);
340 background: rgba(8, 10, 14, 0.55);
341 overflow: auto;
342}
343
344.trade-offer-grid > .hint {
345 margin: 0;
346 width: 100%;
347}
348
349#trade-status {
350 flex: 0 0 auto;
351 margin: 0.5rem 0 0;
321}
352}
322
353
323.trade-actions {
354.trade-actions {
@@ -325,6 +356,7 @@ body {
325 gap: 0.6rem;
356 gap: 0.6rem;
326 justify-content: flex-end;
357 justify-content: flex-end;
327 margin-top: 0.75rem;
358 margin-top: 0.75rem;
359 flex: 0 0 auto;
328}
360}
329
361
330#trade-accept.active {
362#trade-accept.active {
@@ -332,8 +364,13 @@ body {
332 border-color: #4a8a58;
364 border-color: #4a8a58;
333}
365}
334
366
367#trade-qty-backdrop {
368 z-index: 24;
369 pointer-events: auto;
370}
371
335#trade-qty-panel {
372#trade-qty-panel {
336 z-index: 22;
373 z-index: 25;
337}
374}
338
375
339.toast.toast-visible {
376.toast.toast-visible {
@@ -1903,6 +1940,10 @@ button.friend-account-name:hover {
1903#shop-backdrop[hidden],
1940#shop-backdrop[hidden],
1904#shop-qty-panel[hidden],
1941#shop-qty-panel[hidden],
1905#shop-qty-backdrop[hidden],
1942#shop-qty-backdrop[hidden],
1943#trade-panel[hidden],
1944#trade-backdrop[hidden],
1945#trade-qty-panel[hidden],
1946#trade-qty-backdrop[hidden],
1906#nametag[hidden],
1947#nametag[hidden],
1907#chat-bar[hidden],
1948#chat-bar[hidden],
1908.shop-pane[hidden],
1949.shop-pane[hidden],