Commit 2d332908 authored by Edu Trevisan's avatar Edu Trevisan

Layout improvements

parent d98571fc
......@@ -49,7 +49,7 @@ class CardFooter extends Component {
icon="assessment"
tooltip="Acesso aos Dados"
// tooltipOptions={{ position: 'top' }}
style={{ margin:'3px'}}
style={{ margin: '3px'}}
>
</Button>
</Col>
......
......@@ -35,15 +35,13 @@ class UfBar extends Component {
render() {
var contrastString = this.context.state.contrast;
return (
<div className={`${contrastString}uf-bar z-depth-1`}>
<Row >
{this.props.img &&
<Col s={2}> <img src={this.props.img} alt="img"/></Col>
}
<Col s={5}> <h5 id="uf-name">{this.props.ufname}</h5> </Col>
<Col s={5}> <h5 id="uf-comunidades">{this.props.val}</h5> </Col>
</Row>
</div>
<Row className={`${contrastString}uf-bar z-depth-1 valign-wrapper`}>
{this.props.img &&
<Col s={2}> <img src={this.props.img} alt="img"/></Col>
}
<Col s={5}> <h5 id="uf-name">{this.props.ufname}</h5> </Col>
<Col s={5}> <h5 id="uf-comunidades">{this.props.val}</h5> </Col>
</Row>
);
}
}
......
......@@ -30,6 +30,7 @@ a {
.footer{
margin-top: 10px;
width:100%;
}
/* Contrast rules */
......
......@@ -89,7 +89,7 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
width: 100%;
flex: auto;
justify-content: space-between;
}
}
@media only screen and (max-width: 1292px) {
.tabs {
......@@ -117,6 +117,7 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
border: 1px solid white;
display:flex;
flex-direction: column;
width:100%;
}
.Contrastcard-MainPage .card-reveal{
......
......@@ -22,6 +22,9 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
.uf-bar{
background-color: #EEE;
width:100%;
margin-top:10px;
margin-bottom:10px;
}
.Contrastuf-bar{
......
......@@ -42,6 +42,7 @@ import {
} from '../enviroment';
import axios from 'axios';
import './Styles/AfricanIndicator.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const type = "african";
......
......@@ -42,6 +42,7 @@ import {
} from '../enviroment';
import axios from 'axios';
import './Styles/CiganosIndicator.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const type = "ciganos";
......
......@@ -34,8 +34,8 @@ import BrasilMap from '../Components/Map';
import { Map, TileLayer, Polygon } from 'react-leaflet';
import PageTable from '../Components/PageTable'
import { findFileById } from '../Components/Communities';
import './Styles/Eixo1.css'
import './Styles/Pannel.css'
import { Store } from '../Store';
......
......@@ -41,6 +41,7 @@ import {
getServerURL,
} from '../enviroment';
import './Styles/Eixo2.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const type = "eixo_2";
......
......@@ -42,6 +42,7 @@ import {
} from '../enviroment';
import axios from 'axios';
import './Styles/Eixo3.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const type = "eixo_3";
......
......@@ -43,6 +43,7 @@ import {
createIntervals,
} from '../enviroment';
import './Styles/Eixo4.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const type = "eixo_4";
......
.pannel {
display:flex;
flex-direction: column;
width:100%;
background-color: #FFF;
}
.pannel > .card-content, .pannel > .card-content > div{
display:flex;
flex-direction:column;
width:100%;
flex:auto;
justify-content:space-around;
}
.Contrastpannel > .card-content, .Contrastpannel > .card-content > div {
display:flex;
flex-direction:column;
width:100%;
flex:auto;
justify-content:space-around;
}
.Contrastpannel {
display:flex;
flex-direction: column;
/* width:100%; */
color: yellow;
background-color: black;
border: 1px solid white;
}
.Contrastpannel > .card-content > .card-title{
color: yellow !important;
}
......@@ -54,7 +54,8 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
grid-template-areas: "pan1 pan2"
"pan3 pan4"
"pan5 pan6"
"pan7 pan8";
"pan7 pan7"
"pan8 pan8";
}
}
......
......@@ -33,6 +33,7 @@ import { getServerURL } from '../enviroment'
import './Styles/YouthEducation.css'
import BuildStackedBar from '../Charts/BuildStackedBar'
import BuildBar from '../Charts/BuildBar'
import './Styles/Pannel.css'
......@@ -148,9 +149,7 @@ class YouthEducation extends Component {
/>
<Button className="clearmapbtn" onClick={this.clearMap}> Limpar Mapa </Button>
</Row>
<Row>
<UfBar ufname={getStateExtendedName(this.state.clickedInMap).currentState} />
</Row>
<UfBar ufname={getStateExtendedName(this.state.clickedInMap).currentState} />
<BuildStackedBar
dataKey='Ano'
data={this.state.charts['Medio Comp']}
......
......@@ -35,6 +35,7 @@ import axios from 'axios';
import { getServerURL } from '../enviroment'
import './Styles/YouthJob.css'
import './Styles/Pannel.css'
const serverURL = getServerURL();
const defaultData = 'youth_jobs?dims=year,cor_raca,trabalhou,vinculo,rendimento_faixa,uf'
......
......@@ -22,6 +22,7 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
import React, { Component } from 'react';
import './Styles/YouthPresentation.css'
import './Styles/Pannel.css'
import { Store } from '../Store'
/**
......
......@@ -32,6 +32,7 @@ import BuildLineNotFixed from '../Charts/BuildLineNotFixed'
import BuildBar from '../Charts/BuildBar'
import BuildPie from '../Charts/BuildPie'
import Table from '../Components/Table'
import './Styles/Pannel.css'
import * as data from '../JsonsAntigos/juventude-viva/jvvu'
import './Styles/YouthVulnerabilities.css'
......@@ -75,10 +76,10 @@ class YouthVulnerabilities extends Component {
return (
<div>
<Row>
<Col l={3} m={4} s={5}>
<Col l={3} m={5} s={12}>
<h4 className={`${contrastString}eixoHeaderY`}>Vulnerabilidade</h4>
</Col>
<Col l={9} m={8} s={12}>
<Col l={9} m={7} s={12}>
<br />
<p className={`${contrastString}eixoSubHeader`}> Clique sobre qualquer estado no mapa para apresentar os
dados somente daquele estado. Clique em limpar mapa para voltar aos dados do Brasil. </p>
......@@ -139,7 +140,7 @@ class YouthVulnerabilities extends Component {
</Card>
<Card id="jv1pannel-8" className={`${contrastString}pannel hoverable`} title="Municípios que Aderiram ao Plano">
<Table header={["Nome","UF","Data de adesão"]} body ={this.fixDataP8(data.getvup8()[getStateExtendedName(this.state.clickedInMap).currentState])} classes="striped smallCells" divClasses="scrolltable" height='950'/>
<Table header={["Nome","UF","Data de adesão"]} body ={this.fixDataP8(data.getvup8()[getStateExtendedName(this.state.clickedInMap).currentState])} classes="striped smallCells" divClasses="scrolltable" height='800'/>
<CardFooter data={csv8} source="Sistema de Informações de Mortalidade (SIM) (MS, 2010) e Censo Demográfico (IBGE, 2010)"/>
......
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