Skip to content

Commit

Permalink
Merge pull request #206 from hshoff/harry-resiz
Browse files Browse the repository at this point in the history
[responsive][demo] bump resize-observer-polyfill, fix ff
  • Loading branch information
hshoff authored Dec 1, 2017
2 parents 919a1ee + 52f6e91 commit 8191a74
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
23 changes: 15 additions & 8 deletions packages/vx-demo/components/gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default class Gallery extends React.Component {
<Link prefetch href="/bars">
<div
className="gallery-item"
style={{ background: items[1] }}
style={{ background: '#5290e7' }}
>
<div className="image">
<ParentSize>
Expand All @@ -113,14 +113,20 @@ export default class Gallery extends React.Component {
<Link prefetch href="/dots">
<div
className="gallery-item"
style={{ background: items[2] }}
style={{ background: '#fd6e7f' }}
>
<div className="image">
<ParentSize>
{({ width, height }) => (
<Dots
width={width}
height={height + detailsHeight}
margin={{
top: 0,
left: 0,
right: 0,
bottom: 80,
}}
/>
)}
</ParentSize>
Expand Down Expand Up @@ -434,7 +440,7 @@ export default class Gallery extends React.Component {
<Link prefetch href="/pies">
<div
className="gallery-item"
style={{ background: '#c94acc' }}
style={{ background: '#7f82e3' }}
>
<div className="image">
<ParentSize>
Expand Down Expand Up @@ -563,7 +569,7 @@ export default class Gallery extends React.Component {
<Link prefetch href="/boxplot">
<div
className="gallery-item"
style={{ background: '#88d1d9' }}
style={{ background: '#8a88e3' }}
>
<div className="image">
<ParentSize>
Expand All @@ -590,7 +596,7 @@ export default class Gallery extends React.Component {

<Tilt className="tilt" options={{ max: 8, scale: 1 }}>
<Link prefetch href="/geo-mercator">
<div className="gallery-item">
<div className="gallery-item" style={{ background: '#f9f7e8'}}>
<div className="image">
<ParentSize>
{({ width, height }) => (
Expand All @@ -613,7 +619,7 @@ export default class Gallery extends React.Component {

<Tilt className="tilt" options={{ max: 8, scale: 1 }}>
<Link prefetch href="/network">
<div className="gallery-item">
<div className="gallery-item" style={{ background: '#272b4d'}}>
<div className="image">
<ParentSize>
{({ width, height }) => (
Expand Down Expand Up @@ -643,7 +649,7 @@ export default class Gallery extends React.Component {
<Link prefetch href="/streamgraph">
<div
className="gallery-item"
style={{ background: '#ffd7d9' }}
style={{ background: '#ffdede' }}
>
<div className="image">
<ParentSize>
Expand Down Expand Up @@ -772,7 +778,7 @@ export default class Gallery extends React.Component {
<div
className="gallery-item"
style={{
background: '#FAF7E9',
background: '#eaedff',
}}
>
<div className="image">
Expand Down Expand Up @@ -876,6 +882,7 @@ export default class Gallery extends React.Component {
.image {
flex: 1;
display: flex;
overflow: hidden;
}
.details {
text-align: center;
Expand Down
1 change: 1 addition & 0 deletions packages/vx-demo/components/tiles/responsive.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export default class App extends React.Component {
.app-graph {
display: flex;
flex: 1;
overflow: hidden;
}
`}</style>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/vx-responsive/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"lodash": "^4.0.8",
"resize-observer-polyfill": "1.4.2"
"resize-observer-polyfill": "1.5.0"
},
"peerDependencies": {
"react": "^15.0.0-0 || ^16.0.0-0"
Expand Down

0 comments on commit 8191a74

Please sign in to comment.