diff options
4 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.js b/app/javascript/mastodon/features/compose/components/language_dropdown.js index 4254a4926..2dd406b4b 100644 --- a/app/javascript/mastodon/features/compose/components/language_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/language_dropdown.js @@ -307,7 +307,7 @@ class LanguageDropdown extends React.PureComponent { <Overlay show={open} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}> {({ props, placement }) => ( - <div {...props} style={{ ...props.style, width: 280 }}> + <div {...props}> <div className={`dropdown-animation language-dropdown__dropdown ${placement}`} > <LanguageDropdownMenu value={value} diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js index 09bbc8e99..545b67eda 100644 --- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js @@ -268,7 +268,7 @@ class PrivacyDropdown extends React.PureComponent { <Overlay show={open} placement={'bottom'} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}> {({ props, placement }) => ( - <div {...props} style={{ ...props.style, width: 350, maxWidth: '100vw' }}> + <div {...props}> <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}> <PrivacyDropdownMenu items={this.options} diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 7f66d0568..d5937643f 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4380,7 +4380,7 @@ a.status-card.compact:hover { .emoji-picker-dropdown__menu { background: $simple-background-color; - position: absolute; + position: relative; box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); border-radius: 4px; margin-top: 5px; diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 2df0056c2..a28f91c0e 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -122,14 +122,14 @@ en: admin/accounts: Administration of accounts admin/all: All administrative functions admin/reports: Administration of reports - all: Everything + all: Full access to your Mastodon account blocks: Blocks bookmarks: Bookmarks conversations: Conversations crypto: End-to-end encryption favourites: Favourites filters: Filters - follow: Relationships + follow: Follows, Mutes and Blocks follows: Follows lists: Lists media: Media attachments |