Very early work on the "General" tab
parent
22435bf8d2
commit
f1e44757f0
|
@ -124,6 +124,8 @@
|
||||||
@import "./views/settings/_IntegrationsManager.scss";
|
@import "./views/settings/_IntegrationsManager.scss";
|
||||||
@import "./views/settings/_KeyBackupPanel.scss";
|
@import "./views/settings/_KeyBackupPanel.scss";
|
||||||
@import "./views/settings/_Notifications.scss";
|
@import "./views/settings/_Notifications.scss";
|
||||||
|
@import "./views/settings/tabs/_GeneralSettingsTab.scss";
|
||||||
|
@import "./views/settings/tabs/_SettingsTab.scss";
|
||||||
@import "./views/voip/_CallView.scss";
|
@import "./views/voip/_CallView.scss";
|
||||||
@import "./views/voip/_IncomingCallbox.scss";
|
@import "./views/voip/_IncomingCallbox.scss";
|
||||||
@import "./views/voip/_VideoView.scss";
|
@import "./views/voip/_VideoView.scss";
|
||||||
|
|
|
@ -82,7 +82,7 @@ limitations under the License.
|
||||||
.mx_TabbedView_tabPanel {
|
.mx_TabbedView_tabPanel {
|
||||||
width: calc(100% - 320px);
|
width: calc(100% - 320px);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-left: 20px;
|
margin-left: 70px;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: $dialog-title-fg-color;
|
color: $dialog-title-fg-color;
|
||||||
margin-top: 23px;
|
margin-top: 23px;
|
||||||
margin-bottom: 32px;
|
margin-bottom: 24px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
.mx_GeneralSettingsTab_profile input {
|
||||||
|
display: block;
|
||||||
|
font-size: 14px;
|
||||||
|
padding: 5px;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
.mx_SettingsTab_heading {
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_SettingsTab_subheading {
|
||||||
|
font-size: 14px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_SettingsTab_section {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
|
@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
|
||||||
import {Tab, TabbedView} from "../../structures/TabbedView";
|
import {Tab, TabbedView} from "../../structures/TabbedView";
|
||||||
import {_t, _td} from "../../../languageHandler";
|
import {_t, _td} from "../../../languageHandler";
|
||||||
import AccessibleButton from "../elements/AccessibleButton";
|
import AccessibleButton from "../elements/AccessibleButton";
|
||||||
|
import GeneralSettingsTab from "../settings/tabs/GeneralSettingsTab";
|
||||||
|
|
||||||
export default class UserSettingsDialog extends React.Component {
|
export default class UserSettingsDialog extends React.Component {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
|
@ -27,7 +28,7 @@ export default class UserSettingsDialog extends React.Component {
|
||||||
|
|
||||||
_getTabs() {
|
_getTabs() {
|
||||||
return [
|
return [
|
||||||
new Tab(_td("General"), <span className="mx_UserSettingsDialog_settingsIcon mx_TabbedView_maskedIcon" />, <div>General Test</div>),
|
new Tab(_td("General"), <span className="mx_UserSettingsDialog_settingsIcon mx_TabbedView_maskedIcon" />, <GeneralSettingsTab />),
|
||||||
new Tab(_td("Notifications"), <span className="mx_UserSettingsDialog_bellIcon mx_TabbedView_maskedIcon" />, <div>Notifications Test</div>),
|
new Tab(_td("Notifications"), <span className="mx_UserSettingsDialog_bellIcon mx_TabbedView_maskedIcon" />, <div>Notifications Test</div>),
|
||||||
new Tab(_td("Preferences"), <span className="mx_UserSettingsDialog_preferencesIcon mx_TabbedView_maskedIcon" />, <div>Preferences Test</div>),
|
new Tab(_td("Preferences"), <span className="mx_UserSettingsDialog_preferencesIcon mx_TabbedView_maskedIcon" />, <div>Preferences Test</div>),
|
||||||
new Tab(_td("Voice & Video"), <span className="mx_UserSettingsDialog_voiceIcon mx_TabbedView_maskedIcon" />, <div>Voice Test</div>),
|
new Tab(_td("Voice & Video"), <span className="mx_UserSettingsDialog_voiceIcon mx_TabbedView_maskedIcon" />, <div>Voice Test</div>),
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
/*
|
||||||
|
Copyright 2019 New Vector Ltd
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import {_t} from "../../../../languageHandler";
|
||||||
|
|
||||||
|
export default class GeneralSettingsTab extends React.Component {
|
||||||
|
static propTypes = {
|
||||||
|
onFinished: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div className="mx_SettingsTab">
|
||||||
|
<div className="mx_SettingsTab_heading">{_t("General")}</div>
|
||||||
|
<div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
|
||||||
|
<span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
|
||||||
|
<input type="text" value="travis" />
|
||||||
|
<input type="text" value="TravisR" />
|
||||||
|
</div>
|
||||||
|
<div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
|
||||||
|
<span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
|
||||||
|
<input type="text" value="travis" />
|
||||||
|
<input type="text" value="TravisR" />
|
||||||
|
</div>
|
||||||
|
<div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
|
||||||
|
<span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
|
||||||
|
<input type="text" value="travis" />
|
||||||
|
<input type="text" value="TravisR" />
|
||||||
|
</div>
|
||||||
|
<div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
|
||||||
|
<span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
|
||||||
|
<input type="text" value="travis" />
|
||||||
|
<input type="text" value="TravisR" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue