+
{_t("Live location sharing")}
diff --git a/src/components/views/location/MapError.tsx b/src/components/views/location/MapError.tsx
index 1f0a5d1e74..32e6bb77e1 100644
--- a/src/components/views/location/MapError.tsx
+++ b/src/components/views/location/MapError.tsx
@@ -38,7 +38,7 @@ export const MapError: React.FC = ({ error, isMinimised, classNam
onClick={onClick}
>
-
+
{_t("Unable to load map")}
{getLocationShareErrorMessage(error)}
diff --git a/src/components/views/location/ShareType.tsx b/src/components/views/location/ShareType.tsx
index 235a385dc1..d17bcdc8ce 100644
--- a/src/components/views/location/ShareType.tsx
+++ b/src/components/views/location/ShareType.tsx
@@ -81,7 +81,7 @@ const ShareType: React.FC = ({ setShareType, enabledShareTypes }) => {
return (
-
+
{_t("What location type do you want to share?")}
diff --git a/src/components/views/polls/pollHistory/PollHistory.tsx b/src/components/views/polls/pollHistory/PollHistory.tsx
index dd1d4a071e..0b7347a178 100644
--- a/src/components/views/polls/pollHistory/PollHistory.tsx
+++ b/src/components/views/polls/pollHistory/PollHistory.tsx
@@ -69,7 +69,7 @@ export const PollHistory: React.FC
= ({ room, matrixClient, pe
return (
{/* @TODO this probably needs some style */}
-
+
{title}
{focusedPoll ? (
diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx
index b8f250e285..1cd7ff0c4a 100644
--- a/src/components/views/right_panel/PinnedMessagesCard.tsx
+++ b/src/components/views/right_panel/PinnedMessagesCard.tsx
@@ -179,7 +179,7 @@ const PinnedMessagesCard: React.FC = ({ room, onClose, permalinkCreator
diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx
index a236bf4d8b..1597499e97 100644
--- a/src/components/views/right_panel/TimelineCard.tsx
+++ b/src/components/views/right_panel/TimelineCard.tsx
@@ -190,7 +190,7 @@ export default class TimelineCard extends React.Component {
private renderTimelineCardHeader = (): JSX.Element => {
return (
-
+
{_t("Chat")}
diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx
index 2e5a8fe292..efd814c8d3 100644
--- a/src/components/views/right_panel/WidgetCard.tsx
+++ b/src/components/views/right_panel/WidgetCard.tsx
@@ -73,7 +73,7 @@ const WidgetCard: React.FC = ({ room, widgetId, onClose }) => {
const header = (
-
+
{WidgetUtils.getWidgetName(app)}
{
super(props);
this.state = {
- fontSize: (SettingsStore.getValue("baseFontSize", null) + FontWatcher.SIZE_DIFF).toString(),
+ fontSize: SettingsStore.getValue("baseFontSizeV2", null).toString(),
useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
layout: SettingsStore.getValue("layout"),
};
@@ -80,13 +80,13 @@ export default class FontScalingPanel extends React.Component {
private onFontSizeChanged = (size: number): void => {
this.setState({ fontSize: size.toString() });
- SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
+ SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, size);
};
private onValidateFontSize = async ({ value }: Pick): Promise => {
const parsedSize = parseFloat(value!);
- const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
- const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
+ const min = FontWatcher.MIN_SIZE;
+ const max = FontWatcher.MAX_SIZE;
if (isNaN(parsedSize)) {
return { valid: false, feedback: _t("Size must be a number") };
@@ -99,15 +99,12 @@ export default class FontScalingPanel extends React.Component {
};
}
- SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, parseInt(value!, 10) - FontWatcher.SIZE_DIFF);
+ SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, parseInt(value!, 10));
return { valid: true, feedback: _t("Use between %(min)s pt and %(max)s pt", { min, max }) };
};
public render(): React.ReactNode {
- const min = 13;
- const max = 18;
-
return (
{
Aa
{
this.setState({ useCustomFontSize: checked });
if (!checked) {
const size = parseInt(this.state.fontSize, 10);
- const clamped = clamp(size, min, max);
+ const clamped = clamp(size, FontWatcher.MIN_SIZE, FontWatcher.MAX_SIZE);
if (clamped !== size) {
this.onFontSizeChanged(clamped);
}
diff --git a/src/components/views/settings/IntegrationManager.tsx b/src/components/views/settings/IntegrationManager.tsx
index 16e9f1ed56..355928376e 100644
--- a/src/components/views/settings/IntegrationManager.tsx
+++ b/src/components/views/settings/IntegrationManager.tsx
@@ -89,7 +89,7 @@ export default class IntegrationManager extends React.Component
if (this.props.loading) {
return (
- {_t("Connecting to integration manager…")}
+ {_t("Connecting to integration manager…")}
);
@@ -98,7 +98,7 @@ export default class IntegrationManager extends React.Component
if (!this.props.connected || this.state.errored) {
return (
-
{_t("Cannot connect to integration manager")}
+
{_t("Cannot connect to integration manager")}
{_t("The integration manager is offline or it cannot reach your homeserver.")}
- {_t("Manage integrations")}
- {managerName}
+ {_t("Manage integrations")}
+ {managerName}
= ({ device, saveDeviceName })
setIsEditing(false)} />
) : (
-
{device.display_name || device.device_id}
+
{device.display_name || device.device_id}
setIsEditing(true)}
diff --git a/src/components/views/settings/devices/DeviceTile.tsx b/src/components/views/settings/devices/DeviceTile.tsx
index 2c60a49cd6..6ee2360724 100644
--- a/src/components/views/settings/devices/DeviceTile.tsx
+++ b/src/components/views/settings/devices/DeviceTile.tsx
@@ -30,7 +30,7 @@ export interface DeviceTileProps {
}
const DeviceTileName: React.FC<{ device: ExtendedDevice }> = ({ device }) => {
- return {device.display_name || device.device_id};
+ return {device.display_name || device.device_id};
};
const DeviceTile: React.FC = ({ device, children, isSelected, onClick }) => {
diff --git a/src/components/views/settings/shared/SettingsSection.tsx b/src/components/views/settings/shared/SettingsSection.tsx
index 1fc0090565..243346c047 100644
--- a/src/components/views/settings/shared/SettingsSection.tsx
+++ b/src/components/views/settings/shared/SettingsSection.tsx
@@ -42,7 +42,7 @@ export interface SettingsSectionProps extends HTMLAttributes {
*/
export const SettingsSection: React.FC = ({ heading, children, ...rest }) => (
- {typeof heading === "string" ?
{heading} : <>{heading}}
+ {typeof heading === "string" ?
{heading} : <>{heading}}
{children}
-
+
{heading}
{children}
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
index 1ba3a2f17c..21d13dfd63 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
@@ -274,7 +274,7 @@ export default class NotificationsSettingsTab extends React.Component
-
{_t("Set a new custom sound")}
+
{_t("Set a new custom sound")}