Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
59f0f2c0
Commit
59f0f2c0
authored
Oct 22, 2020
by
rschamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the map always 100% width with 2:1 aspect ratio
parent
964204c7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
src/components/world-map/world-map.jsx
src/components/world-map/world-map.jsx
+1
-2
src/views/annual-report/annual-report.jsx
src/views/annual-report/annual-report.jsx
+0
-4
src/views/annual-report/annual-report.scss
src/views/annual-report/annual-report.scss
+7
-0
No files found.
src/components/world-map/world-map.jsx
View file @
59f0f2c0
...
...
@@ -69,6 +69,7 @@ const WorldMap = props => (
autosize
:
true
}
}
style=
{
{
position
:
'
absolute
'
,
display
:
'
block
'
}
}
/>
);
...
...
@@ -76,8 +77,6 @@ WorldMap.propTypes = {
colorIndex
:
PropTypes
.
arrayOf
(
PropTypes
.
string
),
countryData
:
PropTypes
.
arrayOf
(
PropTypes
.
string
),
countryNames
:
PropTypes
.
arrayOf
(
PropTypes
.
string
)
// mapHeight: PropTypes.number,
// mapWidth: PropTypes.number
};
module
.
exports
=
WorldMap
;
src/views/annual-report/annual-report.jsx
View file @
59f0f2c0
...
...
@@ -738,7 +738,6 @@ class AnnualReport extends React.Component {
colorIndex=
{
colorIndex
}
countryData=
{
countryData
}
countryNames=
{
countryNames
}
mapHeight=
{
471
}
/>
</
MediaQuery
>
<
MediaQuery
...
...
@@ -750,7 +749,6 @@ class AnnualReport extends React.Component {
colorIndex=
{
colorIndex
}
countryData=
{
countryData
}
countryNames=
{
countryNames
}
mapHeight=
{
384
}
/>
</
MediaQuery
>
<
MediaQuery
...
...
@@ -762,7 +760,6 @@ class AnnualReport extends React.Component {
colorIndex=
{
colorIndex
}
countryData=
{
countryData
}
countryNames=
{
countryNames
}
mapHeight=
{
320
}
/>
</
MediaQuery
>
<
MediaQuery
maxWidth=
{
frameless
.
mobileIntermediate
-
1
}
>
...
...
@@ -771,7 +768,6 @@ class AnnualReport extends React.Component {
colorIndex=
{
colorIndex
}
countryData=
{
countryData
}
countryNames=
{
countryNames
}
mapHeight=
{
240
}
/>
</
MediaQuery
>
</
div
>
...
...
src/views/annual-report/annual-report.scss
View file @
59f0f2c0
...
...
@@ -577,10 +577,17 @@ p {
.map-wrapper
{
width
:
100%
;
height
:
0
;
position
:
relative
;
padding-top
:
50%
;
}
.map
{
width
:
100%
;
height
:
100%
;
position
:
absolute
;
top
:
0
;
left
:
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment