Skip to content

Commit cb4f57e

Browse files
lukebarnard1lukebarnard1
authored
Merge pull request element-hq#4583 from vector-im/luke/feature-rte-pills
CSS for decorated matrix.to links in the composer
2 parents 1690f87 + a1b4b99 commit cb4f57e

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

‎src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33
// --Matthew
44

55
.mx_UserPill {
6-
color: white;
6+
color: $accent-fg-color;
77
background-color: $accent-color;
8-
padding: 2px 8px;
8+
padding: 1px 5px 0px 2px;
99
border-radius: 16px;
1010
}
1111

12+
.mx_UserPill img, .mx_RoomPill img {
13+
vertical-align: -2px;
14+
margin-right: 1px
15+
}
16+
1217
.mx_RoomPill {
13-
background-color: white;
14-
color: $accent-color;
15-
border: 1px solid $accent-color;
16-
padding: 2px 8px;
18+
background-color: $rte-room-pill-color;
19+
color: $accent-fg-color;
20+
padding: 1px 5px 0px 2px;
1721
border-radius: 16px;
1822
}
1923

‎src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ limitations under the License.
100100
word-break: break-word;
101101
}
102102

103+
.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
104+
/* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
105+
padding-top: 2px;
106+
}
107+
103108
.mx_MessageComposer_input blockquote {
104109
color: $blockquote-fg-color;
105110
margin: 0 0 16px;

‎src/skins/vector/css/themes/_base.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ $voip-accept-color: #80f480;
7878

7979
$rte-bg-color: #e9e9e9;
8080
$rte-code-bg-color: rgba(0, 0, 0, 0.04);
81+
$rte-room-pill-color: #aaa;
8182

8283
// ********************
8384

0 commit comments

Comments
 (0)