From 73eb52d52f3c4caff89f5376101494a8c6f41c9b Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Sat, 14 Mar 2015 14:19:20 -0500
Subject: [PATCH 1/3] Contact page style changes and copy edits

---
 views/contact.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/contact.erb b/views/contact.erb
index 9e2dae35..56fc6ce0 100644
--- a/views/contact.erb
+++ b/views/contact.erb
@@ -23,10 +23,10 @@
 
   <ul>
     <li>
-      For security reasons, we cannot reset your password if you did not enter an e-mail for your site. You will have to make a new site (don't worry, it's free!). If you didn't get an e-mail from the password reset form, you didn't enter an e-mail (or it's in your spam folder). Again you will have to make a new site, we cannot help you for security reasons.
+      For security reasons, we cannot reset your password if you did not enter an email for your site. You will have to make a new site (don’t worry, it’s free!). If you didn’t get an email from the password reset form, you didn’t enter an email (or it’s in your spam folder). Again you will have to make a new site; we cannot help you for security reasons.
     </li>
     <li>
-      We do not support SFTP or GIT uploading, though we may in the future. Instead, we currently support <a href="/site_files/mount_info">WebDAV</a>.
+      We do not support SFTP or Git uploading, though we may in the future. Instead, we currently support <a href="/site_files/mount_info">WebDAV</a>.
     </li>
   </ul>
 
@@ -34,15 +34,15 @@
     <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
     <fieldset>
       <label for="your_email">Email address</label>
-      <input type="email" id="your_email" name="email" placeholder="Your Email" style="width: 300px" value="<%= params[:email] %>">
+      <input type="email" id="your_email" name="email" placeholder="me@example.com" class="col-50" value="<%= params[:email] %>">
 
       <label for="email_subject">Subject</label>
-      <input type="text" id="email_subject" name="subject" placeholder="Subject" style="width: 400px" value="<%= params[:subject] %>">
+      <input type="text" id="email_subject" name="subject" placeholder="Subject" class="col-50" value="<%= params[:subject] %>">
 
       <label for="your_comments">Comments</label>
-      <textarea name="body" id="your_comments" style="width: 600px" rows="10"><%= params[:body] %></textarea>
+      <textarea name="body" id="your_comments" class="col-75" rows="10"><%= params[:body] %></textarea>
 
-      <label>Fill out captcha so we know you're not a robot:</label>
+      <label>Fill out the captcha so we know you’re not a robot:</label>
       <div class="recaptcha">
         <%== recaptcha_tag :challenge, ssl: request.ssl? %>
       </div>

From d22be6ce2dec27b75923fb5c90ed6ba9dcb023d1 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Sat, 14 Mar 2015 14:46:14 -0500
Subject: [PATCH 2/3] Minor copy edits to Welcome and Confirm emails

---
 views/templates/email_confirm.erb | 1 +
 views/templates/email_welcome.erb | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/templates/email_confirm.erb b/views/templates/email_confirm.erb
index c56f923d..fcd5a30f 100644
--- a/views/templates/email_confirm.erb
+++ b/views/templates/email_confirm.erb
@@ -6,6 +6,7 @@ You can confirm your email address using the link below:
 
 https://neocities.org/site/<%= site.username %>/confirm_email/<%= site.email_confirmation_token %>
 
+
 Thank you!
 
 - The Neocities Team
\ No newline at end of file
diff --git a/views/templates/email_welcome.erb b/views/templates/email_welcome.erb
index afcfc160..b591dd6a 100644
--- a/views/templates/email_welcome.erb
+++ b/views/templates/email_welcome.erb
@@ -8,8 +8,7 @@ Since you're new, we've put together a basic "hello world" page for you. Now all
 
 If you have any questions or comments, or just want to say hi, feel free to contact us at https://neocities.org/contact. You can also reach us on Twitter at @neocitiesweb. We're super busy, so we can't help you with everything, but if you have a problem or bug to report, we'll try our best to look into it.
 
-From Penelope (the Neocities' cat), the Neocities Team, and on behalf of all our sites, our very best wishes for you (and your awesome web site). We can't wait to see what it looks like!
+From Penelope (the Neocities cat), the Neocities Team, and on behalf of all our sites, our very best wishes for you (and your awesome web site). We can't wait to see what it looks like!
 
 Best,
-
-- The Neocities Team
\ No newline at end of file
+The Neocities Team
\ No newline at end of file

From e3108cb5156f46b8962119149e693b38ab8dd456 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Sat, 14 Mar 2015 17:25:39 -0500
Subject: [PATCH 3/3] Newsfeed: Fix focus link color

---
 sass/_project-sass/_project-Main.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 40b00f7a..7a910f1c 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -692,6 +692,9 @@ a.tag:hover {
 .misc-page.columns a:visited {
   color: $c-Brand-1;
 }
+.misc-page.columns a:focus {
+  color: darken($c-Link, 15%)
+}
 .news-item {
   width: 100%;
   float: left;