From 87fafdd1b177bf223f23533aed57164d1d3f2270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 9 Jun 2016 10:30:02 +0200 Subject: [PATCH] Two columns in dashboard --- app/modules/home/home.jade | 4 ++- app/modules/home/home.scss | 27 +++++++++++++++++++-- app/modules/home/working-on/working-on.jade | 3 --- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/modules/home/home.jade b/app/modules/home/home.jade index d1af66bd..c712c3d8 100644 --- a/app/modules/home/home.jade +++ b/app/modules/home/home.jade @@ -2,6 +2,8 @@ doctype html div.home-wrapper.centered div.duty-summary - div(tg-working-on) + h1 + span.green {{"HOME.DASHBOARD" | translate}} + tg-working-on.dashboard-container aside.project-list(tg-home-project-list) diff --git a/app/modules/home/home.scss b/app/modules/home/home.scss index 5d1d28f4..3aff4057 100644 --- a/app/modules/home/home.scss +++ b/app/modules/home/home.scss @@ -1,9 +1,32 @@ .home-wrapper { display: flex; + @include breakpoint(tablet) { + flex-direction: column; + } + @include breakpoint(mobile) { + flex-direction: column; + } .duty-summary { flex: 1; margin-right: 2rem; } + .dashboard-container { + display: flex; + flex-direction: row; + @include breakpoint(laptop) { + flex-direction: column; + } + @include breakpoint(tablet) { + flex-direction: column; + } + @include breakpoint(mobile) { + flex-direction: column; + } + } + .working-on-container { + margin-right: .5rem; + padding-right: .5rem; + } .project-list { width: 250px; } @@ -12,11 +35,11 @@ } .title-bar { @include font-type(light); - @include font-size(larger); + @include font-size(large); align-content: center; background: $mass-white; display: flex; margin: 0 0 .5rem; - padding: .9rem 1rem; + padding: .5rem 1rem; } } diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade index e434bfa5..22b032de 100644 --- a/app/modules/home/working-on/working-on.jade +++ b/app/modules/home/working-on/working-on.jade @@ -1,6 +1,3 @@ -h1 - span.green {{"HOME.DASHBOARD" | translate}} - section.working-on-container header h1.title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")