Merge branch 'fix-word-break' into 'develop'

Fix word breaks

See merge request pleroma/pleroma-fe!2129
This commit is contained in:
HJ 2025-04-08 07:22:02 +00:00
commit ed27be1efd
16 changed files with 34 additions and 30 deletions

View file

View file

@ -177,7 +177,8 @@
.text { .text {
flex: 2; flex: 2;
margin: 8px; margin: 8px;
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
h1 { h1 {
font-size: 1rem; font-size: 1rem;

View file

@ -17,7 +17,6 @@
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
word-wrap: break-word;
} }
.heading { .heading {

View file

@ -39,7 +39,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: inline; display: inline;
word-wrap: break-word;
overflow: hidden; overflow: hidden;
} }

View file

@ -127,7 +127,6 @@
max-width: 100%; max-width: 100%;
p { p {
word-wrap: break-word;
white-space: normal; white-space: normal;
overflow-x: hidden; overflow-x: hidden;
} }

View file

@ -72,7 +72,6 @@
flex: 1 1 0; flex: 1 1 0;
line-height: 1.2; line-height: 1.2;
white-space: normal; white-space: normal;
word-wrap: normal;
} }
.hidden { .hidden {

View file

@ -68,7 +68,8 @@
margin: 0.5em 0 0; margin: 0.5em 0 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
line-height: 1.2em; line-height: 1.2em;
/* cap description at 3 lines, the 1px is to clean up some stray pixels /* cap description at 3 lines, the 1px is to clean up some stray pixels

View file

@ -170,7 +170,8 @@ $modal-view-button-icon-margin: 0.5em;
min-height: 1em; min-height: 1em;
max-width: 500px; max-width: 500px;
max-height: 9.5em; max-height: 9.5em;
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
} }
.modal-image { .modal-image {

View file

@ -27,7 +27,6 @@
top: 100%; top: 100%;
left: 0; left: 0;
height: 100%; height: 100%;
word-wrap: normal;
white-space: nowrap; white-space: nowrap;
transition: opacity 0.2s ease; transition: opacity 0.2s ease;
z-index: 1; z-index: 1;

View file

@ -1,5 +1,6 @@
.MentionsLine { .MentionsLine {
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
.mention-link:not(:first-child)::before { .mention-link:not(:first-child)::before {
content: " "; content: " ";

View file

@ -2,8 +2,8 @@
.Notification { .Notification {
border-bottom: 1px solid; border-bottom: 1px solid;
border-color: var(--border); border-color: var(--border);
word-wrap: break-word; overflow-wrap: break-word;
word-break: break-all; text-wrap: pretty;
&.Status { &.Status {
/* stylelint-disable-next-line declaration-no-important */ /* stylelint-disable-next-line declaration-no-important */
@ -31,8 +31,6 @@
& .status-username, & .status-username,
& .mute-thread, & .mute-thread,
& .mute-words { & .mute-words {
word-wrap: normal;
word-break: normal;
white-space: nowrap; white-space: nowrap;
} }

View file

@ -128,7 +128,6 @@
.notification-details { .notification-details {
min-width: 0; min-width: 0;
word-wrap: break-word;
line-height: var(--post-line-height); line-height: var(--post-line-height);
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -161,7 +160,8 @@
} }
h1 { h1 {
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
margin: 0 0 0.3em; margin: 0 0 0.3em;
padding: 0; padding: 0;
font-size: 1em; font-size: 1em;

View file

@ -26,7 +26,8 @@
align-items: center; align-items: center;
padding: 0.1em 0.25em; padding: 0.1em 0.25em;
z-index: 1; z-index: 1;
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
} }
.result-percentage { .result-percentage {

View file

@ -205,6 +205,7 @@
min-height: calc(var(--post-line-height) * 1em); min-height: calc(var(--post-line-height) * 1em);
resize: none; resize: none;
background: transparent; background: transparent;
text-wrap: stable;
&.scrollable-form { &.scrollable-form {
overflow-y: auto; overflow-y: auto;

View file

@ -1,8 +1,8 @@
.Status { .Status {
min-width: 0; min-width: 0;
white-space: normal; white-space: normal;
word-wrap: break-word; overflow-wrap: break-word;
word-break: break-all; text-wrap: pretty;
&:hover { &:hover {
--_still-image-img-visibility: visible; --_still-image-img-visibility: visible;
@ -92,7 +92,10 @@
a { a {
display: inline-block; display: inline-block;
word-break: break-all; white-space: nowrap;
text-overflow: ellipsis;
overflow-x: hidden;
width: 100%
} }
} }
@ -283,8 +286,6 @@
& .status-username, & .status-username,
& .mute-reason { & .mute-reason {
word-wrap: normal;
word-break: normal;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;

View file

@ -14,8 +14,7 @@
& .summary { & .summary {
white-space: pre-wrap; white-space: pre-wrap;
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; text-wrap: pretty;
word-break: break-all;
line-height: var(--post-line-height); line-height: var(--post-line-height);
} }
@ -54,19 +53,22 @@
} }
.text-wrapper { .text-wrapper {
text-overflow: ellipsis;
overflow-wrap: break-word;
overflow: hidden;
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
&.-tall-status { &.-tall-status {
position: relative; position: relative;
height: 220px; height: 16em;
overflow: hidden; overflow: hidden;
z-index: 1; z-index: 1;
.media-body { .media-body {
min-height: 0; min-height: 0;
mask: mask:
linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat, linear-gradient(to top, white, transparent) bottom/100% 8em no-repeat,
linear-gradient(to top, white, white); linear-gradient(to top, white, white);
/* Autoprefixed seem to ignore this one, and also syntax is different */ /* Autoprefixed seem to ignore this one, and also syntax is different */
@ -87,16 +89,17 @@
& .status-unhider, & .status-unhider,
& .cw-status-hider { & .cw-status-hider {
display: inline-block; display: inline-block;
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.tall-status-hider { .tall-status-hider {
position: absolute; position: absolute;
height: 70px; height: 5em;
margin-top: 150px; margin-top: 10em;
line-height: 110px; line-height: 8em;
z-index: 2; z-index: 2;
} }
@ -107,7 +110,8 @@
& .status-unhider, & .status-unhider,
& .cw-status-hider { & .cw-status-hider {
word-break: break-all; overflow-wrap: break-word;
text-wrap: pretty;
svg { svg {
color: inherit; color: inherit;