treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
takayamaki 2018-08-31 10:43:02 +09:00 committed by Eugen Rochko
parent 1bfe735d57
commit f5c052b5e6
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/getting_started/index.js
View File

@ -126,6 +126,7 @@ export default class GettingStarted extends ImmutablePureComponent {
</h1> </h1>
</div>} </div>}
<div className='getting-started'>
<div className='getting-started__wrapper' style={{ height }}> <div className='getting-started__wrapper' style={{ height }}>
{!multiColumn && <NavigationBar account={myAccount} />} {!multiColumn && <NavigationBar account={myAccount} />}
{navItems} {navItems}
@ -133,7 +134,7 @@ export default class GettingStarted extends ImmutablePureComponent {
{!multiColumn && <div className='flex-spacer' />} {!multiColumn && <div className='flex-spacer' />}
<div className='getting-started getting-started__footer'> <div className='getting-started__footer'>
<ul> <ul>
<li><a href='https://bridge.joinmastodon.org/' target='_blank'><FormattedMessage id='getting_started.find_friends' defaultMessage='Find friends from Twitter' /></a> · </li> <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>} {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
@ -155,6 +156,7 @@ export default class GettingStarted extends ImmutablePureComponent {
/> />
</p> </p>
</div> </div>
</div>
</Column> </Column>
); );
} }

26
app/javascript/styles/mastodon/components.scss
View File

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