diff --git a/LICENSE b/LICENSE index 2071b23..06ac8ef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) +Copyright (c) 2022 hippoz Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index c0f50db..f24c632 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ Waffle is a simple, focused chat application and protocol meant to be self-hosted. +# License + +This software is licensed under the MIT license. The fonts included in this source tree (`frontend/public/assets/woff2`) and the Iosevka build plans (`frontend/webfonts/iosevka/private-build-plans.toml`) are licensed under the SIL Open Font License 1.1. Please visit https://github.com/be5invis/Iosevka/blob/master/LICENSE.md for more information. + # Hosting ## Docker diff --git a/frontend/public/assets/woff2/iosevka-aile-bold.woff2 b/frontend/public/assets/woff2/iosevka-aile-bold.woff2 deleted file mode 100644 index acb6836..0000000 Binary files a/frontend/public/assets/woff2/iosevka-aile-bold.woff2 and /dev/null differ diff --git a/frontend/public/assets/woff2/iosevka-aile-regular.woff2 b/frontend/public/assets/woff2/iosevka-aile-regular.woff2 deleted file mode 100644 index d5a9751..0000000 Binary files a/frontend/public/assets/woff2/iosevka-aile-regular.woff2 and /dev/null differ diff --git a/frontend/public/assets/woff2/iosevka-waffle-regular.woff2 b/frontend/public/assets/woff2/iosevka-waffle-regular.woff2 new file mode 100644 index 0000000..2d40d55 Binary files /dev/null and b/frontend/public/assets/woff2/iosevka-waffle-regular.woff2 differ diff --git a/frontend/public/global.css b/frontend/public/global.css index 01ae26c..4486739 100644 --- a/frontend/public/global.css +++ b/frontend/public/global.css @@ -1,25 +1,18 @@ @font-face { - font-family: 'Iosevka Aile Web'; + font-family: "Iosevka Waffle Web"; font-display: swap; font-weight: 400; font-stretch: normal; font-style: normal; - src: url('assets/woff2/iosevka-aile-regular.woff2') format('woff2'); + src: url('assets/woff2/iosevka-waffle-regular.woff2') format('woff2'); } -@font-face { - font-family: 'Iosevka Aile Web'; - font-display: swap; - font-weight: 700; - font-stretch: normal; - font-style: normal; - src: url('assets/woff2/iosevka-aile-bold.woff2') format('woff2'); -} :root { + --background-color-0: hsl(180, 11%, 6%); --background-color-1: hsl(180, 11%, 7%); - --background-color-2: hsl(180, 11%, 12%); - --background-color-3: hsl(180, 11%, 17%); + --background-color-2: hsl(180, 11%, 11%); + --background-color-3: hsl(180, 11%, 15%); --foreground-color-1: rgb(253, 254, 255); --foreground-color-2: rgb(218, 219, 220); --foreground-color-3: rgb(153, 154, 155); @@ -63,15 +56,15 @@ } html, body { - width: var(--100vw); - height: var(--100vh); + width: 100%; + height: 100%; } body { color: var(--foreground-color-1); background-color: var(--background-color-1); font-size: 100%; - font-family: "Iosevka Aile Web", sans-serif; + font-family: "Iosevka Waffle Web", sans-serif; font-weight: 400; line-height: 1.75; @@ -101,7 +94,6 @@ body { padding-right: var(--space-sm); padding-top: var(--space-xs); padding-bottom: var(--space-xs); - border-bottom: 1px solid var(--background-color-2); flex-grow: 0; flex-shrink: 0; } diff --git a/frontend/src/components/MessageInput.svelte b/frontend/src/components/MessageInput.svelte index 883cecd..e11ff8a 100644 --- a/frontend/src/components/MessageInput.svelte +++ b/frontend/src/components/MessageInput.svelte @@ -6,10 +6,13 @@ export let channel; let messageInput = ""; + let messageTextarea; $: messages = messagesStoreProvider.getStore(channel.id); const sendMessage = async () => { + messageTextarea.focus(); + if (messageInput.trim() === "" || !$userInfoStore) return; @@ -93,6 +96,7 @@ rows="1" on:keydown={ onKeydown } bind:value={ messageInput } + bind:this={ messageTextarea } /> {#if $smallViewport}