queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

clean up new imports in vanilla flavour

Browse source
This commit is contained in:
fef 2022-11-30 17:09:16 +00:00
parent f4dbfdb9c9
commit a47ecf6e69
No known key found for this signature in database
GPG key ID: EC22E476DC2D3D84
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/status.js
View file

@ -22,7 +22,7 @@ import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_
// We use the component (and not the container) since we do not want
// to use the progress bar to show download progress
import Bundle from '../features/ui/components/bundle';
import { visibleReactions } from '../../flavours/glitch/initial_state';
import { visibleReactions } from '../initial_state';
export const textForScreenReader = (intl, status, rebloggedByText = false) => {
const displayName = status.getIn(['account', 'display_name']);

3
app/javascript/mastodon/components/status_action_bar.js
View file

@ -6,11 +6,10 @@ import IconButton from './icon_button';
import DropdownMenuContainer from '../containers/dropdown_menu_container';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from '../initial_state';
import { me, maxReactions } from '../initial_state';
import classNames from 'classnames';
import { PERMISSION_MANAGE_USERS } from 'mastodon/permissions';
import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
import { maxReactions } from '../../flavours/glitch/initial_state';
const messages = defineMessages({
delete: { id: 'status.delete', defaultMessage: 'Delete' },

1
app/javascript/mastodon/features/notifications/components/column_settings.js
View file

@ -6,7 +6,6 @@ import ClearColumnButton from './clear_column_button';
import GrantPermissionButton from './grant_permission_button';
import SettingToggle from './setting_toggle';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
import PillBarButton from '../../../../flavours/glitch/features/notifications/components/pill_bar_button';
export default class ColumnSettings extends React.PureComponent {