erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix post filter & report styling (#31349)

Browse source
This commit is contained in:
Michael Stanclift 2024-08-09 07:45:39 -05:00 committed by GitHub
parent 6ca731e9b6
commit 9538d9c298
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/styles/mastodon-light/diff.scss
View file

@ -555,3 +555,7 @@ a.sparkline {
.setting-text { .setting-text {
background: darken($ui-base-color, 10%); background: darken($ui-base-color, 10%);
} }
.report-dialog-modal__textarea {
background: darken($ui-base-color, 10%);
}

38
app/javascript/styles/mastodon/components.scss
View file

@ -6244,9 +6244,10 @@ a.status-card {
max-width: 90vw; max-width: 90vw;
width: 480px; width: 480px;
height: 80vh; height: 80vh;
background: lighten($ui-secondary-color, 8%); background: var(--background-color);
color: $inverted-text-color; color: $primary-text-color;
border-radius: 8px; border-radius: 4px;
border: 1px solid var(--background-border-color);
overflow: hidden; overflow: hidden;
position: relative; position: relative;
flex-direction: column; flex-direction: column;
@ -6254,7 +6255,7 @@ a.status-card {
&__container { &__container {
box-sizing: border-box; box-sizing: border-box;
border-top: 1px solid $ui-secondary-color; border-top: 1px solid var(--background-border-color);
padding: 20px; padding: 20px;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
@ -6284,7 +6285,7 @@ a.status-card {
&__lead { &__lead {
font-size: 17px; font-size: 17px;
line-height: 22px; line-height: 22px;
color: lighten($inverted-text-color, 16%); color: $secondary-text-color;
margin-bottom: 30px; margin-bottom: 30px;
a { a {
@ -6319,7 +6320,7 @@ a.status-card {
.status__content, .status__content,
.status__content p { .status__content p {
color: $inverted-text-color; color: $primary-text-color;
} }
.status__content__spoiler-link { .status__content__spoiler-link {
@ -6364,7 +6365,7 @@ a.status-card {
.poll__option.dialog-option { .poll__option.dialog-option {
padding: 15px 0; padding: 15px 0;
flex: 0 0 auto; flex: 0 0 auto;
border-bottom: 1px solid $ui-secondary-color; border-bottom: 1px solid var(--background-border-color);
&:last-child { &:last-child {
border-bottom: 0; border-bottom: 0;
@ -6372,13 +6373,13 @@ a.status-card {
& > .poll__option__text { & > .poll__option__text {
font-size: 13px; font-size: 13px;
color: lighten($inverted-text-color, 16%); color: $secondary-text-color;
strong { strong {
font-size: 17px; font-size: 17px;
font-weight: 500; font-weight: 500;
line-height: 22px; line-height: 22px;
color: $inverted-text-color; color: $primary-text-color;
display: block; display: block;
margin-bottom: 4px; margin-bottom: 4px;
@ -6397,22 +6398,19 @@ a.status-card {
display: block; display: block;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
color: $inverted-text-color; color: $primary-text-color;
background: $simple-background-color; background: $ui-base-color;
padding: 10px; padding: 10px;
font-family: inherit; font-family: inherit;
font-size: 17px; font-size: 17px;
line-height: 22px; line-height: 22px;
resize: vertical; resize: vertical;
border: 0; border: 0;
border: 1px solid var(--background-border-color);
outline: 0; outline: 0;
border-radius: 4px; border-radius: 4px;
margin: 20px 0; margin: 20px 0;
&::placeholder {
color: $dark-text-color;
}
&:focus { &:focus {
outline: 0; outline: 0;
} }
@ -6433,16 +6431,16 @@ a.status-card {
} }
.button.button-secondary { .button.button-secondary {
border-color: $inverted-text-color; border-color: $ui-button-destructive-background-color;
color: $inverted-text-color; color: $ui-button-destructive-background-color;
flex: 0 0 auto; flex: 0 0 auto;
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
background: transparent; background: $ui-button-destructive-background-color;
border-color: $ui-button-background-color; border-color: $ui-button-destructive-background-color;
color: $ui-button-background-color; color: $white;
} }
} }

1
app/javascript/styles/mastodon/emoji_picker.scss
View file

@ -111,7 +111,6 @@
&:focus { &:focus {
outline: none !important; outline: none !important;
border-width: 1px !important; border-width: 1px !important;
border-color: $ui-button-background-color;
} }
&::-webkit-search-cancel-button { &::-webkit-search-cancel-button {