Commit 59f0f2c0 authored by rschamp's avatar rschamp

Make the map always 100% width with 2:1 aspect ratio

parent 964204c7
...@@ -69,6 +69,7 @@ const WorldMap = props => ( ...@@ -69,6 +69,7 @@ const WorldMap = props => (
autosize: true autosize: true
} }
} }
style={{position: 'absolute', display: 'block'}}
/> />
); );
...@@ -76,8 +77,6 @@ WorldMap.propTypes = { ...@@ -76,8 +77,6 @@ WorldMap.propTypes = {
colorIndex: PropTypes.arrayOf(PropTypes.string), colorIndex: PropTypes.arrayOf(PropTypes.string),
countryData: PropTypes.arrayOf(PropTypes.string), countryData: PropTypes.arrayOf(PropTypes.string),
countryNames: PropTypes.arrayOf(PropTypes.string) countryNames: PropTypes.arrayOf(PropTypes.string)
// mapHeight: PropTypes.number,
// mapWidth: PropTypes.number
}; };
module.exports = WorldMap; module.exports = WorldMap;
...@@ -738,7 +738,6 @@ class AnnualReport extends React.Component { ...@@ -738,7 +738,6 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex} colorIndex={colorIndex}
countryData={countryData} countryData={countryData}
countryNames={countryNames} countryNames={countryNames}
mapHeight={471}
/> />
</MediaQuery> </MediaQuery>
<MediaQuery <MediaQuery
...@@ -750,7 +749,6 @@ class AnnualReport extends React.Component { ...@@ -750,7 +749,6 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex} colorIndex={colorIndex}
countryData={countryData} countryData={countryData}
countryNames={countryNames} countryNames={countryNames}
mapHeight={384}
/> />
</MediaQuery> </MediaQuery>
<MediaQuery <MediaQuery
...@@ -762,7 +760,6 @@ class AnnualReport extends React.Component { ...@@ -762,7 +760,6 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex} colorIndex={colorIndex}
countryData={countryData} countryData={countryData}
countryNames={countryNames} countryNames={countryNames}
mapHeight={320}
/> />
</MediaQuery> </MediaQuery>
<MediaQuery maxWidth={frameless.mobileIntermediate - 1}> <MediaQuery maxWidth={frameless.mobileIntermediate - 1}>
...@@ -771,7 +768,6 @@ class AnnualReport extends React.Component { ...@@ -771,7 +768,6 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex} colorIndex={colorIndex}
countryData={countryData} countryData={countryData}
countryNames={countryNames} countryNames={countryNames}
mapHeight={240}
/> />
</MediaQuery> </MediaQuery>
</div> </div>
......
...@@ -577,10 +577,17 @@ p { ...@@ -577,10 +577,17 @@ p {
.map-wrapper { .map-wrapper {
width: 100%; width: 100%;
height: 0;
position: relative;
padding-top: 50%;
} }
.map { .map {
width: 100%; width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment