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

properly style Group Pill

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-06-22 14:36:29 +01:00
parent d92d95c37d
commit 32ab997230
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
res/css/views/elements/_RichText.scss
View file

@ -37,12 +37,22 @@
/* More specific to override `.markdown-body a` color */ /* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_RoomPill, .mx_EventTile_content .markdown-body a.mx_RoomPill,
.mx_RoomPill { .mx_EventTile_content .markdown-body a.mx_GroupPill,
.mx_RoomPill,
.mx_GroupPill {
color: $accent-fg-color; color: $accent-fg-color;
background-color: $rte-room-pill-color; background-color: $rte-room-pill-color;
padding-right: 5px; padding-right: 5px;
} }
/* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_GroupPill,
.mx_GroupPill {
color: $accent-fg-color;
background-color: $rte-group-pill-color;
padding-right: 5px;
}
.mx_UserPill .mx_BaseAvatar, .mx_UserPill .mx_BaseAvatar,
.mx_RoomPill .mx_BaseAvatar, .mx_RoomPill .mx_BaseAvatar,
.mx_GroupPill .mx_BaseAvatar, .mx_GroupPill .mx_BaseAvatar,

1
res/themes/light/css/_base.scss
View file

@ -97,6 +97,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; $rte-room-pill-color: #aaa;
$rte-group-pill-color: #aaa;
// ******************** // ********************

2
src/components/views/elements/Pill.js
View file

@ -260,7 +260,7 @@ const Pill = React.createClass({
avatar = <BaseAvatar name={name || groupId} width={16} height={16} avatar = <BaseAvatar name={name || groupId} width={16} height={16}
url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />; url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
} }
pillClass = 'mx_RoomPill' || 'mx_GroupPill'; pillClass = 'mx_GroupPill';
} }
} }
break; break;