Permalink
Browse files

Merge branch 'hydra-21' into develop

  • Loading branch information...
2 parents 9aee831 + a0c3b0a commit 5429181cc6ec94bf8a02209c4d8dba1a03684150 @emmacunningham committed May 25, 2012
Showing with 41 additions and 14 deletions.
  1. +30 −9 hydra/templates/hydra/index.html
  2. BIN static/.DS_Store
  3. +2 −3 static/css/1140.css
  4. +9 −2 static/css/style.css
View
39 hydra/templates/hydra/index.html
@@ -124,14 +124,14 @@
<div class="signcol" style="margin-top:10px;margin-right:0px;">
<form name="myForm" action="" onsubmit="return validateEmail()" >
<input class="signupinput" type="text" name="firstname" id="id_firstname" value="YOUR NAME" />
- <div id="nameerror" style="display:none;">Please enter your first name.</div>
+ <div class="formerror" id="nameerror" style="display:none;">Please enter your first name.</div>
</div>
<div id="mobileonlyhacks">
<br /><br /><br />
</div>
<div class="signcol" style="margin-top:10px;">
<input class="signupinput" type="text" name="email" id="id_email" value="YOUR EMAIL" />
- <div id="emailerror" style="display:none;">Please enter a valid email address.</div>
+ <div class="formerror" id="emailerror" style="display:none;">Please enter a valid email address.</div>
</div>
<div id="mobileonlyhacks">
<br /><br /><br />
@@ -329,6 +329,27 @@
</script>
<script type="text/javascript">
+ $(document).keyup(function(e) {
+ if (e.keyCode == 27) {
+ $('#aboutbox').animate({'top':'-200%'},0,function(){
+ $('#aboutoverlay').fadeOut('fast');
+ $('#footer').show(0);
+ $('#mobilemain').show(0);
+ });
+ $('#newsletterbox').animate({'top':'-200%'},500,function(){
+ $('#newsletteroverlay').fadeOut(0);
+ $('#newsletterboxclose,#newmobileboxclose,#signup').fadeOut(0);
+ });
+ $('#thanksbox').animate({'top':'-200%'},0,function(){
+ $('#thanksoverlay').hide(0);
+ $('#thanksclose').hide(0);
+ $('#mobilethanksclose,#signup').hide(0);
+ });
+ }
+ });
+ </script>
+
+ <script type="text/javascript">
$(function() {
$('#newsletteractivator,#nnewsletteractivator').click(function(){
$('#newsletteroverlay').animate({'top':'0px'},0,function(){
@@ -418,18 +439,18 @@
var dotpos=x.lastIndexOf(".");
var str = $.trim($('#id_firstname').val());
if ($('#id_firstname').val() == 'YOUR NAME') {
- $('#id_firstname').css("border","1px solid red");
+ $('#id_firstname').css("border-bottom","1px solid red");
$('#nameerror').show();
return false;
}
if (str == '') {
- $('#id_firstname').css("border","1px solid red");
+ $('#id_firstname').css("border-bottom","1px solid red");
$('#nameerror').show();
return false;
}
if (atpos<1 || dotpos<atpos+2 || dotpos+2>=x.length)
{
- $('#id_email').css("border","1px solid red");
+ $('#id_email').css("border-bottom","1px solid red");
$('#emailerror').show();
return false;
}
@@ -441,11 +462,11 @@
var args = { type:"POST", url:"/", data:data };
var request = $.ajax(args);
request.done(function(){
- $('#newsletterbox').animate({'top':'-200%'},0,function(){
- $('#newsletteroverlay').hide(0);
- $('#newsletterboxclose,#newmobileboxclose').hide(0);
+ $('#newsletterbox').fadeOut(300,function(){
+ $('#newsletteroverlay').fadeOut(0);
+ $('#newsletterboxclose,#newmobileboxclose').fadeOut(0);
});
- $('#thanksoverlay').fadeIn(0,function(){
+ $('#thanksoverlay').fadeIn(400,function(){
$('#thanksbox').animate({'top':'0px'},0);
$('#thanksclose').animate({'top':'50px'},0);
$('#mobilethanksclose').show(0);
View
BIN static/.DS_Store
Binary file not shown.
View
5 static/css/1140.css
@@ -225,7 +225,6 @@ img {
a.thanksclose {
position:relative;
display:block;
- margin-left:30%;
}
@@ -330,7 +329,7 @@ img {
}
-/* Mobile */
+/* Tablet */
@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) {
@@ -646,7 +645,7 @@ img {
}
}
-
+/* Mobile */
@media only screen and (min-device-width: 320px) and (max-device-width:480px) {
.row {
View
11 static/css/style.css
@@ -464,6 +464,7 @@ p.topnav {
left:0;
top:-200%;
width:100%;
+ height:28px;
background: #000000;
color:#ffffff;
font-size:4em;
@@ -474,9 +475,10 @@ p.topnav {
a.thanksclose {
position:fixed;
+ right:0;
opacity:.5;
margin-top:10px;
- margin-right:40px;
+ margin-right:50px;
width:100px;
height:100px;
background:transparent url(../img/close.png) no-repeat top right;
@@ -488,6 +490,7 @@ a.thanksclose {
}
+
.lightgrey {
color:#9e9e9e;
}
@@ -614,7 +617,7 @@ input.signupinput {
}
#thanksrow {
- margin-left:20%;
+ margin-left:0;
}
#fallback {
@@ -632,6 +635,10 @@ input.signupinput {
left: 0;
}
+.formerror {
+ padding-top:10px;
+}
+
#mobileonlyhacks {
display:none;
}

0 comments on commit 5429181

Please sign in to comment.