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

public/css/styles.css

@@ -24,3 +24,6 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 }
 
 .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}

views/settings.slim

@@ -1,10 +1,9 @@
 .page
-  .row.content
+  .content
     .span12.text-center
-      h1 Site Settings
+      h1 Account Settings
   
-  .row
-    .span12.text-center
+    .txt-Center
       - if !current_site.errors.empty?
         .row
           .span8.offset2
@@ -13,8 +12,8 @@
                 p = error.last.first
     
     .row
-    .span4
-      h2 Change Password
+      .col.col-33
+        h2.delta Change Password
         form method="POST" action="/change_password"
           input name="csrf_token" type="hidden" value="#{csrf_token}"
           
@@ -31,24 +30,24 @@
             input name="new_password_confirm" type="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"
           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 _ -
         
-        div
           p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span>
-        div
+          
           p New name:
             input name="name" type="text" placeholder="newname"
-        div
+          
             input.btn-Action type="submit" value="Change Name"
     
-    .span4
-      h2 Mark Adult Content
+      .col.col-33
+        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.
     
         form method="POST" action="/change_nsfw"