Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts: # CHANGELOG.md # src/components/status/status.js # src/components/status/status.scss
This commit is contained in:
commit
8a34ff2957
41 changed files with 568 additions and 143 deletions
|
@ -36,6 +36,11 @@ $status-margin: 0.75em;
|
|||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
&.-conversation {
|
||||
border-left-width: 4px;
|
||||
border-left-style: solid;
|
||||
}
|
||||
|
||||
.status-container {
|
||||
display: flex;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue