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
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
style room pills correctly
  • Loading branch information
bwindels committed May 20, 2019
commit 01ef1dd20e920650268cac8aae3b8d0f184615cc
12 changes: 10 additions & 2 deletions res/css/views/elements/_MessageEditor.scss
Original file line number Diff line number Diff line change
@@ -40,13 +40,21 @@ limitations under the License.
color: white;
}

span.room-pill {
color: $accent-fg-color;
background-color: $rte-room-pill-color;
}

span.user-pill {
color: $primary-fg-color;
background-color: $other-user-pill-bg-color;
}

span.user-pill, span.room-pill {
bwindels marked this conversation as resolved.
Show resolved Hide resolved
height: 20px;
line-height: 20px;
border-radius: 16px;
display: inline-block;
color: $primary-fg-color;
background-color: $other-user-pill-bg-color;
padding-left: 21px;
padding-right: 5px;
position: relative;