moar fixes

This commit is contained in:
Scott O'Hara 2013-07-13 22:04:00 -04:00
parent 34d775aac6
commit aa092cc930
5 changed files with 88 additions and 73 deletions

View file

@ -6,7 +6,7 @@
.header-Base{
background:#65a0ad;
border-bottom:6px solid #e93250;
min-height:47px;
min-height:42px;
overflow:hidden;
}
@ -181,11 +181,16 @@
.status-Nav{
float:right;
li{float:left}
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
}
li{
float:left;
@media (max-device-width:480px), screen and (max-width:800px){
float:none
}
}
}
// hp CSS
@ -261,7 +266,10 @@
}
.interior .header-Nav{
padding-left:70px
padding-left:70px;
@media (max-device-width:480px), screen and (max-width:800px){
width:100%;
}
}
.interior .constant-Nav{margin:0}

View file

@ -934,7 +934,7 @@ a {
.header-Base {
background: #65a0ad;
border-bottom: 6px solid #e93250;
min-height: 47px;
min-height: 42px;
overflow: hidden; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
@ -1083,11 +1083,14 @@ a {
.status-Nav {
float: right; }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav {
float: none; } }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav li {
float: none; } }
.hp .header-Base {
padding-top: 46px; }
@ -1156,6 +1159,9 @@ a {
.interior .header-Nav {
padding-left: 70px; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.interior .header-Nav {
width: 100%; } }
.interior .constant-Nav {
margin: 0; }

File diff suppressed because one or more lines are too long

View file

@ -57,13 +57,13 @@ javascript:
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg"
h3 style="color: green": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
h3 class="eps": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
br
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4 You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
h4 class="base": You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.row style="margin-top: 20px"
.span5

View file

@ -11,69 +11,70 @@ javascript:
- @site.errors.each do |error|
p = error.last.first
.row
.span8.offset3
form method="POST" action="/create"
input name="csrf_token" type="hidden" value="#{csrf_token}"
h2 Create a new Home Page
.row
.span6
p First, enter a username. This will also be used as your site path.<br><b>Do not forget this, it will be used to sign in to and manage your home page.</b><br>It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
.row
.span1
h5 Username
.span6
p <input name="username" type="text" placeholder="yourusername" value="#{@site.username}" autocapitalize="off" autocorrect="off">.neocities.org
.row
.span6
p Next, enter a password. This will be used to allow you to login. Minimum 5 characters. If you don't make it a good password, Dade Murphy from the movie Hackers will come in and steal your "garbage files".
.page
.row.content
.span8.offset3
form method="POST" action="/create"
input name="csrf_token" type="hidden" value="#{csrf_token}"
h2 Create a new Home Page
.row
.span1
h5 Password
.span6
input name="password" type="password"
.row
.span6
p Now you can enter an e-mail address. Your e-mail address is private and we will not show it to anyone for any reason. You don't have to provide one, but <b>we will not be able to reset your password without it, so don't lose your username and password if you leave this blank!</b>
.row
.span1
h5 Email
.span6
input name="email" type="email" placeholder="youremail@example.com" value="#{@site.email}"
.row
.span6
p First, enter a username. This will also be used as your site path.<br><b>Do not forget this, it will be used to sign in to and manage your home page.</b><br>It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
.row
.span1
h5 Username
.span6
p <input name="username" type="text" placeholder="yourusername" value="#{@site.username}" autocapitalize="off" autocorrect="off">.neocities.org
.row
.span6
p Next, enter a password. This will be used to allow you to login. Minimum 5 characters. If you don't make it a good password, Dade Murphy from the movie Hackers will come in and steal your "garbage files".
.row
.span6
p
| You can optionally enter some tags! Tags will allow others to find your site based on your interests, or your site's theme. <b>Separate multiple tags with commas</b>. Don't think too hard about this, you can change them later. You can have a maximum of ten tags, and there is a two word per tag maximum (extra words in a tag will be removed).
.row
.span1
h5 Tags
.span6
p: input name="tags" type="text" style="width: 400px" placeholder="pokemon, video games, bulbasaur" value="#{params[:tags]}" autocapitalize="off" autocorrect="off"
.row
.span6
input name="is_nsfw" type="hidden" value="false"
p: strong If your page will contain objectionable (adult) content, check this box:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px">
.row
.span6
p Last thing! Enter these two words correctly (with spaces) so we know you're not a robot (don't worry robots, we still love you).
div
== recaptcha_tag :challenge, ssl: true
.row
.span6
h3 You're done. Just click the button below!
.row style="margin-top: 10px"
.span3.offset1
input.btn.btn-success.btn-large type="submit" value="Create Home Page"
.row
.span1
h5 Password
.span6
input name="password" type="password"
.row
.span6
p Now you can enter an e-mail address. Your e-mail address is private and we will not show it to anyone for any reason. You don't have to provide one, but <b>we will not be able to reset your password without it, so don't lose your username and password if you leave this blank!</b>
.row
.span1
h5 Email
.span6
input name="email" type="email" placeholder="youremail@example.com" value="#{@site.email}"
.row
.span6
p
| You can optionally enter some tags! Tags will allow others to find your site based on your interests, or your site's theme. <b>Separate multiple tags with commas</b>. Don't think too hard about this, you can change them later. You can have a maximum of ten tags, and there is a two word per tag maximum (extra words in a tag will be removed).
.row
.span1
h5 Tags
.span6
p: input name="tags" type="text" style="width: 400px" placeholder="pokemon, video games, bulbasaur" value="#{params[:tags]}" autocapitalize="off" autocorrect="off"
.row
.span6
input name="is_nsfw" type="hidden" value="false"
p: strong If your page will contain objectionable (adult) content, check this box:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px">
.row
.span6
p Last thing! Enter these two words correctly (with spaces) so we know you're not a robot (don't worry robots, we still love you).
div
== recaptcha_tag :challenge, ssl: true
.row
.span6
h3 You're done. Just click the button below!
.row style="margin-top: 10px"
.span3.offset1
input.btn-Action type="submit" value="Create Home Page"