diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index ffd8a9c96..61c438ef1 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -42,7 +42,13 @@ body {
}
body {
+ display: flex;
+ flex-direction: column;
font-size: $base-font-size;
+
+ > .wrapper {
+ flex: 1;
+ }
}
h1,
@@ -214,19 +220,6 @@ a {
color: $check;
}
-.wrapper {
- min-height: 100%;
- margin: 0 auto (-$line-height) * 12;
- height: auto !important;
- height: 100%;
-}
-
-.footer,
-.push {
- clear: both;
- min-height: $line-height * 12;
-}
-
.ie-callout {
position: absolute;
top: 0;
@@ -932,7 +925,9 @@ footer {
.footer {
background: #f1f1f1;
+ clear: both;
margin-top: $line-height * 2;
+ min-height: $line-height * 12;
padding-top: $line-height;
}
@@ -999,8 +994,8 @@ footer {
.auth-page {
- .wrapper {
- margin: 0 auto (-$line-height) * 14;
+ .footer {
+ margin-top: 0;
}
}
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 2d5bfdb10..47ab61b2e 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -131,8 +131,6 @@
// ----------------
@mixin admin-layout {
- display: flex;
- flex-direction: column;
> header {
margin-bottom: 0;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 33f16faa3..21cddf561 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -44,8 +44,6 @@
<%= render "layouts/flash" %>
<%= yield %>
-
-
-
-