]> cat aescling's git repositories - mastodon.git/commitdiff
Fix column settings not being scrollable on short screens
authorEugen Rochko <eugen@zeonfederated.com>
Sun, 5 Feb 2017 00:27:31 +0000 (01:27 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Sun, 5 Feb 2017 00:27:31 +0000 (01:27 +0100)
app/assets/javascripts/components/components/column_collapsable.jsx

index 203dc5e0c8f94d3c79ea4a6672c8e02336600f4f..90c561bce7acafe3b031be7775334a03c50066d2 100644 (file)
@@ -47,7 +47,7 @@ const ColumnCollapsable = React.createClass({
 
         <Motion defaultStyle={{ opacity: 0, height: 0 }} style={{ opacity: spring(collapsed ? 0 : 100), height: spring(collapsed ? 0 : fullHeight, collapsed ? undefined : { stiffness: 150, damping: 9 }) }}>
           {({ opacity, height }) =>
-            <div style={{ overflow: 'hidden', height: `${height}px`, opacity: opacity / 100 }}>
+            <div style={{ overflow: height === fullHeight ? 'auto' : 'hidden', height: `${height}px`, opacity: opacity / 100, maxHeight: '70vh' }}>
               {children}
             </div>
           }