tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP <Compose> Refactor; SCSS ed.

Browse Source
This commit is contained in:
kibigo!
2017-12-29 14:55:06 -08:00
parent 8713659dff
commit 083170bec7
19 changed files with 626 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
View File

@ -7,13 +7,11 @@ import ReactSwipeableViews from 'react-swipeable-views';
import classNames from 'classnames';
import Permalink from 'flavours/glitch/components/permalink';
import { WrappedComponent as RawComposer } from 'flavours/glitch/features/composer';
import DrawerPagerAccount from 'flavours/glitch/features/drawer/pager/account';
import DrawerAccount from 'flavours/glitch/features/drawer/account';
import DrawerSearch from 'flavours/glitch/features/drawer/search';
import ColumnHeader from './column_header';
import { me } from 'flavours/glitch/util/initial_state';
const noop = () => { };
const messages = defineMessages({
home_title: { id: 'column.home', defaultMessage: 'Home' },
notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
@ -49,7 +47,7 @@ const PageTwo = ({ intl, myAccount }) => (
<div className='onboarding-modal__page onboarding-modal__page-two'>
<div className='figure non-interactive'>
<div className='pseudo-drawer'>
<DrawerPagerAccount account={myAccount} />
<DrawerAccount account={myAccount} />
<RawComposer
intl={intl}
state={composerState}
@ -72,7 +70,7 @@ const PageThree = ({ intl, myAccount }) => (
<DrawerSearch intl={intl} />
<div className='pseudo-drawer'>
<DrawerPagerAccount account={myAccount} />
<DrawerAccount account={myAccount} />
</div>
</div>