mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Further reduce pointless CSS differences with upstream (#2665)

This commit is contained in:
Claire 2024-03-06 22:13:23 +01:00 committed by GitHub
parent a11151d58f
commit 8c9341a67b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1334,19 +1334,19 @@ body > [data-popper-placement] {
} }
.status__content__spoiler-link { .status__content__spoiler-link {
display: inline-flex; display: inline-flex; // glitch: media icon in spoiler button
border-radius: 2px; border-radius: 2px;
background: transparent; background: transparent;
border: 0; border: 0;
color: $inverted-text-color; color: $inverted-text-color;
font-weight: 700; font-weight: 700;
font-size: 11px; font-size: 11px;
padding: 0 5px; padding: 0 6px;
text-transform: uppercase; text-transform: uppercase;
line-height: inherit; line-height: 20px;
cursor: pointer; cursor: pointer;
vertical-align: top; vertical-align: top;
align-items: center; align-items: center; // glitch: content indicator
&:hover { &:hover {
background: lighten($ui-base-color, 33%); background: lighten($ui-base-color, 33%);
@ -1867,6 +1867,11 @@ body > [data-popper-placement] {
.audio-player { .audio-player {
margin-top: 8px; margin-top: 8px;
} }
.status__prepend {
padding: 0;
margin-bottom: 16px;
}
} }
.scrollable > div:first-child .detailed-status { .scrollable > div:first-child .detailed-status {
@ -2069,8 +2074,6 @@ body > [data-popper-placement] {
position: relative; position: relative;
& > div { & > div {
@include avatar-radius;
float: left; float: left;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
@ -2222,7 +2225,7 @@ a.account__display-name {
&:hover, &:hover,
&:focus { &:focus {
background: lighten($ui-base-color, 29%); background: lighten($ui-base-lighter-color, 7%);
text-decoration: none; text-decoration: none;
} }
} }
@ -4704,35 +4707,6 @@ a.status-card {
z-index: 100; z-index: 100;
} }
.media-spoiler {
background: $base-overlay-background;
color: $darker-text-color;
border: 0;
padding: 0;
width: 100%;
height: 100%;
border-radius: 4px;
appearance: none;
&:hover,
&:active,
&:focus {
padding: 0;
color: lighten($darker-text-color, 8%);
}
}
.media-spoiler__warning {
display: block;
font-size: 14px;
}
.media-spoiler__trigger {
display: block;
font-size: 11px;
font-weight: 700;
}
.spoiler-button { .spoiler-button {
top: 0; top: 0;
inset-inline-start: 0; inset-inline-start: 0;
@ -4742,12 +4716,11 @@ a.status-card {
z-index: 100; z-index: 100;
&--minified { &--minified {
display: flex; // glitch: media icon in spoiler button display: block;
inset-inline-start: 4px; inset-inline-start: 4px;
top: 4px; top: 4px;
width: auto; width: auto;
height: auto; height: auto;
align-items: center; // glitch: media icon in spoiler button
} }
&--click-thru { &--click-thru {
@ -6650,8 +6623,6 @@ a.status-card {
} }
} }
& > .react-toggle,
& > .icon,
button:first-child { button:first-child {
margin-inline-end: 10px; margin-inline-end: 10px;
} }

6
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
View File

@ -210,12 +210,6 @@ html {
} }
} }
// Change the background colors of media and video spoilers
.media-spoiler,
.video-player__spoiler {
background: $ui-base-color;
}
.account-gallery__item a { .account-gallery__item a {
background-color: $ui-base-color; background-color: $ui-base-color;
} }