From 8cd34e49bd5e15d269950b09866bf746cb8d9731 Mon Sep 17 00:00:00 2001
From: pittaxx <pittaxx@gmail.com>
Date: Sat, 9 Jan 2016 18:47:04 +0200
Subject: [PATCH] Removed extra scrollbars at medium width. Cleared floating
 for todo tab in medium width.

---
 website/public/css/helpers.styl               | 5 +++++
 website/public/css/tasks.styl                 | 6 ------
 website/public/css/variables/screen-size.styl | 1 +
 website/views/shared/tasks/index.jade         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/website/public/css/helpers.styl b/website/public/css/helpers.styl
index f043af599b..c295f7430e 100644
--- a/website/public/css/helpers.styl
+++ b/website/public/css/helpers.styl
@@ -61,3 +61,8 @@
 
   .pull-right-lg
     float: right
+
+// Making sure that the To-Dos tab always flow right on medium screens.
+@media (min-width: $sm-min-screen-width) and (max-width: $sm-max-screen-width)
+  .new-row-md
+    clear: left
diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl
index 07d0206b3d..c0e31b4178 100644
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -156,12 +156,6 @@ for $stage in $stages
   .task:hover
     cursor: auto
 
-// 50% width columns with scrollbars for tablets
-@media (min-width: $sm-min-screen-width) and (max-width: 970px)
-  .task-column
-    max-height: 18.6em
-    overflow-y: scroll
-
 // "Add new task" form
 // -----------------
 .task-add
diff --git a/website/public/css/variables/screen-size.styl b/website/public/css/variables/screen-size.styl
index d9444ac657..df12727945 100644
--- a/website/public/css/variables/screen-size.styl
+++ b/website/public/css/variables/screen-size.styl
@@ -3,6 +3,7 @@
 
 $xs-max-screen-width = 767px
 $sm-min-screen-width = 768px
+$sm-max-screen-width = 991px
 $md-min-screen-width = 992px
 $lg-min-screen-width = 1200px
 
diff --git a/website/views/shared/tasks/index.jade b/website/views/shared/tasks/index.jade
index 5cc8d27f89..b1957f9a00 100644
--- a/website/views/shared/tasks/index.jade
+++ b/website/views/shared/tasks/index.jade
@@ -6,7 +6,7 @@ include ./task_view/mixins
 script(id='templates/habitrpg-tasks.html', type="text/ng-template")
   .tasks-lists.container-fluid
     .row
-      .col-md-3.col-sm-6(ng-repeat='list in lists', ng-class='::{"rewards-module": list.type==="reward"}')
+      .col-md-3.col-sm-6(ng-repeat='list in lists', ng-class='::{ "rewards-module": list.type==="reward", "new-row-md": list.type==="todo" }')
         .task-column(class='{{::list.type}}s')
 
           include ./task_view/graph
@@ -22,7 +22,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
           alert.alert-warning.dailiesRestingInInn(ng-if='list.type == "daily" && user.preferences.sleep && !$state.includes("options.social.challenges")')
             i.glyphicon.glyphicon-warning-sign &nbsp;
             =env.t('dailiesRestingInInn')
-            
+
             button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})')
               | {{env.t('innCheckOut')}}