Skip to content

Commit

Permalink
final?
Browse files Browse the repository at this point in the history
(no, probably not)
  • Loading branch information
Ember-ruby committed Jul 1, 2024
1 parent b357b30 commit 3204d02
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
6 changes: 3 additions & 3 deletions app/javascript/flavours/blobfox/components/status_content.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -375,16 +375,16 @@ class StatusContent extends PureComponent {
parseInt(collapseHeight)
)

if (collapsedHeight <= 20) (
collapsedHeight = 20
if (collapsedHeight <= 40) (
collapsedHeight = 40
)

if (status.get('media_attachments').size && !muted) {
collapsedHeight += 210;
}

if (!autoCollapse) (
collapsedHeight = 20
collapsedHeight = 40
)

if (status.get('spoiler_text').length > 0) {
Expand Down
17 changes: 10 additions & 7 deletions app/javascript/flavours/blobfox/styles/components/status.scss
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
}

.status__content {
height: 20px;
height: 40px;
overflow: hidden;
text-overflow: ellipsis;

Expand All @@ -341,8 +341,9 @@
inset-inline-start: 0;
inset-inline-end: 0;
background: linear-gradient(
rgba($ui-base-color, 0) 20%,
rgba($ui-base-color, 1)
to top,
rgba($ui-base-color, 1) 0.1em,
rgba($ui-base-color, 0) 6em
);
pointer-events: none;
}
Expand All @@ -354,15 +355,17 @@

&:focus > .status__content::after {
background: linear-gradient(
rgba(lighten($ui-base-color, 4%), 0) 20%,
rgba(lighten($ui-base-color, 4%), 1)
to top,
rgba(lighten($ui-base-color, 4%), 1) 0.1em,
rgba(lighten($ui-base-color, 4%), 0) 6em
);
}

&.status-direct > .status__content::after {
background: linear-gradient(
rgba(mix($ui-base-color, $ui-highlight-color, 95%), 0) 20%,
rgba(mix($ui-base-color, $ui-highlight-color, 95%), 1)
to top,
rgba(mix($ui-base-color, $ui-highlight-color, 95%), 1) 0.1em,
rgba(mix($ui-base-color, $ui-highlight-color, 95%), 0) 6em
);
}

Expand Down

0 comments on commit 3204d02

Please sign in to comment.