luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into gh-1059-fix-empty-placeholder-in-card-dialog

Browse source
This commit is contained in:
kamre 2021-08-27 15:37:31 +07:00 committed by GitHub
commit bd13e8f1e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/components/table/table.scss
View file

@ -93,7 +93,6 @@
font-size: 14px; font-size: 14px;
position: relative; position: relative;
text-overflow: ellipsis; text-overflow: ellipsis;
align-items: center;
&:hover { &:hover {
background-color: rgba(var(--center-channel-color-rgb), 0.05); background-color: rgba(var(--center-channel-color-rgb), 0.05);
@ -197,6 +196,10 @@
.table-row-container { .table-row-container {
width: fit-content; width: fit-content;
.octo-table-cell {
align-items: center;
}
} }
.octo-table-footer { .octo-table-footer {

3
webapp/src/wsclient.ts
View file

@ -2,6 +2,7 @@
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {Utils} from './utils' import {Utils} from './utils'
import {Block} from './blocks/block' import {Block} from './blocks/block'
import {OctoUtils} from './octoUtils'
// These are outgoing commands to the server // These are outgoing commands to the server
type WSCommand = { type WSCommand = {
@ -232,7 +233,7 @@ class WSClient {
private queueUpdateNotification(block: Block) { private queueUpdateNotification(block: Block) {
this.updatedBlocks = this.updatedBlocks.filter((o) => o.id !== block.id) // Remove existing queued update this.updatedBlocks = this.updatedBlocks.filter((o) => o.id !== block.id) // Remove existing queued update
this.updatedBlocks.push(block) this.updatedBlocks.push(OctoUtils.hydrateBlock(block))
if (this.updateTimeout) { if (this.updateTimeout) {
clearTimeout(this.updateTimeout) clearTimeout(this.updateTimeout)
this.updateTimeout = undefined this.updateTimeout = undefined