Skip to content
Snippets Groups Projects
Commit a068e38f authored by Loïc Poullain's avatar Loïc Poullain
Browse files

Fix style

parent fb3e298d
Branches
Tags
1 merge request!43Mettre à jour Material UI vers la version 4
...@@ -51,24 +51,6 @@ const styles = () => ({ ...@@ -51,24 +51,6 @@ const styles = () => ({
pom_verte: { pom_verte: {
color: "#00FF00", color: "#00FF00",
}, },
simpop: {
display: "flex",
flex: "1",
flexDirection: "column",
height: "25vh",
marginTop: "10px",
paddingLeft: "3px",
width: "50%",
},
sourceInsee: {
color: "#B1B1B1",
fontFamily: "Lato",
fontSize: "12px",
fontWeight: "regular",
marginBottom: "0px", //
marginLeft: "14px",
textAlign: "right",
},
subtitleCarteEtat: { subtitleCarteEtat: {
color: "#565656", color: "#565656",
fontFamily: "Lato", fontFamily: "Lato",
...@@ -151,7 +133,7 @@ class CarteEtat extends PureComponent { ...@@ -151,7 +133,7 @@ class CarteEtat extends PureComponent {
<div className={styles2.mainChart}> <div className={styles2.mainChart}>
<BarChart deciles={deciles} /> <BarChart deciles={deciles} />
</div> </div>
<div className={classes.simpop}> <div className={styles2.simpop}>
<div className={classNames({ <div className={classNames({
[styles2.montantImpots]: true, [styles2.montantImpots]: true,
[styles2.noPLF]: !montrerPLF, [styles2.noPLF]: !montrerPLF,
...@@ -223,13 +205,12 @@ class CarteEtat extends PureComponent { ...@@ -223,13 +205,12 @@ class CarteEtat extends PureComponent {
</div> </div>
</div> </div>
</div> </div>
<Typography className={classes.sourceInsee}> <div className={styles2.sourceInsee}>
* Chiffrages indicatifs. * Chiffrages indicatifs.
<br /> <br />
{" "}
Estimation à partir des données de l&apos;Enquête Estimation à partir des données de l&apos;Enquête
Revenus Fiscaux et Sociaux (ERFS-FPR) de l&apos;Insee. Revenus Fiscaux et Sociaux (ERFS-FPR) de l&apos;Insee.
</Typography> </div>
</div> </div>
)} )}
</CardContent> </CardContent>
......
...@@ -59,11 +59,20 @@ ...@@ -59,11 +59,20 @@
.chartWrapper { .chartWrapper {
height: 210px; height: 210px;
display: flex; display: flex;
width: 100%;
} }
.mainChart{ .mainChart{
flex: 3, flex: 1;
}
.simpop {
margin-top: 10px;
padding-left: "3px";
> div {
display: flex;
align-items: baseline;
}
} }
.titleWrapper { .titleWrapper {
...@@ -74,3 +83,11 @@ ...@@ -74,3 +83,11 @@
margin: 0px; margin: 0px;
overflow-x:scroll; overflow-x:scroll;
} }
.sourceInsee {
color: #B1B1B1;
font-family: $default-font-family;
font-size: 12px;
text-align: right;
margin-left: 15px;
}
\ No newline at end of file
...@@ -241,9 +241,9 @@ class GagnantsPerdantsCard extends PureComponent { ...@@ -241,9 +241,9 @@ class GagnantsPerdantsCard extends PureComponent {
classes={{ root: classes.styleIconPerdant }} classes={{ root: classes.styleIconPerdant }}
fontSize="default" fontSize="default"
/> />
<Typography inline classes={{ root: classes.titleCard }}> <span className={styles2.titleCard}>
ayant une augmentation de l&apos;IR ayant une augmentation de l&apos;IR
</Typography> </span>
<div className={classes.containerImpact}> <div className={classes.containerImpact}>
{ {
...@@ -296,9 +296,10 @@ class GagnantsPerdantsCard extends PureComponent { ...@@ -296,9 +296,10 @@ class GagnantsPerdantsCard extends PureComponent {
classes={{ root: classes.styleIconGagnant }} classes={{ root: classes.styleIconGagnant }}
fontSize="default" fontSize="default"
/> />
<Typography inline classes={{ root: classes.titleCard }}> <span className={styles2.titleCard}>
ayant une baisse de l&apos;IR ayant une baisse de l&apos;IR
</Typography> </span>
<div className={classes.containerImpact}> <div className={classes.containerImpact}>
{ {
montrerPLF montrerPLF
...@@ -334,9 +335,10 @@ class GagnantsPerdantsCard extends PureComponent { ...@@ -334,9 +335,10 @@ class GagnantsPerdantsCard extends PureComponent {
classes={{ root: classes.styleIconNeutre }} classes={{ root: classes.styleIconNeutre }}
fontSize="default" fontSize="default"
/> />
<Typography inline classes={{ root: classes.titleCard }}> <span className={styles2.titleCard}>
non concernés non concernés
</Typography> </span>
<div className={classes.containerImpact}> <div className={classes.containerImpact}>
{ {
montrerPLF montrerPLF
......
...@@ -58,3 +58,11 @@ ...@@ -58,3 +58,11 @@
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
.titleCard {
color: $dark-grey-text-color;
font-family: $default-font-family;
font-size: 18px;
font-weight: bold;
margin-left: 10px;
}
\ No newline at end of file
@import "./variables"; @import "./variables";
body {
font-size: 1rem !important;
}
h1 { h1 {
font-family: $default-font-family; font-family: $default-font-family;
color: $dark-grey-text-color; color: $dark-grey-text-color;
......
...@@ -5,7 +5,6 @@ const theme = createMuiTheme({ ...@@ -5,7 +5,6 @@ const theme = createMuiTheme({
typography: { typography: {
fontFamily: ["\"Lato\", sans-serif", "Lora"].join(","), fontFamily: ["\"Lato\", sans-serif", "Lora"].join(","),
fontWeightMedium: 500, fontWeightMedium: 500,
useNextVariants: true,
// TYPOGRAPHIE SIMULATEUR // TYPOGRAPHIE SIMULATEUR
...@@ -35,14 +34,6 @@ const theme = createMuiTheme({ ...@@ -35,14 +34,6 @@ const theme = createMuiTheme({
// fontWeight: 'light' // fontWeight: 'light'
}, },
subtitle1: {
fontSize: 12,
},
body1: {
fontWeight: 500,
},
button: { button: {
fontStyle: "regular", fontStyle: "regular",
fontWeight: 700, fontWeight: 700,
...@@ -63,17 +54,7 @@ const theme = createMuiTheme({ ...@@ -63,17 +54,7 @@ const theme = createMuiTheme({
fontSize: "24px", fontSize: "24px",
fontWeight: "bold", fontWeight: "bold",
}, },
// h4: {},
// h6: {},
body2: {
fontFamily: "Lora",
fontSize: "18px",
},
subtitle2: {
fontSize: 12,
},
}, },
palette: { palette: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment