mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong background color on search results in web UI (#29584)

pull/2676/head
Eugen Rochko 2024-03-14 10:07:29 +01:00 committed by GitHub
parent 5aea35de13
commit 1e1d97a787
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/features/compose/components/search_results.jsx
View File

@ -7,7 +7,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react'; import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react'; import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react'; import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { Icon } from 'mastodon/components/icon'; import { Icon } from 'mastodon/components/icon';
import { LoadMore } from 'mastodon/components/load_more'; import { LoadMore } from 'mastodon/components/load_more';
@ -76,11 +75,6 @@ class SearchResults extends ImmutablePureComponent {
return ( return (
<div className='search-results'> <div className='search-results'>
<div className='search-results__header'>
<Icon id='search' icon={SearchIcon} />
<FormattedMessage id='explore.search_results' defaultMessage='Search results' />
</div>
{accounts} {accounts}
{hashtags} {hashtags}
{statuses} {statuses}

23
app/javascript/styles/mastodon/components.scss
View File

@ -3485,7 +3485,7 @@ $ui-header-height: 55px;
} }
.column-subheading { .column-subheading {
background: darken($ui-base-color, 4%); background: var(--surface-background-color);
color: $darker-text-color; color: $darker-text-color;
padding: 8px 20px; padding: 8px 20px;
font-size: 12px; font-size: 12px;
@ -4637,7 +4637,7 @@ a.status-card {
} }
.follow_requests-unlocked_explanation { .follow_requests-unlocked_explanation {
background: darken($ui-base-color, 4%); background: var(--surface-background-color);
border-bottom: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
contain: initial; contain: initial;
flex-grow: 0; flex-grow: 0;
@ -5269,18 +5269,6 @@ a.status-card {
} }
} }
.search-results__header {
color: $dark-text-color;
background: lighten($ui-base-color, 2%);
padding: 15px;
font-weight: 500;
font-size: 16px;
cursor: default;
display: flex;
align-items: center;
gap: 5px;
}
.search-results__section { .search-results__section {
border-bottom: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
@ -5289,8 +5277,8 @@ a.status-card {
} }
&__header { &__header {
background: darken($ui-base-color, 4%);
border-bottom: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
background: var(--surface-background-color);
padding: 15px; padding: 15px;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
@ -7159,7 +7147,7 @@ noscript {
.follow-request-banner, .follow-request-banner,
.account-memorial-banner { .account-memorial-banner {
padding: 20px; padding: 20px;
background: lighten($ui-base-color, 4%); background: var(--surface-background-color);
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
@ -8326,7 +8314,8 @@ noscript {
flex: 1 1 auto; flex: 1 1 auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: $ui-base-color; border: 1px solid var(--background-border-color);
border-top: 0;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }

1
app/javascript/styles/mastodon/variables.scss
View File

@ -104,4 +104,5 @@ $font-monospace: 'mastodon-font-monospace' !default;
--background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%); --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
--background-color: #{darken($ui-base-color, 8%)}; --background-color: #{darken($ui-base-color, 8%)};
--background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)}; --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
--surface-background-color: #{darken($ui-base-color, 4%)};
} }