diff --git a/README.md b/README.md deleted file mode 100644 index 75b3ef3..0000000 --- a/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Carbon Chat - -Carbon is the Matrix client for Discord refugees. - -## The dream - -Carbon's planned features, compared to Discord: - -- End to end encryption -- $0 per-account custom emojis and custom emoji packs -- Uses the open Matrix and Mumble systems -- Much better IRC layout -- Probably more - -Carbon's planned features, compared to Element: - -- Get rid of the unmanageable combined rooms list -- Groups like Discord's guilds - - Always have one group selected at a time - - Synchronised membership, moderators, power levels and bans - - Ordered channel list - - Unread indicators -- Add existing channels to groups -- Pin any channel to the groups bar -- Tidy Mumble integration to add voice channels -- More reliable unreads -- Per-account custom emojis (Ponies+FluffyChat integration) and custom emoji packs -- Slightly better IRC layout -- Probably more - -## The reality - -Carbon is currently _technically_ usable as a chat app, but is very -early in development. These important features still need to be -implemented: - -- Login GUI -- Unreads -- Chat history -- Formatting -- Emojis -- Reactions -- Groups v2 -- Group management -- Pinned channels -- Mumble integration - -## The code - -### Building - - npm install -D - npm run rebuild - -### Hosting - -Send the files from the `build` folder to a static file server. Apply -a long cache-control header to everything served under `/static`, and -no cache-control header to everything else. - -### Developing - - npm run watch - -Files will be rebuilt as you save them. diff --git a/build/index.html b/build/index.html index fa53161..1304e78 100644 --- a/build/index.html +++ b/build/index.html @@ -2,7 +2,7 @@
- + diff --git a/build/static/Timeline.js b/build/static/Timeline.js index 9917522..a957a1c 100644 --- a/build/static/Timeline.js +++ b/build/static/Timeline.js @@ -81,11 +81,11 @@ class Sender { this.avatar.clearChildren() if (this.sender.value().content.avatar_url) { this.avatar.child( - ejs("img").class("c-message-group__icon").attribute("src", resolveMxc(this.sender.value().content.avatar_url, 96, "crop")) + ejs("img").class("c-message-group__icon").attribute("src", resolveMxc(this.sender.value().content.avatar_url, 32, "crop")) ) } else { this.avatar.child( - ejs("div").class("c-message-group__icon", "c-message-group__icon--no-icon") + ejs("div").class("c-message-group__icon") ) } } diff --git a/build/static/main.css b/build/static/main.css index e78cd1a..a813b7e 100644 --- a/build/static/main.css +++ b/build/static/main.css @@ -155,11 +155,9 @@ body { cursor: pointer; } .c-message-group__icon { - width: 40px; - height: 40px; + width: 32px; + height: 32px; border-radius: 50%; -} -.c-message-group__icon--no-icon { background-color: #48d; } .c-message-group__intro { diff --git a/src/js/Timeline.js b/src/js/Timeline.js index 9917522..a957a1c 100644 --- a/src/js/Timeline.js +++ b/src/js/Timeline.js @@ -81,11 +81,11 @@ class Sender { this.avatar.clearChildren() if (this.sender.value().content.avatar_url) { this.avatar.child( - ejs("img").class("c-message-group__icon").attribute("src", resolveMxc(this.sender.value().content.avatar_url, 96, "crop")) + ejs("img").class("c-message-group__icon").attribute("src", resolveMxc(this.sender.value().content.avatar_url, 32, "crop")) ) } else { this.avatar.child( - ejs("div").class("c-message-group__icon", "c-message-group__icon--no-icon") + ejs("div").class("c-message-group__icon") ) } } diff --git a/src/sass/components/messages.sass b/src/sass/components/messages.sass index 3b49265..6284254 100644 --- a/src/sass/components/messages.sass +++ b/src/sass/components/messages.sass @@ -17,13 +17,11 @@ cursor: pointer &__icon - $size: 40px + $size: 32px width: $size height: $size border-radius: 50% - - &--no-icon - background-color: #48d + background-color: #48d &__intro display: flex