gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2017-07-24 13:49:52 +00:00
parent de04cba41f e923847dac
commit 8445eb0959
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,8 @@
.mx_EventTile_content .markdown-body a.mx_UserPill, .mx_EventTile_content .markdown-body a.mx_UserPill,
.mx_UserPill { .mx_UserPill {
color: $primary-fg-color; color: $primary-fg-color;
background-color: $other-user-pill-bg-color;
padding-right: 5px;
} }
.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me { .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {

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

@ -20,6 +20,7 @@ $focus-brightness: 125%;
// red warning colour // red warning colour
$warning-color: #ff0064; $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064; $mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
$preview-bar-bg-color: #f7f7f7; $preview-bar-bg-color: #f7f7f7;

2
src/skins/vector/css/themes/_dark.scss
View File

@ -20,6 +20,8 @@ $focus-brightness: 200%;
// red warning colour // red warning colour
$warning-color: #ff0064; $warning-color: #ff0064;
$other-user-pill-bg-color: rgba(255, 255, 255, 0.15);
$preview-bar-bg-color: #333; $preview-bar-bg-color: #333;
// left-panel style muted accent color // left-panel style muted accent color