gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 12:16:14 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge 1ecf2b88dc into fbe9728f36

Browse Source
This commit is contained in:
Christian Schmidt 2025-05-06 15:05:45 +00:00 committed by GitHub
commit d23bd80759
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/mastodon/features/compose/components/search.tsx
View File

@ -497,19 +497,20 @@ export const Search: React.FC<{
<div className='search__popout__menu'>
{recentOptions.length > 0 ? (
recentOptions.map(({ label, key, action, forget }, i) => (
<button
<div
key={key}
onMouseDown={action}
className={classNames(
'search__popout__menu__item search__popout__menu__item--flex',
{ selected: selectedOption === i },
)}
className='search__popout__menu__item search__popout__menu__item--flex'
>
<span>{label}</span>
<button
onMouseDown={action}
className={classNames({ selected: selectedOption === i })}
>
<span>{label}</span>
</button>
<button className='icon-button' onMouseDown={forget}>
<Icon id='times' icon={CloseIcon} />
</button>
</button>
</div>
))
) : (
<div className='search__popout__menu__message'>

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

@ -5353,26 +5353,40 @@ a.status-card {
&__item {
display: block;
box-sizing: border-box;
width: 100%;
border: 0;
font: inherit;
background: transparent;
color: $darker-text-color;
padding: 10px;
cursor: pointer;
border-radius: 4px;
text-align: start;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
&--flex {
display: flex;
justify-content: space-between;
}
&:is(button),
button {
flex: 1;
box-sizing: border-box;
border: 0;
font: inherit;
background: transparent;
color: $darker-text-color;
padding: 10px;
cursor: pointer;
text-align: start;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
&:hover,
&:focus,
&:active,
&.selected {
color: $primary-text-color;
}
}
.icon-button {
flex: 0;
padding: 10px 19px 10px 10px;
transition: none;
}
@ -5381,11 +5395,6 @@ a.status-card {
&:active,
&.selected {
background: $ui-highlight-color;
color: $primary-text-color;
.icon-button {
color: $primary-text-color;
}
}
mark {