diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 9c9398e60..96cad7920 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -39,17 +39,21 @@ html { html, body { - height: 100%; margin: 0; } +html { + height: 100%; +} + body { display: flex; flex-direction: column; font-size: $base-font-size; + min-height: 100%; > .wrapper { - flex: 1; + flex-grow: 1; } } diff --git a/app/assets/stylesheets/mixins/layouts.scss b/app/assets/stylesheets/mixins/layouts.scss index c5d6a63fd..f4656f424 100644 --- a/app/assets/stylesheets/mixins/layouts.scss +++ b/app/assets/stylesheets/mixins/layouts.scss @@ -1,11 +1,12 @@ @mixin admin-layout { + height: 100%; > header { margin-bottom: 0; } > .menu-and-content { - flex: 1; + flex-grow: 1; } } diff --git a/app/assets/stylesheets/widgets/feeds/participation.scss b/app/assets/stylesheets/widgets/feeds/participation.scss index 0778effc2..c69d0feb9 100644 --- a/app/assets/stylesheets/widgets/feeds/participation.scss +++ b/app/assets/stylesheets/widgets/feeds/participation.scss @@ -17,7 +17,7 @@ flex-direction: column; .feed-content { - flex: 1; + flex-grow: 1; } } }