Compare commits
2 commits
3e28d4b6e1
...
3fc8104bdd
Author | SHA1 | Date | |
---|---|---|---|
3fc8104bdd | |||
c21ab3b90f |
4 changed files with 27 additions and 30 deletions
|
@ -282,7 +282,6 @@ class Timeline extends Subscribable {
|
||||||
if (eventData.type === "m.room.message" && eventData.content["m.relates_to"] && eventData.content["m.relates_to"].rel_type === "m.replace") {
|
if (eventData.type === "m.room.message" && eventData.content["m.relates_to"] && eventData.content["m.relates_to"].rel_type === "m.replace") {
|
||||||
const replaces = eventData.content["m.relates_to"].event_id
|
const replaces = eventData.content["m.relates_to"].event_id
|
||||||
if (this.map.has(replaces)) {
|
if (this.map.has(replaces)) {
|
||||||
console.log(eventData)
|
|
||||||
const event = this.map.get(replaces)
|
const event = this.map.get(replaces)
|
||||||
event.data.content = eventData.content["m.new_content"]
|
event.data.content = eventData.content["m.new_content"]
|
||||||
event.setEdited(eventData.origin_server_ts)
|
event.setEdited(eventData.origin_server_ts)
|
||||||
|
|
|
@ -1,29 +1,28 @@
|
||||||
doctype html
|
doctype html
|
||||||
html
|
html
|
||||||
head
|
head
|
||||||
meta(charset="utf-8")
|
meta(charset="utf-8")
|
||||||
link(rel="stylesheet" type="text/css" href=getStatic("/sass/login.sass"))
|
link(rel="stylesheet" type="text/css" href=getStatic("/sass/login.sass"))
|
||||||
title Carbon
|
title Carbon
|
||||||
meta(name="viewport" content= "width=device-width, initial-scale=1.0")
|
meta(name="viewport" content="width=device-width, initial-scale=1")
|
||||||
|
|
||||||
body
|
body
|
||||||
main.main
|
main.main
|
||||||
div.center-login-container
|
.center-login-container
|
||||||
h1 Welcome to the Matrix!
|
h1 Welcome to the Matrix!
|
||||||
form.login-form
|
form.login-form
|
||||||
div.data-input
|
.data-input
|
||||||
div.form-input-container
|
.form-input-container
|
||||||
label(for="login") Username
|
label(for="login") Username
|
||||||
input(type="text" name="login" autocomplete="username" required)#login
|
input(type="text" name="login" autocomplete="username" required)#login
|
||||||
div.form-input-container
|
|
||||||
|
.form-input-container
|
||||||
label(for="password") Password
|
label(for="password") Password
|
||||||
input(name="password" autocomplete="current-password" type="password" required)#password
|
input(name="password" autocomplete="current-password" type="password" required)#password
|
||||||
div.form-input-container
|
|
||||||
|
.form-input-container
|
||||||
|
label(for="homeserver") Homeserver
|
||||||
label(for="homeserver") Homeserver
|
input(type="text" name="homeserver" value="matrix.org" required)#homeserver
|
||||||
input(type="text" name="homeserver" value="matrix.org" required)#homeserver
|
|
||||||
div.form-input-container
|
.form-input-container
|
||||||
|
input(type="submit" value="Login")
|
||||||
input(type="submit" value="Login")
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ $out-width: $base-width + rooms.$list-width
|
||||||
&__container
|
&__container
|
||||||
width: $out-width
|
width: $out-width
|
||||||
padding: $icon-padding
|
padding: $icon-padding
|
||||||
|
box-sizing: border-box
|
||||||
|
|
||||||
.c-group
|
.c-group
|
||||||
display: flex
|
display: flex
|
||||||
|
|
|
@ -27,8 +27,7 @@
|
||||||
|
|
||||||
.data-input
|
.data-input
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
|
|
||||||
.form-input-container
|
.form-input-container
|
||||||
width: 100%
|
width: 100%
|
||||||
display: flex
|
display: flex
|
||||||
|
@ -55,4 +54,3 @@ input[type="submit"]:hover
|
||||||
|
|
||||||
label
|
label
|
||||||
font-size: 1.2em
|
font-size: 1.2em
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue