ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for hints (or extended descriptions) in local-settings pages

rebase/4.0.0rc2
Thibaut Girka 2018-10-01 22:11:11 +02:00 committed by ThibG
parent 5f308a7f05
commit 26409f3e8e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/local_settings/page/item/index.js
View File

@ -17,6 +17,7 @@ export default class LocalSettingsPageItem extends React.PureComponent {
options: PropTypes.arrayOf(PropTypes.shape({ options: PropTypes.arrayOf(PropTypes.shape({
value: PropTypes.string.isRequired, value: PropTypes.string.isRequired,
message: PropTypes.string.isRequired, message: PropTypes.string.isRequired,
hint: PropTypes.string,
})), })),
settings: ImmutablePropTypes.map.isRequired, settings: ImmutablePropTypes.map.isRequired,
placeholder: PropTypes.string, placeholder: PropTypes.string,
@ -62,6 +63,7 @@ export default class LocalSettingsPageItem extends React.PureComponent {
disabled={!enabled} disabled={!enabled}
/> />
{opt.message} {opt.message}
{opt.hint && <span class='hint'>{opt.hint}</span>}
</label> </label>
); );
}); });

5
app/javascript/flavours/glitch/styles/components/local_settings.scss
View File

@ -28,6 +28,11 @@
} }
} }
span.hint {
display: block;
color: $lighter-text-color;
}
h1 { h1 {
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;