moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only render layout colum inner div when column exists, fixes #293

This commit is contained in:
Mary Kate 2020-08-15 18:19:27 -05:00
parent 30ebdf30ff
commit 455cb6f575
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/soapbox/features/ui/components/columns_area.js
View File

@ -24,9 +24,11 @@ class ColumnsArea extends ImmutablePureComponent {
<div className='columns-area__panels'> <div className='columns-area__panels'>
<div className='columns-area__panels__pane columns-area__panels__pane--left'> <div className='columns-area__panels__pane columns-area__panels__pane--left'>
<div className='columns-area__panels__pane__inner'> { layout.LEFT &&
{layout.LEFT} <div className='columns-area__panels__pane__inner'>
</div> {layout.LEFT}
</div>
}
</div> </div>
<div className='columns-area__panels__main'> <div className='columns-area__panels__main'>
@ -36,9 +38,11 @@ class ColumnsArea extends ImmutablePureComponent {
</div> </div>
<div className='columns-area__panels__pane columns-area__panels__pane--right'> <div className='columns-area__panels__pane columns-area__panels__pane--right'>
<div className='columns-area__panels__pane__inner'> { layout.RIGHT &&
{layout.RIGHT} <div className='columns-area__panels__pane__inner'>
</div> {layout.RIGHT}
</div>
}
</div> </div>
</div> </div>
</div> </div>

4
app/soapbox/features/ui/components/link_footer.js
View File

@ -35,9 +35,9 @@ const mapDispatchToProps = (dispatch) => ({
const LinkFooter = ({ onOpenHotkeys, account, onClickLogOut }) => ( const LinkFooter = ({ onOpenHotkeys, account, onClickLogOut }) => (
<div className='getting-started__footer'> <div className='getting-started__footer'>
<ul> <ul>
{account && <li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a> · </li>} {account && <li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a></li>}
{/* {account && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>} */} {/* {account && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>} */}
<li><a href='/about'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li> <li><a href='/about'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a></li>
{/* <li><a href='/settings/applications'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li> */} {/* <li><a href='/settings/applications'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li> */}
{account && <li><Link to='/auth/sign_out' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></Link></li>} {account && <li><Link to='/auth/sign_out' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></Link></li>}
</ul> </ul>

8
app/styles/components/getting-started.scss
View File

@ -28,6 +28,14 @@
display: inline; display: inline;
} }
ul li::after {
content: ' · ';
}
ul li:last-child::after {
content: '';
}
p { p {
color: hsla(var(--primary-text-color_hsl), 0.8); color: hsla(var(--primary-text-color_hsl), 0.8);
font-size: 13px; font-size: 13px;