imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Position toggle switch more clearly (#6914)

Browse source 
* Position toggle switch more clearly

* attempt to revert changes, align switch to title instead

* remove unused import, add missing property

Co-authored-by: ColonisationCaptain <52425971+ColonisationCaptain@users.noreply.github.com>
This commit is contained in:
CicadaCinema 2021-10-19 22:28:11 +01:00 • committed by GitHub
parent 01c4d3eede
commit 23295718e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/views/settings/_SetIntegrationManager.scss
View file

@ -26,12 +26,11 @@ limitations under the License.
.mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading { .mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading {
display: inline-block; display: inline-block;
padding-left: 5px; padding-left: 5px;
margin-top: 0px;
} }
.mx_SetIntegrationManager .mx_ToggleSwitch { .mx_SetIntegrationManager .mx_ToggleSwitch {
display: inline-block; display: inline-block;
float: right; float: right;
top: 9px; top: 9px;
@mixin mx_Settings_fullWidthField;
} }

10
src/components/views/settings/SetIntegrationManager.tsx
View file

@ -18,10 +18,10 @@ import React from 'react';
import { _t } from "../../../languageHandler"; import { _t } from "../../../languageHandler";
import { IntegrationManagers } from "../../../integrations/IntegrationManagers"; import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance"; import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
import * as sdk from '../../../index';
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import { SettingLevel } from "../../../settings/SettingLevel"; import { SettingLevel } from "../../../settings/SettingLevel";
import { replaceableComponent } from "../../../utils/replaceableComponent"; import { replaceableComponent } from "../../../utils/replaceableComponent";
import ToggleSwitch from "../elements/ToggleSwitch";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
@ -59,8 +59,6 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
}; };
public render(): React.ReactNode { public render(): React.ReactNode {
const ToggleSwitch = sdk.getComponent("views.elements.ToggleSwitch");
const currentManager = this.state.currentManager; const currentManager = this.state.currentManager;
let managerName; let managerName;
let bodyText; let bodyText;
@ -81,7 +79,11 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
<div className="mx_SettingsTab_heading"> <div className="mx_SettingsTab_heading">
<span>{ _t("Manage integrations") }</span> <span>{ _t("Manage integrations") }</span>
<span className="mx_SettingsTab_subheading">{ managerName }</span> <span className="mx_SettingsTab_subheading">{ managerName }</span>
<ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} /> <ToggleSwitch
checked={this.state.provisioningEnabled}
disabled={false}
onChange={this.onProvisioningToggled}
/>
</div> </div>
<span className="mx_SettingsTab_subsectionText"> <span className="mx_SettingsTab_subsectionText">
{ bodyText } { bodyText }