post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-06 16:57:01 +09:00
commit 94cd200097
50 changed files with 801 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -107,7 +107,7 @@ class ExpirationDropdownMenu extends React.PureComponent {
<div style={{ ...style }} role='listbox' ref={this.setRef}>
{items.map(item => (
<div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
<div className='privacy-dropdown__option__content'>
<div className='expiration-dropdown__option__content'>
<strong>{item.text}</strong>
</div>
</div>
@ -227,10 +227,10 @@ class ExpirationDropdown extends React.PureComponent {
const { open, placement } = this.state;
return (
<div className={classNames('privacy-dropdown', placement, { active: open })} onKeyDown={this.handleKeyDown}>
<div className={classNames('privacy-dropdown__value')} ref={this.setTargetRef}>
<div className={classNames('expiration-dropdown', placement, { active: open })} onKeyDown={this.handleKeyDown}>
<div className={classNames('expiration-dropdown__value')} ref={this.setTargetRef}>
<IconButton
className='privacy-dropdown__value-icon'
className='expiration-dropdown__value-icon'
icon='clock-o'
title={intl.formatMessage(messages.add_expiration)}
size={18}
@ -248,7 +248,7 @@ class ExpirationDropdown extends React.PureComponent {
<Overlay show={open} placement={'bottom'} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
{({ props, placement }) => (
<div {...props}>
<div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
<div className={`dropdown-animation expiration-dropdown__dropdown ${placement}`}>
<ExpirationDropdownMenu
items={this.options}
value={value}