Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/use grid layout #25

Merged
merged 10 commits into from
Mar 4, 2015
Merged

Feature/use grid layout #25

merged 10 commits into from
Mar 4, 2015

Conversation

mr-mig
Copy link
Contributor

@mr-mig mr-mig commented Mar 4, 2015

@dev-tim You should be unblocked after the merge

<Route path="/" handler={MainScreen}>
<Route name="settings" handler={SettingsRegion}/>
<Route name="devices" handler={DevicesRegion}/>
<Redirect from="/" to="devices"/>
</Route>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You decided to get rid of subrouting for now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there's currently no need for it. Can be added if necessary

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, anyway we do know how it works.

@larsblumberg
Copy link
Contributor

LGTM, there are however some comments

@dev-tim
Copy link
Contributor

dev-tim commented Mar 4, 2015

Me as well

var Device = require('screens/main/devices/device/index');
var Device = require('../device');

require('./style.scss');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why StyleMixin isn't used here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was not part of the PR, we worked on the main screen and navigation bar. This could be done by a separate PR

dev-tim added a commit that referenced this pull request Mar 4, 2015
@dev-tim dev-tim merged commit aa95fd9 into master Mar 4, 2015
@mr-mig mr-mig deleted the feature/use-grid-layout branch March 4, 2015 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants