diff --git a/webapp/titanembeds/static/css/embedstyle.css b/webapp/titanembeds/static/css/embedstyle.css index 92bb5c9..ea1ef46 100644 --- a/webapp/titanembeds/static/css/embedstyle.css +++ b/webapp/titanembeds/static/css/embedstyle.css @@ -262,6 +262,7 @@ nav .brand-logo { } .footercontainer { + display: flex; width: 100%; position: relative; margin: 10px; @@ -276,6 +277,28 @@ nav .brand-logo { #messageboxouter { width: 100%; overflow: hidden; + height: 46px; +} + +.input-field.inline { + display: inline-block; + vertical-align: middle; + margin-left: 0px; +} + +textarea.materialize-textarea { + overflow-y: hidden; + padding: 8px 0px 0px 5px; + resize: none; + min-height: 50px; + margin: 0px 0px 0px 0px; + line-height: initial; + border-bottom: none; +} + +textarea.materialize-textarea:focus:not([readonly]) { + border-bottom: none; + box-shadow: none; } .currentuserchip { @@ -287,11 +310,17 @@ nav .brand-logo { background-color: #455a64; } +#currentuserimage_parent { + display: inline-block; + vertical-align: middle; +} + .currentuserimage { width: 30px; } .currentusername { + display: inline-block; position: relative; top: 7px; left: 5px; @@ -308,7 +337,6 @@ nav .brand-logo { } #currentuserimage { - margin-top: 4px; margin-right: 4px; } @@ -354,14 +382,6 @@ a { text-decoration: underline; } -#fetching-indicator { - position: absolute; - right: 1vw; - bottom: 13px; - width: 25px; - height: 25px; -} - .brand-logo img { width: 25px; margin-right: 10px; diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js index fab7f9d..7e08a94 100644 --- a/webapp/titanembeds/static/js/embed.js +++ b/webapp/titanembeds/static/js/embed.js @@ -976,7 +976,6 @@ var channel_id = selected_channel; var fet; var jumpscroll; - $("#fetching-indicator").fadeIn(800); if (last_message_id == null) { $("#chatcontent").empty(); fet = fetch(channel_id); @@ -1020,9 +1019,6 @@ } setVisitorMode(true); }); - fet.always(function() { - $("#fetching-indicator").fadeOut(800); - }); } function process_message_users_cache() { diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2 index a99245e..b231916 100644 --- a/webapp/titanembeds/templates/embed.html.j2 +++ b/webapp/titanembeds/templates/embed.html.j2 @@ -165,24 +165,13 @@