bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove theme feature gating

Browse source
This commit is contained in:
Alex Gleason 2022-05-04 11:05:55 -05:00
parent 716e9b952f
commit d7e2b843cf
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/soapbox/features/ui/components/profile-dropdown.tsx
View file

@ -7,7 +7,7 @@ import { Link } from 'react-router-dom';
import { logOut, switchAccount } from 'soapbox/actions/auth'; import { logOut, switchAccount } from 'soapbox/actions/auth';
import { fetchOwnAccounts } from 'soapbox/actions/auth'; import { fetchOwnAccounts } from 'soapbox/actions/auth';
import { Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui'; import { Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui';
import { useAppSelector, useFeatures, useSettings } from 'soapbox/hooks'; import { useAppSelector, useFeatures } from 'soapbox/hooks';
import { makeGetAccount } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';
import Account from '../../../components/account'; import Account from '../../../components/account';
@ -39,7 +39,6 @@ const getAccount = makeGetAccount();
const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => { const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const features = useFeatures(); const features = useFeatures();
const settings = useSettings();
const intl = useIntl(); const intl = useIntl();
const authUsers = useAppSelector((state) => state.auth.get('users')); const authUsers = useAppSelector((state) => state.auth.get('users'));
@ -79,12 +78,8 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
} }
}); });
if (features.darkMode || settings.get('isDeveloper')) {
menu.push({ text: null }); menu.push({ text: null });
menu.push({ text: intl.formatMessage(messages.theme), toggle: <ThemeToggle /> }); menu.push({ text: intl.formatMessage(messages.theme), toggle: <ThemeToggle /> });
}
menu.push({ text: null }); menu.push({ text: null });
menu.push({ menu.push({

4
app/soapbox/utils/features.ts
View file

@ -188,10 +188,6 @@ const getInstanceFeatures = (instance: Instance) => {
v.software === PIXELFED, v.software === PIXELFED,
]), ]),
// FIXME: long-term this shouldn't be a feature,
// but for now we want it to be overrideable in the build
darkMode: true,
/** /**
* Legacy DMs timeline where messages are displayed chronologically without groupings. * Legacy DMs timeline where messages are displayed chronologically without groupings.
* @see GET /api/v1/timelines/direct * @see GET /api/v1/timelines/direct