Skip to content

Commit 58832e0

Browse files
committed
use flexbox instead of hardcoding body height
1 parent fecd455 commit 58832e0

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

src/app/components/HomePage.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ import Streams from './Streams';
33
import Messages from './Messages';
44
import Users from './Users';
55
import Header from './Header';
6+
import wrapper from '../styles/homePage';
67
import body from '../styles/body';
78

89
class HomePage extends React.Component {
910
render() {
1011
return (
11-
<div>
12+
<div style={wrapper}>
1213
<Header />
1314
<div style={body}>
1415
<Streams />

src/app/styles/body.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import { headerHeight } from './dimensions';
2-
31
export default {
42
display: 'flex',
5-
height: window.innerHeight - headerHeight,
63
};

src/app/styles/header.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { headerHeight } from './dimensions';
22

33
export default {
44
display: 'flex',
5-
height: headerHeight,
6-
height: 40
5+
flexGrow: 0,
6+
flexShrink: 0,
7+
flexBasis: headerHeight,
78
};

src/app/styles/homePage.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export default {
2+
display: 'flex',
3+
flexDirection: 'column',
4+
height: '100%',
5+
};

0 commit comments

Comments
 (0)