Skip to content

Commit

Permalink
Merge pull request #201 from Noita-Together/next
Browse files Browse the repository at this point in the history
fix chat scroll/sizing bug
  • Loading branch information
SkyeOfBreeze committed Aug 26, 2024
2 parents 1c1dda9 + d0b8cc0 commit 884fb32
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion nt-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nt-app",
"version": "0.11.0",
"version": "0.11.1",
"author": "Noita-Together",
"description": "Allows you to play noita with friends...",
"repository": "https://github.com/Noita-Together/noita-together",
Expand Down
14 changes: 8 additions & 6 deletions nt-app/src/views/Room.vue
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@
<div class="room-chat" ref="chat" @scroll="handleScroll()">
<template v-if="chat.length > 0">
<div v-for="(entry, index) in chat" :key="index" :class="entry.class">
<span class="chat-time" :style="{ color: entry.userId === '-1' ? entry.color : '#fff'}">[{{ entry.time }}]</span>
<span class="chat-name" :style="{ color: entry.color }">{{ entry.name }}</span>
<span class="chat-message" v-for="(span,j) in entry.spans" :key="j" :style="span.style">{{ span.message }}</span>
<div class="chat-text-block">
<span class="chat-time" :style="{ color: entry.userId === '-1' ? entry.color : '#fff'}">[{{ entry.time }}]</span>
<span class="chat-name" :style="{ color: entry.color }">{{ entry.name }}</span>
<span class="chat-message" v-for="(span,j) in entry.spans" :key="j" :style="span.style">{{ span.message }}</span>
</div>
</div>
</template>
</div>
Expand Down Expand Up @@ -531,8 +533,10 @@ export default {
.chat-entry {
padding: 0.25em 0.1em;
}
.chat-text-block {
overflow-y: hidden;
min-height: fit-content;
}
.chat-entry:hover {
Expand All @@ -543,8 +547,6 @@ export default {
padding: 0.2em 0.1em;
border: 0.1em solid gold;
box-sizing: border-box;
overflow-y: hidden;
min-height: fit-content;
}
.mention:hover {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "noita-together",
"private": true,
"version": "0.11.0",
"version": "0.11.1",
"packageManager": "yarn@3.5.1",
"workspaces": [
"nt-app/",
Expand Down

0 comments on commit 884fb32

Please sign in to comment.