Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Position toggle switch more clearly #6914

Merged
merged 3 commits into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions res/css/views/settings/_SetIntegrationManager.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@ limitations under the License.
display: inline-block;
float: right;
top: 9px;

@mixin mx_Settings_fullWidthField;
}
13 changes: 7 additions & 6 deletions src/components/views/settings/SetIntegrationManager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
};

public render(): React.ReactNode {
const ToggleSwitch = sdk.getComponent("views.elements.ToggleSwitch");
const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
CicadaCinema marked this conversation as resolved.
Show resolved Hide resolved

const currentManager = this.state.currentManager;
let managerName;
Expand All @@ -79,12 +79,13 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
<div className="mx_SettingsTab_heading">
<span>{ _t("Manage integrations") }</span>
<span className="mx_SettingsTab_subheading">{ managerName }</span>
<ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
</div>
<LabelledToggleSwitch
value={this.state.provisioningEnabled}
onChange={this.onProvisioningToggled}
label={bodyText}
/>
<span className="mx_SettingsTab_subsectionText">
{ bodyText }
<br />
<br />
{ _t(
"Integration managers receive configuration data, and can modify widgets, " +
"send room invites, and set power levels on your behalf.",
Expand All @@ -93,4 +94,4 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
</div>
);
}
}
}
CicadaCinema marked this conversation as resolved.
Show resolved Hide resolved