alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further reduce CSS differences with upstream (#2638)

remotes/1723507292310805857/main
Claire 2024-02-21 17:50:41 +01:00 committed by GitHub
parent bf6e57b420
commit 154a3119fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 66 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
app/javascript/flavours/glitch/styles/components.scss
View File

@ -852,21 +852,33 @@ body > [data-popper-placement] {
clear: both; clear: both;
} }
.status__content,
.reply-indicator__content { .reply-indicator__content {
position: relative; position: relative;
font-size: 14px; font-size: 15px;
line-height: 20px; line-height: 20px;
word-wrap: break-word; word-wrap: break-word;
font-weight: 400; font-weight: 400;
overflow: hidden; overflow: hidden;
padding-top: 5px; text-overflow: ellipsis;
color: $inverted-text-color; padding-top: 2px;
white-space: pre-wrap; color: $primary-text-color;
&:focus {
outline: 0;
}
.emojione {
width: 20px;
height: 20px;
margin: -3px 0 0;
}
p, p,
pre { pre {
margin-bottom: 20px; margin-bottom: 20px;
white-space: pre-wrap; white-space: pre-wrap;
unicode-bidi: plaintext;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
@ -874,8 +886,9 @@ body > [data-popper-placement] {
} }
a { a {
color: $lighter-text-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
unicode-bidi: isolate;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
@ -892,10 +905,45 @@ body > [data-popper-placement] {
} }
} }
.emojione { a.unhandled-link {
width: 20px; color: $highlight-text-color;
height: 20px;
margin: -5px 0 0; .link-origin-tag {
color: $gold-star;
font-size: 0.8em;
}
}
.status__content__spoiler-link {
background: $action-button-color;
&:hover,
&:focus {
background: lighten($action-button-color, 7%);
text-decoration: none;
}
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
}
}
.status__content {
overflow: visible;
.status__content__spoiler {
display: none;
&.status__content__spoiler--visible {
display: block;
}
} }
} }
@ -1503,6 +1551,15 @@ body > [data-popper-placement] {
line-height: 18px; line-height: 18px;
} }
.reply-indicator__content {
color: $inverted-text-color;
font-size: 14px;
a {
color: $lighter-text-color;
}
}
.domain { .domain {
padding: 10px; padding: 10px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
@ -5204,84 +5261,6 @@ a.status-card {
} }
} }
.status__content {
position: relative;
font-size: 15px;
line-height: 20px;
word-wrap: break-word;
font-weight: 400;
overflow: visible;
padding-top: 5px;
&:focus {
outline: 0;
}
.emojione {
width: 20px;
height: 20px;
margin: -3px 0 0;
}
p,
pre {
margin-bottom: 20px;
white-space: pre-wrap;
unicode-bidi: plaintext;
&:last-child {
margin-bottom: 0;
}
}
a {
color: $secondary-text-color;
text-decoration: none;
unicode-bidi: isolate;
&:hover {
text-decoration: underline;
}
&.mention {
&:hover {
text-decoration: none;
span {
text-decoration: underline;
}
}
}
}
.status__content__spoiler {
display: none;
&.status__content__spoiler--visible {
display: block;
}
}
a.unhandled-link {
color: $highlight-text-color;
.link-origin-tag {
color: $gold-star;
font-size: 0.8em;
}
}
.status__content__spoiler-link {
background: lighten($ui-base-color, 30%);
&:hover,
&:focus {
background: lighten($ui-base-color, 33%);
text-decoration: none;
}
}
}
.notif-cleaning { .notif-cleaning {
.status, .status,
.notification { .notification {