zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-03-14 17:49:23 -05:00
commit dce7d8e7d4
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sass/_project-sass/_project-Main.scss
View file

@ -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;

12
views/contact.erb
View file

@ -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>

1
views/templates/email_confirm.erb
View file

@ -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

5
views/templates/email_welcome.erb
View file

@ -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
The Neocities Team