From 46c8443bc6b166189513843f2d01bea329a113d4 Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Sat, 9 Jul 2016 23:48:53 -0700
Subject: [PATCH] Improvements to the contact form

---
 app/assets/stylesheets/_application.scss | 14 ++++++
 app/views/application/_contact.html.haml |  2 +-
 app/views/layouts/application.html.haml  | 54 ++++++++++++------------
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index 70d6fe0..f2c4f9d 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -2193,6 +2193,20 @@ body {
 		font-size: 2em;
 		margin-bottom: 1em;
 	}
+
+	#contact-dlg {
+		.title {
+			background-color: $colour-4;
+		}
+
+		.email-field {
+			margin-top: 2em;
+		}
+
+		textarea {
+			min-height: 7.5em;
+		}
+	}
 }
 
 @include keyframes(fade-out) {
diff --git a/app/views/application/_contact.html.haml b/app/views/application/_contact.html.haml
index a8ab898..089a9e0 100644
--- a/app/views/application/_contact.html.haml
+++ b/app/views/application/_contact.html.haml
@@ -1,4 +1,4 @@
-= form_tag contact_send_path do
+= form_tag contact_send_path, class: 'contact-form' do
 	= emailfield :email, nil, big: true, required: true unless logged_in?
 	= contact_reason_select
 	= textfield :subject, nil, required: true, big: true
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 4e9f8d1..bc807d7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -46,33 +46,33 @@
 				.dlg-content
 					%h2.title=_'articles.contact.headings.contact'
 					.dlg-inner= render 'contact', cancel_btn: true
-		- if @confirmation_dlg.present?
-			.dlg#confirmation-dlg
-				.dlg-content
-					%h2.title=_'modals.confirm'
-					.dlg-inner
-						%p.message=''
-						%a.button.confirm=_'modals.yes_button'
-						%button.delete.close=_'modals.no_button'
-		- if @info_dlg.present?
-			.dlg#info-dlg
-				.dlg-content
-					%h2.title=_'modals.info'
-					.dlg-inner
-						%p.message=''
-						%button.close=_'modals.done_button'
-		- if @login_dlg.present?
-			.dlg#login-dlg
-				.dlg-content
-					%h2.title=_'forms.actions.generic.login'
-					.dlg-inner
-						= form_tag do_confirm_path, class: 'flex-form' do
-							= hidden_field_tag :dest, settings_path
-							= emailfield :email, nil, big: true
-							= button_tag :continue, :value => :confirm_email
-						.flex-form
-							= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: settings_path), class: [:button, :facebook]
-							%button.close.subdued=_'forms.actions.generic.cancel'
+			- if @confirmation_dlg.present?
+				.dlg#confirmation-dlg
+					.dlg-content
+						%h2.title=_'modals.confirm'
+						.dlg-inner
+							%p.message=''
+							%a.button.confirm=_'modals.yes_button'
+							%button.delete.close=_'modals.no_button'
+			- if @info_dlg.present?
+				.dlg#info-dlg
+					.dlg-content
+						%h2.title=_'modals.info'
+						.dlg-inner
+							%p.message=''
+							%button.close=_'modals.done_button'
+			- if @login_dlg.present?
+				.dlg#login-dlg
+					.dlg-content
+						%h2.title=_'forms.actions.generic.login'
+						.dlg-inner
+							= form_tag do_confirm_path, class: 'flex-form' do
+								= hidden_field_tag :dest, settings_path
+								= emailfield :email, nil, big: true
+								= button_tag :continue, :value => :confirm_email
+							.flex-form
+								= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: settings_path), class: [:button, :facebook]
+								%button.close.subdued=_'forms.actions.generic.cancel'
 		
 		= yield :footer_scripts if content_for?(:footer_scripts)
 		= inline_scripts