Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Message editing: render avatars for pills in the editor #2997

Merged
merged 18 commits into from
May 21, 2019
Merged

Message editing: render avatars for pills in the editor #2997

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
710338c
pass member and room to editor pills to get avatar url
bwindels May 17, 2019
3b598a1
set pill avatar through css variables to set on psuedo-element
bwindels May 17, 2019
a47e722
same height as normal pill
bwindels May 17, 2019
e58d844
move getInitialLetter to Avatar so we can reuse it for editor pills
bwindels May 20, 2019
c1b2f3d
make user pill avatars work in editor
bwindels May 20, 2019
5edfd01
remove unused _getInitialLetter
bwindels May 20, 2019
230e53f
move most of room avatar handling to Avatar, to reuse in editor pills
bwindels May 20, 2019
0e98b12
undo thinko of passing current room as pill room
bwindels May 20, 2019
df4f380
find room by alias in room pill
bwindels May 20, 2019
01ef1dd
style room pills correctly
bwindels May 20, 2019
5d80c3a
fallback to avatar bg color
bwindels May 20, 2019
2bacabc
apply 34px margin the mx_EventTile_content also has
bwindels May 20, 2019
b00a38a
apply mx_EventTile_content to editor, so it gets the same right margin
bwindels May 21, 2019
5d184b3
reuse mx_Pill styles for editor pills to avoid style duplication
bwindels May 21, 2019
7c03d71
give continued events a little bit of top padding
bwindels May 21, 2019
a75c948
don't cache DRP
bwindels May 21, 2019
fb03b5b
fix lint
bwindels May 21, 2019
e48e72c
pr feedback
bwindels May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ limitations under the License.

.mx_EventTile_continuation {
padding-top: 0px ! important;

&.mx_EventTile_isEditing {
padding-top: 5px ! important;
bwindels marked this conversation as resolved.
Show resolved Hide resolved
margin-top: -5px;
}
}

.mx_EventTile_isEditing {
Expand Down