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

Merge branch 'next-preheader' into 'next' 

Next: Disable PreHeader

See merge request soapbox-pub/soapbox-fe!1215
This commit is contained in:
Alex Gleason 2022-04-13 23:44:52 +00:00
parent 7f09ab6f6e 4230464812
commit 3ecd7c3961
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/soapbox/features/ui/index.js
View File

@ -41,7 +41,7 @@ import { expandNotifications } from '../../actions/notifications';
import { fetchScheduledStatuses } from '../../actions/scheduled_statuses'; import { fetchScheduledStatuses } from '../../actions/scheduled_statuses';
import { connectUserStream } from '../../actions/streaming'; import { connectUserStream } from '../../actions/streaming';
import { expandHomeTimeline } from '../../actions/timelines'; import { expandHomeTimeline } from '../../actions/timelines';
import PreHeader from '../../features/public_layout/components/pre_header'; // import PreHeader from '../../features/public_layout/components/pre_header';
// import GroupSidebarPanel from '../groups/sidebar_panel'; // import GroupSidebarPanel from '../groups/sidebar_panel';
import BackgroundShapes from './components/background_shapes'; import BackgroundShapes from './components/background_shapes';
@ -727,7 +727,7 @@ class UI extends React.PureComponent {
<BackgroundShapes /> <BackgroundShapes />
<div className='z-10 flex flex-col'> <div className='z-10 flex flex-col'>
<PreHeader /> {/* <PreHeader /> */}
<Navbar /> <Navbar />
<SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange} soapbox={soapbox} features={features}> <SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange} soapbox={soapbox} features={features}>