Skip to content

Commit

Permalink
Merge pull request #119 from PEM-Humboldt/hotfix-1.2.3
Browse files Browse the repository at this point in the history
Hotfix 1.2.3
  • Loading branch information
alegnaaived authored Dec 12, 2018
2 parents 4db798d + 651f955 commit e228831
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 85 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "biotablero18.10.31",
"version": "1.2.2",
"version": "1.2.3",
"private": true,
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion src/GraphLoader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const GraphLoader = (
labelY={labelY}
width={width}
height="280"
dotOnClick={elementOnClick}
elementOnClick={elementOnClick}
colors={colors}
activeBiome={activeBiome}
/>
Expand Down
3 changes: 2 additions & 1 deletion src/Search.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class Search extends Component {
label: ea.name,
});
});
selectorData[0].options[2].options[0].data = easList;
// TODO: Change selectorData to load all data from RestAPI
if (selectorData[0].options[2].id === 'jurisdicciones') selectorData[0].options[2].options[0].data = easList;
}).catch(() => this.reportConnError());
}

Expand Down
Binary file added src/assets/img/login.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 28 additions & 21 deletions src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ a {
}

.wrapper {
min-height: calc(100vh - 160px);
min-height: calc(100vh - 264px);
width: 100%;
display: block;
background-image: -webkit-linear-gradient(bottom, #d5d4d0 0%, #d5d4d0 1%, #eeeeec 31%, #efeeec 75%, #e9e9e7 100%);
Expand Down Expand Up @@ -242,15 +242,10 @@ header h3 a {
font-weight: 600;
line-height: 0;
display: inline-block;
max-width: 120px;
height: 22px;
line-height: 22px;
padding: 15px 0 15px 15px;
color: #2a363b;
/* -ms-text-overflow: ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;*/
}

.iconUserLogged {
Expand Down Expand Up @@ -1486,15 +1481,10 @@ p.legcomp {
border-bottom: 1px solid #ea495f;
}

.complist {
.complist-longer {
margin-top: 5px;
}

.complist-longer{
margin-top: 5px;
padding-bottom: 150px;
}

.popbtns {
padding-bottom: 10px;
/* display: -webkit-flex;
Expand All @@ -1505,21 +1495,23 @@ p.legcomp {
justify-content: space-between; */
}

.complist svg {
.complist-longer svg {
color: #ea495f;
float: left;
width: 25px;
height: 25px;
}

.complist-longer svg {
color: #ea495f;
float: left;
width: 25px;
height: 25px;
.Select-menu-outer {
top: auto;
bottom: 100%;
}

.Select-menu-outer { top: auto; bottom: 100%; }
.complist-longer .Select-menu-outer {
position: relative !important;
height: auto !important;
display: block !important;
}

.Select-option.is-focused {
background-color: rgba(252, 228, 232) !important;
Expand Down Expand Up @@ -1906,7 +1898,8 @@ tspan, .vx-axis-label {
right: 0;
border-radius: 5px 0 0 5px;
padding: 140px 20px 30px;
background-image: url(./img/bgmountain.png);
background-image: url(./img/login.png);/*
background-image: url(./img/bgmountain.png);*/
background-repeat: no-repeat;
}

Expand Down Expand Up @@ -2277,11 +2270,15 @@ tspan, .vx-axis-label {
}
}

@media screen and (max-width: 630px){
@media screen and (max-width: 619px){
menu, .content {
display: none;
}

.userInfo h6 {
display: none;
}

}

@media screen and (max-width: 490px){
Expand All @@ -2290,3 +2287,13 @@ tspan, .vx-axis-label {
width: 90%;
}
}

@media screen and (max-width: 450px){

.logoGEB {
width: 65px;
-webkit-background-size: contain;
background-size: contain;
}

}
8 changes: 4 additions & 4 deletions src/charts/DotsGraph.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ const z = d => d.affected_natural;
let tooltipTimeout;

export default withTooltip(({
width, height, colors, dataJSON: points, activeBiome, labelX, labelY, dotOnClick,
width, height, colors, dataJSON: points, activeBiome, labelX, labelY, elementOnClick,
hideTooltip, showTooltip, tooltipOpen, tooltipData, tooltipTop,
}) => {
const margin = {
top: 0, bottom: 40, left: 80, right: 40,
top: 20, bottom: 60, left: 80, right: 40,
};
const xMax = width - margin.left - margin.right;
const yMax = height - 65;
const yMax = height - 85;
if (width < 10) return null;
if (height < 10) return null;

Expand Down Expand Up @@ -100,7 +100,7 @@ export default withTooltip(({
}, 500);
}}
onClick={() => () => {
dotOnClick(name(point));
elementOnClick(name(point));
}}
/>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/compensation/CustomInputNumber.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class CustomInputNumber extends React.Component {
this.setState(prevState => ({
add: !prevState.add,
inputError: error,
value: action === '-' ? 0 : Number(prevState.value).toFixed(4),
value: action === '-' ? 0 : Number(prevState.value).toFixed(2),
}));
}

Expand Down
Loading

0 comments on commit e228831

Please sign in to comment.