OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

CSS for decorated matrix.to links in the composer

pull/4583/head
Luke Barnard 2017-07-14 17:23:16 +01:00
parent 5e259ec176
commit 38899c6011
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View File

@ -5,15 +5,19 @@
.mx_UserPill { .mx_UserPill {
color: white; color: white;
background-color: $accent-color; background-color: $accent-color;
padding: 2px 8px; padding: 1px 5px 0px 2px;
border-radius: 16px; border-radius: 16px;
} }
.mx_UserPill img, .mx_RoomPill img {
vertical-align: -2px;
margin-right: 1px
}
.mx_RoomPill { .mx_RoomPill {
background-color: white; background-color: #aaa;
color: $accent-color; color: white;
border: 1px solid $accent-color; padding: 1px 5px 0px 2px;
padding: 2px 8px;
border-radius: 16px; border-radius: 16px;
} }

5
src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
View File

@ -100,6 +100,11 @@ limitations under the License.
word-break: break-word; word-break: break-word;
} }
.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
/* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
padding-top: 2px;
}
.mx_MessageComposer_input blockquote { .mx_MessageComposer_input blockquote {
color: $blockquote-fg-color; color: $blockquote-fg-color;
margin: 0 0 16px; margin: 0 0 16px;