Merge violasong changes

This commit is contained in:
Kyle Drake 2014-10-24 18:16:05 -07:00
commit ecd838c891
2 changed files with 9 additions and 5 deletions

View file

@ -187,7 +187,7 @@
border:0 solid black; border:0 solid black;
@include box-shadow($inputAreaShadow); @include box-shadow($inputAreaShadow);
color:#C2CFD4; color:#C2CFD4;
margin-bottom:30px; margin-bottom:27px;
margin-right:$spacing; margin-right:$spacing;
padding: 10px 10px 7px 10px; padding: 10px 10px 7px 10px;
width:100%; width:100%;
@ -211,7 +211,7 @@
} }
.btn-Action{ .btn-Action{
padding:10px 25px; padding:10px 25px;
margin-top: 6px; margin-top: 2em;
font-size: 1em; font-size: 1em;
} }
} }

View file

@ -85,7 +85,7 @@
<li> <li>
<a href="/signout" class="sign-In">Signout</a> <a href="/signout" class="sign-In">Signout</a>
</li> </li>
<% end %>` <% end %>
</ul> </ul>
</nav> </nav>
@ -161,6 +161,8 @@
<hr /> <hr />
<div class="siteCreateInputs"> <div class="siteCreateInputs">
<label for="create-Input">Username</label> <label for="create-Input">Username</label>
<input type="text" name="prevent_autofill_username" id="prevent_autofill_username" value="" class="hidden" />
<input type="password" name="prevent_autofill_password" id="prevent_autofill_password" value="" class="hidden" />
<input type="text" class="input-Area" id="create-Input" name="username" placeholder="my-site-name" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" /> <input type="text" class="input-Area" id="create-Input" name="username" placeholder="my-site-name" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" />
<label for="create-Input" id="domain-name">.neocities.org</label> <label for="create-Input" id="domain-name">.neocities.org</label>
@ -177,12 +179,14 @@
<input type="text" class="input-Area" id="email-input" name="email" placeholder="me@example.com" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" /> <input type="text" class="input-Area" id="email-input" name="email" placeholder="me@example.com" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" />
</div> </div>
<div class="col col-25"> <div class="col col-50" style="padding-left:0;">
<label for="question_answer-input"><%= @question_first_number %> + <%= @question_last_number %> =</label> <label for="question_answer-input"><%= @question_first_number %> + <%= @question_last_number %> =</label>
<input type="text" class="input-Area" name="question_answer" placeholder="" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" maxlength="2" style="width: 50px" /> <input type="text" class="input-Area" name="question_answer" placeholder="" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" maxlength="2" style="width: 50%;" />
</div> </div>
<div class="col col-50">
<input type="submit" value="Create My Site" class="btn-Action float-Right" /> <input type="submit" value="Create My Site" class="btn-Action float-Right" />
</div>
</div> </div>
</fieldset> </fieldset>
</form> </form>