mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-27 11:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2023-01-12 17:47:42 +01:00
commit cef87ba86c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/language_dropdown.js
View file

@ -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}

2
app/javascript/mastodon/features/compose/components/privacy_dropdown.js
View file

@ -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}

2
app/javascript/styles/mastodon/components.scss
View file

@ -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;

4
config/locales/doorkeeper.en.yml
View file

@ -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