Matrix-Programs/Scylla
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Compare commits

base: Matrix-Programs:473101a15e963e74c1f2930acbb55fabd4ab1eb2
Branches Tags
Matrix-Programs:master
..
compare: Matrix-Programs:3c91be9fb697e4e05976d5d6818709a1a928d65b
Branches Tags
Matrix-Programs:master

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

2 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

10
src/Scylla/Sync.elm
View File

@ -392,19 +392,11 @@ mergeRooms r1 r2 =
} }
mergeSyncResponse : SyncResponse -> SyncResponse -> SyncResponse mergeSyncResponse : SyncResponse -> SyncResponse -> SyncResponse
mergeSyncResponse l r = filterUselessState <| mergeSyncResponse l r =
{ r | rooms = mergeMaybe mergeRooms l.rooms r.rooms { r | rooms = mergeMaybe mergeRooms l.rooms r.rooms
, accountData = mergeMaybe mergeAccountData l.accountData r.accountData , 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 : JoinedRoom -> HistoryResponse -> JoinedRoom
appendRoomHistoryResponse jr hr = appendRoomHistoryResponse jr hr =
let let

8
static/scss/style.scss
View File

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