diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index ffd8a9c96..fae431c76 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;
@@ -508,7 +501,8 @@ a {
// 02. Header
// ----------
-header {
+body > header,
+.wrapper > header {
background: $brand;
border-bottom: 1px solid $border;
margin-bottom: $line-height;
@@ -932,7 +926,9 @@ footer {
.footer {
background: #f1f1f1;
+ clear: both;
margin-top: $line-height * 2;
+ min-height: $line-height * 12;
padding-top: $line-height;
}
@@ -999,8 +995,8 @@ footer {
.auth-page {
- .wrapper {
- margin: 0 auto (-$line-height) * 14;
+ .footer {
+ margin-top: 0;
}
}
diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss
index 0b557a869..792c19c1c 100644
--- a/app/assets/stylesheets/legislation_process.scss
+++ b/app/assets/stylesheets/legislation_process.scss
@@ -996,12 +996,6 @@
@include grid-row;
margin-top: $line-height * 1.5;
padding: 0 rem-calc(16);
-
- > header {
- background: none;
- border: 0;
- margin: 0;
- }
}
h4,
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/_header.html.erb b/app/views/layouts/_header.html.erb
index a65f1a8b0..ceba47231 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -20,11 +20,11 @@
<%= t("application.menu") %>
-
+
<%= link_to root_path, accesskey: "0" do %>
- <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: t("layouts.header.logo")) %>
+ <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
<% end %>
-
+
-
-