Merge branch 'main' into glitch-soc/merge-upstream
commit
cef87ba86c
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue