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

Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign

Browse source
This commit is contained in:
Kyle Drake 2013-07-13 22:30:13 -04:00
commit 3098a96870
2 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/css/styles.css
View file

@ -24,3 +24,6 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
} }
.page{background:#F6F0E6} .page{background:#F6F0E6}
select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
line-height:inherit; height:auto!important}

25
views/settings.slim
View file

@ -1,10 +1,9 @@
.page .page
.row.content .content
.span12.text-center .span12.text-center
h1 Site Settings h1 Account Settings
.row .txt-Center
.span12.text-center
- if !current_site.errors.empty? - if !current_site.errors.empty?
.row .row
.span8.offset2 .span8.offset2
@ -13,8 +12,8 @@
p = error.last.first p = error.last.first
.row .row
.span4 .col.col-33
h2 Change Password h2.delta Change Password
form method="POST" action="/change_password" form method="POST" action="/change_password"
input name="csrf_token" type="hidden" value="#{csrf_token}" input name="csrf_token" type="hidden" value="#{csrf_token}"
@ -31,24 +30,24 @@
input name="new_password_confirm" type="password" input name="new_password_confirm" type="password"
input.btn-Action type="submit" value="Change Password" input.btn-Action type="submit" value="Change Password"
.span4
h2 Change Site (User) Name .col.col-33
h2.delta Change Site (User) Name
form method="POST" action="/change_name" form method="POST" action="/change_name"
input name="csrf_token" type="hidden" value="#{csrf_token}" input name="csrf_token" type="hidden" value="#{csrf_token}"
p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ - p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
div
p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span> p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span>
div
p New name: p New name:
input name="name" type="text" placeholder="newname" input name="name" type="text" placeholder="newname"
div
input.btn-Action type="submit" value="Change Name" input.btn-Action type="submit" value="Change Name"
.span4 .col.col-33
h2 Mark Adult Content h2.delta Mark Adult Content
p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone. p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone.
form method="POST" action="/change_nsfw" form method="POST" action="/change_nsfw"