Commit 67ff3927 authored by rschamp's avatar rschamp Committed by Karishma Chadha

Start on responsive map

parent d1285b91
......@@ -35,8 +35,8 @@ $cols11: (11 * ($column + $gutter) - $gutter) / $em;
$cols12: (12 * ($column + $gutter) - $gutter) / $em;
$desktop: 942px;
$mobileIntermediate: 640px;
$tabletPortrait: 768px;
$mobileIntermediate: 640px;
$mobile: 480px;
/* Media Queries */
......
......@@ -66,9 +66,7 @@ const WorldMap = props => (
pad: 0,
autoexpand: true
},
// autosize: true,
width: props.mapWidth,
height: props.mapHeight
autosize: true
}
}
/>
......
......@@ -729,14 +729,14 @@ class AnnualReport extends React.Component {
<p>
<FormattedMessage id="annualReport.reachMapBlurb" />
</p>
<div className="map-wrapper">
<MediaQuery minWidth={frameless.desktop}>
<WorldMap
className="map"
colorIndex={colorIndex}
countryData={countryData}
countryNames={countryNames}
mapHeight={530}
mapWidth={1060}
mapHeight={471}
/>
</MediaQuery>
<MediaQuery
......@@ -748,8 +748,7 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex}
countryData={countryData}
countryNames={countryNames}
mapHeight={450}
mapWidth={900}
mapHeight={384}
/>
</MediaQuery>
<MediaQuery
......@@ -761,8 +760,7 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex}
countryData={countryData}
countryNames={countryNames}
mapHeight={400}
mapWidth={800}
mapHeight={320}
/>
</MediaQuery>
<MediaQuery maxWidth={frameless.mobileIntermediate - 1}>
......@@ -771,12 +769,12 @@ class AnnualReport extends React.Component {
colorIndex={colorIndex}
countryData={countryData}
countryNames={countryNames}
mapHeight={172}
mapWidth={396}
mapHeight={240}
/>
</MediaQuery>
</div>
</div>
</div>
<div className="inner">
<div className="reach-translation">
<div className="reach-translation-intro">
......
......@@ -551,7 +551,6 @@ p {
}
.reach-map {
width: 1064px;
background-color: $ui-white;
border-radius: 6px;
color: $type-gray;
......@@ -569,6 +568,15 @@ p {
width: 100%;
border-radius: 0px;
}
.map-wrapper {
width: 100%;
}
.map {
width: 100%;
}
}
.reach-translation {
......
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