PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-07-14 17:04:10 +00:00
commit ac0d29dc06
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View file

@ -3,17 +3,21 @@
// --Matthew // --Matthew
.mx_UserPill { .mx_UserPill {
color: white; color: $accent-fg-color;
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: $rte-room-pill-color;
color: $accent-color; color: $accent-fg-color;
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;

1
src/skins/vector/css/themes/_base.scss
View file

@ -78,6 +78,7 @@ $voip-accept-color: #80f480;
$rte-bg-color: #e9e9e9; $rte-bg-color: #e9e9e9;
$rte-code-bg-color: rgba(0, 0, 0, 0.04); $rte-code-bg-color: rgba(0, 0, 0, 0.04);
$rte-room-pill-color: #aaa;
// ******************** // ********************