diff --git a/web/src/app/app.php b/web/src/app/app.php index 7bfd557..65312f3 100644 --- a/web/src/app/app.php +++ b/web/src/app/app.php @@ -23,7 +23,7 @@ $actor = $database->getActorByUsername($user->username);
+ style="height: 2em; max-width: var(--meet_max_width)">
diff --git a/web/src/app/css/app.css b/web/src/app/css/app.css index 4284656..4f79d68 100644 --- a/web/src/app/css/app.css +++ b/web/src/app/css/app.css @@ -177,7 +177,7 @@ main { max-width: var(--meet_max_width); z-index: 10; } -.meet.item .status-content.full .text { padding-top: 2em } +.meet.item .status-content.full .text { padding-top: 3em } .meet.item .status-content .text { margin: 0; padding: 1em; @@ -187,7 +187,7 @@ main { } .meet.item .status-content .text p { margin: 0 !important; - line-height: 1.3em; + line-height: 1.4em; } .meet.item .status-content .text a { text-decoration: none; diff --git a/web/src/app/js/pages/meet.js b/web/src/app/js/pages/meet.js index 8c6df1d..a38ca5c 100644 --- a/web/src/app/js/pages/meet.js +++ b/web/src/app/js/pages/meet.js @@ -106,8 +106,7 @@ app.pages.meet = { ` 
${t1}
`; ptext.innerHTML = value; if (!app.post.collapsed(id, true)) - app.post.collapse(id, [t1, t2], - false, app.pages.meet.onPostCollapse); + app.post.collapse(id, [t1, t2], false, app.pages.meet.onPostCollapse); } } } @@ -140,12 +139,21 @@ app.pages.meet = { onPostCollapse: function(id, state) { id = id.replace(/^meet/, ''); const elem = document.querySelector(`*[data-id="${id}"] .status-content`); - if (state === 'uncollapsed') + if (state === 'uncollapsed') { elem.classList.add('full'); - else if (state === 'collapsed') + elem.classList.add('height-mobile'); + app.pages.meet.actions._hide(); + calcHeightMobile(); + } else if (state === 'collapsed') { elem.classList.remove('full'); + elem.classList.remove('height-mobile'); + elem.style.height = ''; + app.pages.meet.actions._show(); + } }, actions: { + _hide: function() { document.querySelector('#page-meet #actions').style.display = 'none' }, + _show: function() { document.querySelector('#page-meet #actions').style.display = '' }, crush: function() { document.activeElement.blur(); const current = app.pages.meet.dataCurrent(); @@ -196,6 +204,10 @@ app.pages.meet = { app.pages.meet.carousel.setDragEvent(direction); calcHeightMobile(); + if (app.post.collapsed('meet'+current._id, true) === false) + app.pages.meet.actions._hide(); + else app.pages.meet.actions._show(); + const trail = document.querySelector('#page-meet #trail'); const index = app.pages.meet.carousel._current; if (trail !== null) {