Use semantic headings in user settings - discovery (#10838)
* allow testids in settings sections * use semantic headings in LabsUserSettingsTab * put back margin var * use SettingsTab wrapper * use semantic headings for deactivate acc section * use semantic heading in manage integratios * i18n * use currentColor in warning-triangle svg, update use in RoomStatusBar * use semantic headings for discovery section * test manage integration settings * test deactivate account section display * remove SettingsFieldset margins * threepids styles * remove debug * test discovery email and phone
This commit is contained in:
parent
9211da20f4
commit
9f011b955b
19 changed files with 407 additions and 123 deletions
|
@ -15,6 +15,8 @@ limitations under the License.
|
|||
import React, { ReactNode, HTMLAttributes } from "react";
|
||||
import classNames from "classnames";
|
||||
|
||||
import { SettingsSubsectionText } from "./shared/SettingsSubsection";
|
||||
|
||||
interface Props extends HTMLAttributes<HTMLFieldSetElement> {
|
||||
// section title
|
||||
legend: string | ReactNode;
|
||||
|
@ -24,7 +26,11 @@ interface Props extends HTMLAttributes<HTMLFieldSetElement> {
|
|||
const SettingsFieldset: React.FC<Props> = ({ legend, className, children, description, ...rest }) => (
|
||||
<fieldset {...rest} className={classNames("mx_SettingsFieldset", className)}>
|
||||
<legend className="mx_SettingsFieldset_legend">{legend}</legend>
|
||||
{description && <div className="mx_SettingsFieldset_description">{description}</div>}
|
||||
{description && (
|
||||
<div className="mx_SettingsFieldset_description">
|
||||
<SettingsSubsectionText>{description}</SettingsSubsectionText>
|
||||
</div>
|
||||
)}
|
||||
{children}
|
||||
</fieldset>
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue