From ffdfebecb31d4368803b1683887360b2cf7df19e Mon Sep 17 00:00:00 2001 From: cyrusnaficy Date: Tue, 13 Aug 2024 13:33:11 -0700 Subject: [PATCH 1/3] fix view but not scroll --- public/javascripts/Gallery/css/gallery.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/javascripts/Gallery/css/gallery.css b/public/javascripts/Gallery/css/gallery.css index a212ce9ca2..b3866d4373 100644 --- a/public/javascripts/Gallery/css/gallery.css +++ b/public/javascripts/Gallery/css/gallery.css @@ -45,7 +45,7 @@ /* Note that the side bar is out of the "flow" of the grid container b/c it is fixed when we aren't loading anything. */ .sidebar { padding-left: 10px; - min-height: calc(100vh - 610px); + min-height: 100vh; height: 100%; width: 239px; grid-row: 1/2; @@ -90,6 +90,8 @@ 'main gallery-modal' 'paging gallery-modal'; grid-gap: 2px; + margin-bottom: 10px; + min-height: 70vh; padding: 0 10px 10px 10px; } From 0838383ed98ae5ee6a26cdde899d3cef96833b26 Mon Sep 17 00:00:00 2001 From: cyrusnaficy Date: Mon, 26 Aug 2024 18:36:30 -0700 Subject: [PATCH 2/3] fixed gallery view scroll --- public/javascripts/Gallery/src/cards/CardContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/Gallery/src/cards/CardContainer.js b/public/javascripts/Gallery/src/cards/CardContainer.js index 9e2601f560..f27ae31f5c 100644 --- a/public/javascripts/Gallery/src/cards/CardContainer.js +++ b/public/javascripts/Gallery/src/cards/CardContainer.js @@ -321,7 +321,7 @@ function CardContainer(uiCardContainer, initialFilters) { sg.ui.cardFilter.wrapper.css('position', 'fixed'); sg.ui.cardFilter.wrapper.css('top', ''); uiCardContainer.holder.css('margin-left', sg.ui.cardFilter.wrapper.css('width')); - sg.scrollStatus.stickySidebar = true; + sg.scrollStatus.stickySidebar = false; sg.cardFilter.enable(); }); } else { From 753b19704bc78abe707de974effc89f814e2b374 Mon Sep 17 00:00:00 2001 From: cyrusnaficy Date: Mon, 9 Sep 2024 16:06:58 -0400 Subject: [PATCH 3/3] update --- public/javascripts/Gallery/src/cards/CardContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/Gallery/src/cards/CardContainer.js b/public/javascripts/Gallery/src/cards/CardContainer.js index f27ae31f5c..1ee5ca4502 100644 --- a/public/javascripts/Gallery/src/cards/CardContainer.js +++ b/public/javascripts/Gallery/src/cards/CardContainer.js @@ -321,7 +321,7 @@ function CardContainer(uiCardContainer, initialFilters) { sg.ui.cardFilter.wrapper.css('position', 'fixed'); sg.ui.cardFilter.wrapper.css('top', ''); uiCardContainer.holder.css('margin-left', sg.ui.cardFilter.wrapper.css('width')); - sg.scrollStatus.stickySidebar = false; + imagePromises.length >= 6 ? sg.scrollStatus.stickySidebar = true : sg.scrollStatus.stickySidebar = false; sg.cardFilter.enable(); }); } else {