From d711d61a1fd5918be30c41ee2ceb1fea56a49a6b Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 4 Feb 2014 21:53:23 +0100 Subject: [PATCH] refactor(bs3): re-enable two columns views for tablets --- public/css/tasks.styl | 18 ++++++++++++++---- views/shared/tasks/lists.jade | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/public/css/tasks.styl b/public/css/tasks.styl index 963a425ea4..bde1603316 100644 --- a/public/css/tasks.styl +++ b/public/css/tasks.styl @@ -39,10 +39,15 @@ for $stage in $stages // =================== .tasks-lists - .col-md-3 - padding-left: 10px // Override Bootstrap 15px padding - padding-right: 10px // Override Bootstrap 15px padding - margin-bottom: 15px + + .row + margin-left: -5px + margin-right: -5px + + .col-md-3 + padding-left: 10px // Override Bootstrap 15px padding + padding-right: 10px // Override Bootstrap 15px padding + margin-bottom: 15px // main columns // ------------ @@ -56,6 +61,11 @@ for $stage in $stages margin: 0 0 0.5em padding: 0 +// 50% width columns with scrollbars +@media (max-width: 960px) + .task-column + max-height: 18.6em + overflow-y: scroll // add new task form // ----------------- diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade index b9a767ea41..be5f5d1d0f 100644 --- a/views/shared/tasks/lists.jade +++ b/views/shared/tasks/lists.jade @@ -4,7 +4,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") .tasks-lists.container-fluid .row - .col-md-3(bindonce='lists', ng-repeat='list in lists', bo-class='{"rewards-module": list.type==="reward"}') + .col-md-3.col-sm-6(bindonce='lists', ng-repeat='list in lists', bo-class='{"rewards-module": list.type==="reward"}') .task-column(class='{{list.type}}s') // Todos export/graph options