Skip to content

Commit

Permalink
Copy and ui updates
Browse files Browse the repository at this point in the history
  • Loading branch information
marineb committed Jan 6, 2018
1 parent 8bad5e0 commit 0706e29
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/js/components/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ class Dashboard extends Component {
<DashboardRow>
<DashboardBox className="dashboard-progression">
<Link to={`/${locale}/results`} className="dashboard-progression__link">
<h3 className="dashboard-box__title">Mise en œuvre des principales mesures</h3>
<h3 className="dashboard-box__title">Mise en œuvre du Contrat avec la Nation</h3>
<LastUpdated className="dashboard-updated" />

{!!Object.keys(status.measures).length &&
<Progressions measures={status.measures} total={status.total} />}
</Link>
</DashboardBox>
<DashboardBox className="dashboard-popular">
<h3 className="dashboard-box__title">Vos 3 coups de cœur</h3>
<h3 className="dashboard-box__title">Les 3 mesures les plus importantes pour vous</h3>
{!!allMeasures.items.length &&
<Measures className="popular-measures" measures={measures} viewAll />}
<div className="dashboard-box__cta">
Expand Down
6 changes: 3 additions & 3 deletions src/scss/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
background-color: white;
padding: 20px;
border: 1px solid $blueishgray;
margin-bottom: 30px;
margin-bottom: 40px;
font-size: 16px;
font-family: $font-roboto;
line-height: 1.44;
Expand All @@ -122,15 +122,15 @@

@include mq($large-and-up) {
padding: 40px;
flex-basis: 49%;
flex-basis: 48.4%;

&.dashboard-popular {
flex: 2;
}

&.dashboard-progression {
flex: 1;
margin-right: 30px;
margin-right: 40px;
padding: 0;
}
}
Expand Down

0 comments on commit 0706e29

Please sign in to comment.