MetuFSS
/
metu.life
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: getting-started__wrapper should contained in getting-started (#8532)

Browse Source
master
takayamaki 6 years ago committed by Eugen Rochko
parent 1bfe735d57
commit f5c052b5e6
2 changed files with 52 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 58
      app/javascript/mastodon/features/getting_started/index.js
  2. 44
      app/javascript/styles/mastodon/components.scss

58
app/javascript/mastodon/features/getting_started/index.js
Unescape View File

@ -126,34 +126,36 @@ export default class GettingStarted extends ImmutablePureComponent {
</h1> </h1>
</div>} </div>}
<div className='getting-started__wrapper' style={{ height }}> <div className='getting-started'>
{!multiColumn && <NavigationBar account={myAccount} />} <div className='getting-started__wrapper' style={{ height }}>
{navItems} {!multiColumn && <NavigationBar account={myAccount} />}
</div> {navItems}
</div>
{!multiColumn && <div className='flex-spacer' />}
{!multiColumn && <div className='flex-spacer' />}
<div className='getting-started getting-started__footer'>
<ul> <div className='getting-started__footer'>
<li><a href='https://bridge.joinmastodon.org/' target='_blank'><FormattedMessage id='getting_started.find_friends' defaultMessage='Find friends from Twitter' /></a> · </li> <ul>
{invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>} <li><a href='https://bridge.joinmastodon.org/' target='_blank'><FormattedMessage id='getting_started.find_friends' defaultMessage='Find friends from Twitter' /></a> · </li>
{multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>} {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li> {multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
<li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this instance' /></a> · </li> <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></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='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li> <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></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='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
<li><a href='/auth/sign_out' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li> <li><a href='https://github.com/tootsuite/documentation#documentation' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
</ul> <li><a href='/auth/sign_out' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
</ul>
<p>
<FormattedMessage <p>
id='getting_started.open_source_notice' <FormattedMessage
defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.' id='getting_started.open_source_notice'
values={{ github: <span><a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> (v{version})</span> }} defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
/> values={{ github: <span><a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> (v{version})</span> }}
</p> />
</p>
</div>
</div> </div>
</Column> </Column>
); );

44
app/javascript/styles/mastodon/components.scss
Unescape View File

@ -2279,28 +2279,6 @@ a.account__display-name {
.getting-started { .getting-started {
color: $dark-text-color; color: $dark-text-color;
p {
color: $dark-text-color;
font-size: 13px;
margin-bottom: 20px;
a {
color: $dark-text-color;
text-decoration: underline;
}
}
a {
text-decoration: none;
color: $darker-text-color;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
&__footer { &__footer {
flex: 0 0 auto; flex: 0 0 auto;
padding: 10px; padding: 10px;
@ -2313,6 +2291,28 @@ a.account__display-name {
ul li { ul li {
display: inline; display: inline;
} }
p {
color: $dark-text-color;
font-size: 13px;
margin-bottom: 20px;
a {
color: $dark-text-color;
text-decoration: underline;
}
}
a {
text-decoration: none;
color: $darker-text-color;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
} }
&__trends { &__trends {

Write Preview
Loading…
Cancel
Save