From fd215280a8e8cd22c4691a259476f7840502e8b4 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 6 Oct 2017 15:54:54 +0100 Subject: [PATCH] Some more scroll fixes. --- .../main/project-list/project-list.coffee | 4 +-- .../public/stylesheets/app/project-list.less | 27 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index cafbd7c81b..62bae9d2db 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -38,8 +38,8 @@ define [ # footer. So we now start to track to the bottom of the window, with a 25px padding # since the footer is hidden below the fold. Don't ever get bigger than the sidebar # though since that's what triggered this happening in the first place. - if height < sideBarHeight - height = Math.min(sideBarHeight, $window.innerHeight - topOffset - 25) + # if height < sideBarHeight + # height = Math.min(sideBarHeight, $window.innerHeight - topOffset - 25) $scope.projectListHeight = height diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 91dc87e875..41e5df7ce2 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -18,44 +18,45 @@ } .project-list-page { - // display: flex; - // flex-direction: column; - // flex-grow: 1; position: absolute; top: @header-height; bottom: @footer-height; padding-top: 0; padding-bottom: 0; width: 100%; + overflow: scroll; } -.project-list-content when (@is-overleaf = true) { +.project-list-content when (@is-overleaf) { .container-fluid; margin: 0; + height: 100%; } .project-list-content when (@is-overleaf = false) { .container; } -.project-list-content { - height: 100%; -} +// .project-list-content when (@is-overleaf) { +// height: 100%; +// } + +// .project-list-content when (@is-overleaf = false) { +// overflow: scroll; +// } + + .sidebar-new-proj-btn when (@is-overleaf) { .btn-block; } - .project-list-row { + .project-list-row when (@is-overleaf) { height: 100%; } - .project-list-container { + .project-list-container when (@is-overleaf) { height: 100%; } - .project-list-content when (@is-overleaf = false) { - overflow: scroll; - } - .project-list-sidebar { background-color: @sidebar-bg; padding-top: @content-margin-top;