Merge remote-tracking branch 'upstream/pull/3233'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3bec5fe3612fd125af6df3e85454adf18e7baa4c..0023286bf6391e405de80666cb962cf7d5fa0cba 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1035,20 +1035,11 @@ 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 {
   background-position: 0 0;
   background-repeat: no-repeat;
-  position: absolute;
-  height: 200px;
+  position: relative;
+  min-height: 200px;
   width: 100%;
   left: 0;
   bottom: 0;
@@ -1068,9 +1059,10 @@ tr.turn:hover {
   &.new-user-arm {
     height: 110px;
     width: 130px;
-    left: 260px;
-    top: 160px;
+    left: 280px;
+    top: 180px;
     background-image: image-url("sign-up-illustration-arm.png");
+    position: absolute;
     z-index: 100;
   }
 }

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6fc31953de5fddb85e579ed7eacda29b4c1cb364..2a1c3d6759c1777589f65e308e1123bde8b706fc 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,7 +17,6 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_user
   helper_method :oauth_token
-  helper_method :preferred_languages
 
   private
 

diff --git a/app/views/confirmations/confirm.html.erb b/app/views/confirmations/confirm.html.erb
index fde54554662b797b12b49863ddc69a189539f92d..7350f86287494a9e4af12fc15c4bff07f35bbd06 100644 (file)
--- a/app/views/confirmations/confirm.html.erb
+++ b/app/views/confirmations/confirm.html.erb
@@ -1,6 +1,8 @@
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
-  <h1><%= t ".heading" %></h1>
-  <div class='header-illustration confirm-main'></div>
+  <div class='header-illustration confirm-main'>
+    <h1><%= t ".heading" %></h1>
+  </div>
 <% end %>
 
 <% if params[:confirm_string] %>

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

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

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 99af8b84185e6a3da2b8cd3dccb75f19372ff39e..05cf62e3e67038d2572a3d836c721d25bbb19aac 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -2,9 +2,11 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
-  <h1><%= t ".heading" %></h1>
-  <div class='header-illustration new-user-terms'></div>
+  <div class='header-illustration new-user-terms'>
+    <h1><%= t ".heading" %></h1>
+  </div>
 <% end %>
 
 <%= form_tag({ :action => "save" }) do %>