diff --git a/crates/app/src/assets.rs b/crates/app/src/assets.rs index 8dd050f..e140d79 100644 --- a/crates/app/src/assets.rs +++ b/crates/app/src/assets.rs @@ -29,6 +29,7 @@ pub const STYLE_CSS: &str = include_str!("./public/css/style.css"); pub const LOADER_JS: &str = include_str!("./public/js/loader.js"); pub const ATTO_JS: &str = include_str!("./public/js/atto.js"); pub const ME_JS: &str = include_str!("./public/js/me.js"); +pub const STREAMS_JS: &str = include_str!("./public/js/streams.js"); // html pub const ROOT: &str = include_str!("./public/html/root.html"); diff --git a/crates/app/src/public/html/chats/app.html b/crates/app/src/public/html/chats/app.html index 58a9dec..e913e4f 100644 --- a/crates/app/src/public/html/chats/app.html +++ b/crates/app/src/public/html/chats/app.html @@ -250,6 +250,7 @@ height: calc(100dvh - 42px); overflow: auto; transition: left 0.15s; + z-index: 1; } .sidebar .title { @@ -286,14 +287,8 @@ display: flex !important; } - .floating_message_actions { - position: absolute; - top: 0.25rem; - right: 1rem; - } - .message.grouped { - padding: 0.25rem 0 0.25rem calc(1rem + 0.5rem + 52px); + padding: 0.25rem 1rem 0.25rem calc(1rem + 0.5rem + 52px); } turbo-frame { display: contents; @@ -301,7 +296,7 @@ @media screen and (max-width: 900px) { .message.grouped { - padding: 0.25rem 0 0.25rem calc(1rem + 0.5rem + 39px); + padding: 0.25rem 1rem 0.25rem calc(1rem + 0.5rem + 39px); } body:not(.sidebars_shown) .sidebar { diff --git a/crates/app/src/public/html/components.html b/crates/app/src/public/html/components.html index e8d4b98..ed97e3f 100644 --- a/crates/app/src/public/html/components.html +++ b/crates/app/src/public/html/components.html @@ -959,14 +959,18 @@ can_manage_message=false, grouped=false) -%} can_manage_message=can_manage_message) }} - {% else %} - {% endif %} - {{ message.content|markdown|safe }} +
+ {{ message.content|markdown|safe }} + + {% if grouped %} + + {% endif %} +
{%- endmacro %} diff --git a/crates/app/src/public/html/root.html b/crates/app/src/public/html/root.html index 747aaba..331b8c2 100644 --- a/crates/app/src/public/html/root.html +++ b/crates/app/src/public/html/root.html @@ -125,6 +125,7 @@ macros -%}