[Glitch] Fix floating action button obscuring last element

Port 5a448d0d7143475dabe315e6038ec27b59e9e6b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.js b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
index e39a31e5d7a8e88caf0cf7c0541ebe8114bce0e2..6cbcd81ee062aba275054bd04160c78ae059f65e 100644 (file)
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.js
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
@@ -234,7 +234,7 @@ class ColumnsArea extends ImmutablePureComponent {
             </div>
           </div>
 
-          <div className='columns-area__panels__main'>
+          <div className={`columns-area__panels__main ${floatingActionButton && 'with-fab'}`}>
             {!navbarUnder && <TabsBar key='tabs' />}
             {content}
             {navbarUnder && <TabsBar key='tabs' />}

diff --git a/app/javascript/flavours/glitch/styles/components/single_column.scss b/app/javascript/flavours/glitch/styles/components/single_column.scss
index db510f1f48388cba4e83157b1484769898b7c041..ba43e7f2911a4d59f11387c3951ad54b5baffd00 100644 (file)
--- a/app/javascript/flavours/glitch/styles/components/single_column.scss
+++ b/app/javascript/flavours/glitch/styles/components/single_column.scss
@@ -233,6 +233,10 @@
   .columns-area__panels__pane--compositional {
     display: none;
   }
+
+  .with-fab .scrollable .item-list:last-child {
+    padding-bottom: 5.25rem;
+  }
 }
 
 @media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {