Skip to content

Commit

Permalink
Move status so it's in the top right regardless or desktop or mobile. F…
Browse files Browse the repository at this point in the history
…ixes #102.
  • Loading branch information
thsudo committed Nov 1, 2019
1 parent cb8944e commit 0b27d99
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/components/AppComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { HomeLink } from './HomeLink.js'
import { MultiGesture } from './MultiGesture.js'
import { NavBar } from './NavBar.js'
import { NewItem } from './NewItem.js'
import { Status } from './Status.js'
import { Search } from './Search.js'

// constants
Expand Down Expand Up @@ -99,6 +100,7 @@ export const AppComponent = connect(({ dataNonce, focus, search, showContexts, u
<HelperWelcome />
<HelperShortcuts />
<HelperFeedback />
<Status />

{ // render as header on desktop
!isMobile ? <NavBar position='top' /> : null}
Expand Down Expand Up @@ -187,7 +189,6 @@ export const AppComponent = connect(({ dataNonce, focus, search, showContexts, u

{ // render as footer on mobile
isMobile ? <NavBar position='bottom' /> : null}

<Footer />

{/*<HelperIcon />*/}
Expand Down
4 changes: 1 addition & 3 deletions src/components/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import * as classNames from 'classnames'
import { Breadcrumbs } from './Breadcrumbs.js'
import { CancelTutorial } from './CancelTutorial.js'
import { HomeLink } from './HomeLink.js'
import { Status } from './Status.js'

/** A navigation bar that contains a link to home, breadcrumbs, and status. */
/** A navigation bar that contains a link to home and breadcrumbs. */
export const NavBar = connect(({ cursor }) => ({ cursor }))(({ cursor, position }) =>
<div className={classNames({
nav: true,
Expand All @@ -20,7 +19,6 @@ export const NavBar = connect(({ cursor }) => ({ cursor }))(({ cursor, position
})}>
<HomeLink />
<Breadcrumbs />
<Status />
<CancelTutorial />
</div>
</div>
Expand Down

0 comments on commit 0b27d99

Please sign in to comment.