gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-10-04 15:12:07 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge 12cc731a37 into 4c0e44ebbe

Browse Source
This commit is contained in:
Christian Schmidt 2024-10-03 17:09:20 +00:00 committed by GitHub
commit 5a29f4e12b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,10 +346,12 @@ class Search extends PureComponent {
<div className='search__popout__menu'>
{recent.size > 0 ? this._getOptions().map(({ label, key, action, forget }, i) => (
<button key={key} onMouseDown={action} className={classNames('search__popout__menu__item search__popout__menu__item--flex', { selected: selectedOption === i })}>
<div key={key} className='search__popout__menu__item search__popout__menu__item--flex'>
<button onMouseDown={action} className={classNames({ selected: selectedOption === i })}>
<span>{label}</span>
<button className='icon-button' onMouseDown={forget}><Icon id='times' icon={CloseIcon} /></button>
</button>
<button className='icon-button' onMouseDown={forget}><Icon id='times' icon={CloseIcon} /></button>
</div>
)) : (
<div className='search__popout__menu__message'>
<FormattedMessage id='search.no_recent_searches' defaultMessage='No recent searches' />

2
app/javascript/mastodon/features/explore/components/search_section.jsx
View File

@ -16,5 +16,5 @@ export const SearchSection = ({ title, onClickMore, children }) => (
SearchSection.propTypes = {
title: PropTypes.node.isRequired,
onClickMore: PropTypes.func,
children: PropTypes.children,
children: PropTypes.node,
};

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

@ -5590,26 +5590,33 @@ 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;
}
.icon-button {
flex: 0;
padding: 10px 20px 10px 10px;
transition: none;
}