[airavata-django-portal] branch master updated: Fix scrolling to occur on outer most wrapper, unless there is a sidebar

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git


The following commit(s) were added to refs/heads/master by this push:
     new d4cb31c  Fix scrolling to occur on outer most wrapper, unless there is a sidebar
d4cb31c is described below

commit d4cb31cd7042fd224cdec96d18daf345b6bad773
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Apr 25 16:57:42 2019 -0400

    Fix scrolling to occur on outer most wrapper, unless there is a sidebar
---
 django_airavata/static/common/scss/main.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/django_airavata/static/common/scss/main.scss b/django_airavata/static/common/scss/main.scss
index 677fb8c..92d459b 100644
--- a/django_airavata/static/common/scss/main.scss
+++ b/django_airavata/static/common/scss/main.scss
@@ -110,22 +110,23 @@ body {
   display: flex;
   flex-direction: row;
   flex-grow: 1;
+  overflow-y: auto;
 }
 
 .main-content {
     flex-grow: 1;
     padding: 1rem;
-    overflow-y: scroll;
     max-width: 1200px;
 
     &--with-sidebar {
       max-width: none;
+      overflow-y: auto;
     }
 }
 
 /* Add extra padding at the bottom to accommodate for the scrolling under the fixed width header */
 .main-content > :last-child {
-    padding-bottom: 70px;
+    padding-bottom: 90px;
 }
 
 .sidebar {