From 616df9be2c8516aaa64c6e70feeb7d5ab767aa24 Mon Sep 17 00:00:00 2001 From: DD Liu Date: Thu, 25 May 2017 15:26:31 -0400 Subject: [PATCH] make there not be two scroll bars sometimes --- src/components/library/library.css | 5 +++-- src/components/modal/modal.css | 3 ++- src/css/units.css | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/library/library.css b/src/components/library/library.css index c885e490d..73f615191 100644 --- a/src/components/library/library.css +++ b/src/components/library/library.css @@ -4,10 +4,11 @@ .library-scroll-grid { display: flex; justify-content: center; + align-content: flex-start; background: $ui-pane-gray; flex-grow: 1; flex-wrap: wrap; - overflow-y: scroll; - height: 100%; + overflow-y: auto; + height: calc(100% - $library-header-height); padding: 0.5rem; } diff --git a/src/components/modal/modal.css b/src/components/modal/modal.css index ef1a5a74e..f6b9b2363 100644 --- a/src/components/modal/modal.css +++ b/src/components/modal/modal.css @@ -15,7 +15,7 @@ .full-modal-content { position: absolute; outline: none; - overflow-y: scroll; + overflow-y: auto; -webkit-overflow-scrolling: 'touch'; user-select: none; height: 100%; @@ -37,6 +37,7 @@ $sides: 20rem; flex-direction: row; flex-wrap: nowrap; justify-content: flex-start; + height: $library-header-height; box-sizing: border-box; width: 100%; diff --git a/src/css/units.css b/src/css/units.css index 3a1a577b7..3f9aaba17 100644 --- a/src/css/units.css +++ b/src/css/units.css @@ -5,3 +5,5 @@ $sprites-per-row: 5; $menu-bar-height: 3rem; $sprite-info-height: 5.25rem; /* @todo: SpriteInfo isn't explicitly set to this height yet */ $stage-menu-height: 3rem; + +$library-header-height: 4.375rem; \ No newline at end of file