Compare commits

..

No commits in common. "473101a15e963e74c1f2930acbb55fabd4ab1eb2" and "3c91be9fb697e4e05976d5d6818709a1a928d65b" have entirely different histories.

2 changed files with 4 additions and 14 deletions

View File

@ -392,19 +392,11 @@ mergeRooms r1 r2 =
}
mergeSyncResponse : SyncResponse -> SyncResponse -> SyncResponse
mergeSyncResponse l r = filterUselessState <|
mergeSyncResponse l r =
{ r | rooms = mergeMaybe mergeRooms l.rooms r.rooms
, accountData = mergeMaybe mergeAccountData l.accountData r.accountData
}
filterUselessState : SyncResponse -> SyncResponse
filterUselessState sr =
let
filterUselessRoomState _ r = { r | state = Maybe.map (\s -> { s | events = Maybe.map (List.filter (((==) "m.room.name") << .type_)) s.events }) r.state }
filterUselessRoomsState rs = { rs | join = Maybe.map (Dict.map filterUselessRoomState) rs.join }
in
{ sr | rooms = Maybe.map (filterUselessRoomsState) sr.rooms }
appendRoomHistoryResponse : JoinedRoom -> HistoryResponse -> JoinedRoom
appendRoomHistoryResponse jr hr =
let

View File

@ -2,8 +2,8 @@
$primary-color: #53C0FA;
$primary-color-highlight: #4298C7;
$primary-color-light: #9FDBFB;
$active-input-color: #282d30;
$background-color: #1b1e21;
$active-input-color: white;
$background-color: #fafafa;
$background-color-dark: darken($background-color, 4%);
$error-color: #f01d43;
$error-color-dark: darken(#f01d43, 10%);
@ -22,7 +22,6 @@ body {
margin: 0px;
background-color: $background-color;
font-size: 12px;
color: white;
}
@mixin input-common {
@ -38,7 +37,7 @@ body {
input, textarea {
@include input-common();
background-color: $inactive-input-color;
color: white;
color: black;
border: .5px solid $inactive-input-border-color;
&:focus {
@ -276,7 +275,6 @@ span.sender-wrapper {
text-overflow: ellipsis;
overflow: hidden;
vertical-align: bottom; /* Fix for overflow changing element height */
color: black;
}
/**