From a2791f693aa498e4984e086f2048199204272081 Mon Sep 17 00:00:00 2001 From: Sandra Vilder Date: Fri, 14 Jun 2019 12:45:50 +0200 Subject: [PATCH] =?UTF-8?q?titres=20dashboard=20align=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/pages/_dashboard.scss | 9 +++++++++ app/views/pages/dashboard.html.erb | 14 ++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/pages/_dashboard.scss b/app/assets/stylesheets/pages/_dashboard.scss index d406532..3496fb5 100644 --- a/app/assets/stylesheets/pages/_dashboard.scss +++ b/app/assets/stylesheets/pages/_dashboard.scss @@ -1,4 +1,13 @@ +.title-stats, +.title-rewards { + padding-left: 30px; +} + +.title-ongoing { + padding-left: 12px; +} + .titles { display: flex; justify-content: space-between; diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb index b7fc280..3a82e22 100644 --- a/app/views/pages/dashboard.html.erb +++ b/app/views/pages/dashboard.html.erb @@ -1,14 +1,16 @@ <%= content_for(:page, "dashboard") %>
-

Stats

-
- +
+

Stats

+
+ +
-

Rewards

+

Rewards

<% if @counter[:dailyactivities] >= 3 && @counter[:futureme] >= 3 && @counter[:interactions] >= 3 && @counter[:curiosity] >= 3 %>
@@ -82,9 +84,9 @@
<% if @undone_participations.length >= 2 %> -

Ongoing challenges (<%= @undone_participations.length %>)

+

Ongoing challenges (<%= @undone_participations.length %>)

<% else %> -

Ongoing challenge (<%= @undone_participations.length %>)

+

Ongoing challenge (<%= @undone_participations.length %>)

<% end %>