cadence/Carbon
3
9
Fork 1
Code Issues 14 Pull requests 1 Releases Wiki Activity

Compare commits

base: cadence:3fc8104bdd52334cfc98e8cbce66cc840b528d62
Branches Tags
cadence:princess
cadence:fix/login-improvements
..
compare: cadence:3e28d4b6e17875583a4011464e089cdd88a7a6b4
Branches Tags
cadence:princess
cadence:fix/login-improvements

No commits in common. "3fc8104bdd52334cfc98e8cbce66cc840b528d62" and "3e28d4b6e17875583a4011464e089cdd88a7a6b4" have entirely different histories.
3fc8104bdd ... 3e28d4b6e1

4 changed files with 30 additions and 27 deletions
Show stats Expand all files Collapse all files

1
src/js/Timeline.js
View file

@ -282,6 +282,7 @@ 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)

15
src/login.pug
View file

@ -4,25 +4,26 @@ html
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") meta(name="viewport" content= "width=device-width, initial-scale=1.0")
body body
main.main main.main
.center-login-container div.center-login-container
h1 Welcome to the Matrix! h1 Welcome to the Matrix!
form.login-form form.login-form
.data-input div.data-input
.form-input-container div.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")

1
src/sass/components/groups.sass
View file

@ -33,7 +33,6 @@ $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

2
src/sass/login.sass
View file

@ -28,6 +28,7 @@
.data-input .data-input
width: 100% width: 100%
.form-input-container .form-input-container
width: 100% width: 100%
display: flex display: flex
@ -54,3 +55,4 @@ input[type="submit"]:hover
label label
font-size: 1.2em font-size: 1.2em