Refactor to use a heading class for height when using header-illustrations

This fixes a glitch highlighted in #3259, where the css class stopped applying
when the view was moved to a different controller.

We're moving to having each view responsible for their layout, and commonly having
override classes explicitly in the relevant views. So we can follow that pattern here.

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3bec5fe3612fd125af6df3e85454adf18e7baa4c..3e4b30a70580faaa50ec018e083106bf5e16d173 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1035,13 +1035,8 @@ tr.turn:hover {
 
 /* Overrides for pages that use new layout conventions */
 
-.users-new,
-.users-create,
-.users-terms,
-.users-confirm {
-  .content-heading .content-inner {
-    height: 200px;
-  }
+.header-illustration-heading {
+  height: 200px;
 }
 
 .header-illustration {

diff --git a/app/views/confirmations/confirm.html.erb b/app/views/confirmations/confirm.html.erb
index fde54554662b797b12b49863ddc69a189539f92d..75d72487c482e117cebf3a20066f2017fed216f1 100644 (file)
--- a/app/views/confirmations/confirm.html.erb
+++ b/app/views/confirmations/confirm.html.erb
@@ -1,3 +1,4 @@
+<% content_for :heading_class, "header-illustration-heading" %>
 <% content_for :heading do %>
   <h1><%= t ".heading" %></h1>
   <div class='header-illustration confirm-main'></div>

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index ed00a8fcc4343815278ec7b1c77b8521141056d7..b49990705a4879d1a66a39894bbe8d40f9c2e386 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,3 +1,4 @@
+<% content_for :heading_class, "header-illustration-heading" %>
 <% content_for :heading do %>
   <h1><%= t "users.new.title" %></h1>
   <div class='header-illustration new-user-main'></div>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 264fc8e023a227f2c7b622b560851f904d615eac..165c9486bcdc7cb7f57b451bade9bedb7dc296da 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -2,6 +2,7 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
+<% content_for :heading_class, "header-illustration-heading" %>
 <% content_for :heading do %>
   <h1><%= t ".title" %></h1>
   <div class='header-illustration new-user-main'></div>

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 99af8b84185e6a3da2b8cd3dccb75f19372ff39e..f32cc17bd35137712bad7f2d988821a1b2d08ce8 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -2,6 +2,7 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
+<% content_for :heading_class, "header-illustration-heading" %>
 <% content_for :heading do %>
   <h1><%= t ".heading" %></h1>
   <div class='header-illustration new-user-terms'></div>