h

Ember-ruby · Jul 1, 2024 · f23cdc1 · f23cdc1
1 parent b3406b4
commit f23cdc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/javascript/flavours/blobfox/components/status_content.jsx b/app/javascript/flavours/blobfox/components/status_content.jsx
@@ -264,7 +264,6 @@ class StatusContent extends PureComponent {
   };
 
   componentDidMount () {
-    const { node } = this.divNode;
     const { clientHeight } = this.divNode;
     const {
       status,
@@ -288,7 +287,7 @@ class StatusContent extends PureComponent {
 
     // this.setState({ collapseHeight: true });
 
-    if (!autoCollapsed && parseInt(collapseHeight) < 30) {
+    if (!autoCollapsed || parseInt(collapseHeight) < 30) {
       this.setState({ collapsedHeight: 30 })
     } else {
       let tempCollapsedHeight = (
@@ -297,9 +296,8 @@ class StatusContent extends PureComponent {
       if (tempCollapsedHeight > clientHeight) (
         tempCollapsedHeight = clientHeight
       )
-      if (status.get('media_attachments').size && !muted) {
-        tempCollapsedHeight += 210;
-      }
+
+      tempCollapsedHeight = clientHeight;
       this.setState({ collapsedHeight: tempCollapsedHeight })
     }
   }

diff --git a/app/javascript/flavours/blobfox/styles/components/status.scss b/app/javascript/flavours/blobfox/styles/components/status.scss
@@ -329,7 +329,7 @@
     }
 
     .status__content {
-      height: 40px;
+      height: 30px;
       overflow: hidden;
       text-overflow: ellipsis;