nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures

Browse Source 
Handle associated event send failures
This commit is contained in:
Bruno Windels
2019-07-03 09:02:58 +00:00
committed by GitHub
parent cf8eeedcc7 cca82635f3
commit 353f5a205c
8 changed files with 153 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/css/views/rooms/_EventTile.scss
View File

@@ -171,12 +171,19 @@ limitations under the License.
opacity: 0.4;
}
div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
--lozenge-color: $event-notsent-color !important;
--lozenge-border-color: $event-notsent-color !important;
}
.mx_EventTile_notSent {
color: $event-notsent-color;
}
.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody,
.mx_EventTile_redacted .mx_EventTile_reply .mx_UnknownBody {
--lozenge-color: $event-redacted-fg-color;
--lozenge-border-color: $event-redacted-border-color;
display: block;
width: 100%;
height: 22px;
@@ -184,18 +191,22 @@ limitations under the License.
border-radius: 11px;
background: repeating-linear-gradient(
-45deg,
$event-redacted-fg-color,
$event-redacted-fg-color 3px,
var(--lozenge-color),
var(--lozenge-color) 3px,
transparent 3px,
transparent 6px
);
box-shadow: 0px 0px 3px $event-redacted-border-color inset;
box-shadow: 0px 0px 3px var(--lozenge-border-color) inset;
}
.mx_EventTile_highlight,
.mx_EventTile_highlight .markdown-body
{
color: $warning-color;
{
color: $event-highlight-fg-color;
.mx_EventTile_line {
background-color: $event-highlight-bg-color;
}
}
.mx_EventTile_contextual {

3
res/themes/dark/css/_dark.scss
View File

@@ -121,6 +121,9 @@ $event-sending-color: $text-secondary-color;
$event-redacted-fg-color: #606060;
$event-redacted-border-color: #000000;
$event-highlight-fg-color: $warning-color;
$event-highlight-bg-color: $event-selected-color;
// event timestamp
$event-timestamp-color: $text-secondary-color;

10
res/themes/light/css/_light.scss
View File

@@ -196,11 +196,19 @@ $widget-menu-bar-bg-color: $secondary-accent-color;
// ********************
// both $event-highlight-bg-color and $room-warning-bg-color share this value,
// so to not make their order dependent on who depends on who, have a shared value
// defined before both
$yellow-background: #fff8e3;
// event tile lifecycle
$event-encrypting-color: #abddbc;
$event-sending-color: #ddd;
$event-notsent-color: #f44;
$event-highlight-fg-color: $warning-color;
$event-highlight-bg-color: $yellow-background;
// event redaction
$event-redacted-fg-color: #e2e2e2;
$event-redacted-border-color: #cccccc;
@@ -244,7 +252,7 @@ $togglesw-ball-color: #fff;
$progressbar-color: #000;
$room-warning-bg-color: #fff8e3;
$room-warning-bg-color: $yellow-background;
$memberstatus-placeholder-color: $roomtile-name-color;