tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

[Glitch] Various improvements to single column layout

Browse Source 
Port 84dc21d55d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Eugen Rochko 2019-05-23 20:01:10 +02:00 committed by ThibG
parent 610b4b44c4
commit 0bd9f23e6d
3 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/javascript/flavours/glitch/features/ui/components/columns_area.js
View File

@ -163,21 +163,28 @@ export default class ColumnsArea extends ImmutablePureComponent {
if (singleColumn) { if (singleColumn) {
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><i className='fa fa-pencil' /></Link>; const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><i className='fa fa-pencil' /></Link>;
return columnIndex !== -1 ? [ const content = columnIndex !== -1 ? (
<TabsBar key='tabs' />,
<ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={!swipeToChangeColumns}> <ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={!swipeToChangeColumns}>
{links.map(this.renderView)} {links.map(this.renderView)}
</ReactSwipeableViews>, </ReactSwipeableViews>
) : (
<div key='content' className='columns-area columns-area--mobile'>{children}</div>
);
floatingActionButton, return (
] : [ <div className='columns-area__panels'>
<TabsBar key='tabs' />, <div className='columns-area__panels__pane' />
<div key='content' className='columns-area columns-area--mobile'>{children}</div>, <div className='columns-area__panels__main'>
<TabsBar key='tabs' />
{content}
</div>
floatingActionButton, <div className='columns-area__panels__pane' />
];
{floatingActionButton}
</div>
);
} }
return ( return (

37
app/javascript/flavours/glitch/styles/components/columns.scss
View File

@ -11,6 +11,39 @@
justify-content: flex-start; justify-content: flex-start;
overflow-x: auto; overflow-x: auto;
position: relative; position: relative;
&__panels {
display: flex;
justify-content: center;
width: 100%;
height: 100%;
&__pane {
flex: 1 1 auto;
height: 100%;
overflow: hidden;
pointer-events: none;
display: flex;
justify-content: flex-end;
&__inner {
pointer-events: auto;
height: 100%;
}
}
&__main {
box-sizing: border-box;
width: 100%;
max-width: 600px;
display: flex;
flex-direction: column;
@media screen and (min-width: 360px) {
padding: 0 10px;
}
}
}
} }
.react-swipeable-view-container { .react-swipeable-view-container {
@ -496,4 +529,8 @@
&:active { &:active {
background: lighten($ui-highlight-color, 7%); background: lighten($ui-highlight-color, 7%);
} }
@media screen and (min-width: 630px) {
display: none;
}
} }

6
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -608,7 +608,6 @@
.columns-area--mobile { .columns-area--mobile {
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
max-width: 600px;
margin: 0 auto; margin: 0 auto;
.column, .column,
@ -624,7 +623,7 @@
} }
@media screen and (min-width: 360px) { @media screen and (min-width: 360px) {
padding: 10px; padding: 10px 0;
} }
@media screen and (min-width: 630px) { @media screen and (min-width: 630px) {
@ -685,8 +684,7 @@
.tabs-bar { .tabs-bar {
margin: 10px auto; margin: 10px auto;
margin-bottom: 0; margin-bottom: 0;
width: calc(100% - 20px); width: 100%;
max-width: 600px;
} }
.react-swipeable-view-container .columns-area--mobile { .react-swipeable-view-container .columns-area--mobile {