...
 
Commits (2)
......@@ -121,7 +121,6 @@ export default class GettingStarted extends ImmutablePureComponent {
navItems.push(
<ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />,
<ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/user-settings' />,
<ColumnLink key={i++} icon='lock' text={intl.formatMessage(messages.security)} href='/auth/edit' />
);
height += 34 + 48*2;
......@@ -151,35 +150,34 @@ export default class GettingStarted extends ImmutablePureComponent {
</h1>
</div>}
<div className='getting-started__wrapper' style={{ height }}>
<div className='getting-started getting-started__wrapper scrollable'>
{!multiColumn && <NavigationBar account={myAccount} />}
{navItems}
</div>
{!multiColumn && <div className='flex-spacer' />}
<div className='getting-started getting-started__footer'>
<ul>
<li><a href='https://bridge.joinmastodon.org/' target='_blank'><FormattedMessage id='getting_started.find_friends' defaultMessage='Find friends from Twitter' /></a> · </li>
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
{multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
<li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this instance' /></a> · </li>
<li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
<li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
<li><a href='https://github.com/tootsuite/documentation#documentation' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
<li><a href='/auth/sign_out' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
</ul>
<div className='getting-started getting-started__panel scrollable'>
{staticContent}
</div>
<div className='getting-started getting-started__footer scrollable'>
{(invitesEnabled || multiColumn) &&
<ul>
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a></li>}
{multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link></li>}
</ul>
}
<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
values={{ github: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> }}
id='getting_started.mastofe_notice'
defaultMessage='{mastofe} is libre software based on {mastodon} frontend adapted for the {pleroma}.'
values={{
mastofe: <a href='https://git.pleroma.social/pleroma/mastofe' rel='noopener' target='_blank'>Mastofe</a>,
mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>Mastodon</a>,
pleroma: <a href='https://pleroma.social' rel='noopener' target='_blank'>Pleroma</a>
}}
/>
</p>
{staticContent}
</div>
</Column>
);
......
......@@ -120,6 +120,7 @@
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.mastofe_notice": "{mastofe} is libre software based on {mastodon} frontend adapted for the {pleroma}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of service",
"home.column_settings.advanced": "Advanced",
......
......@@ -120,6 +120,7 @@
"getting_started.heading": "Pour commencer",
"getting_started.invite": "Inviter des gens",
"getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.",
"getting_started.mastofe_notice": "{mastofe} est un logiciel libre basé sur l’interface de {mastodon} adapté pour {pleroma}.",
"getting_started.security": "Sécurité",
"getting_started.terms": "Conditions d’utilisation",
"home.column_settings.advanced": "Avancé",
......
......@@ -1797,12 +1797,15 @@ a.account__display-name {
margin-bottom: 0;
}
.getting-started__wrapper,
.getting-started__trends,
.search {
margin-bottom: 10px;
}
.getting-started__panel {
margin: 10px 0;
}
.column,
.drawer {
min-width: 330px;
......@@ -2214,23 +2217,16 @@ a.account__display-name {
background: $ui-base-color;
}
.getting-started__wrapper {
flex: 0 0 auto;
}
.flex-spacer {
flex: 1 1 auto;
}
.getting-started {
color: $dark-text-color;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
p {
color: $dark-text-color;
font-size: 13px;
margin-bottom: 20px;
a {
color: $dark-text-color;
......@@ -2249,10 +2245,16 @@ a.account__display-name {
}
}
&__wrapper,
&__panel,
&__footer {
flex: 0 0 auto;
height: min-content;
}
&__panel, &__footer {
padding: 10px;
padding-top: 20px;
flex-grow: 0;
ul {
margin-bottom: 10px;
......@@ -2263,6 +2265,10 @@ a.account__display-name {
}
}
&__wrapper, &__footer {
color: $dark-text-color;
}
&__trends {
background: $ui-base-color;
flex: 0 1 auto;
......