diff --git a/index.html b/index.html
index 41ee7e7..5a576c5 100644
--- a/index.html
+++ b/index.html
@@ -29,13 +29,13 @@
-
- | Time | | STEP | |
- | Miss | | Target | |
- | Ratio | | High Score | |
- | Types | | Trr Trial | |
- | Speed | | STEP Trial | |
- | Score | | | |
+
+ | Time | | STEP | |
+ | Miss | | Target | |
+ | Ratio | | High Score | |
+ | Types | | Trr Trial | |
+ | Speed | | STEP Trial | |
+ | Score | | | |
| Comment |
diff --git a/jstrr.css b/jstrr.css
index f605f1c..ed70bde 100644
--- a/jstrr.css
+++ b/jstrr.css
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
body {
background-color: rgb(142, 174, 235);
background-image: url(snow.png);
+=======
+body:not(.secret) {/*background-color: rgb(142, 174, 235);*/
+ background-color: #F7CA53;
+ background-image: url(newyear2.jpg);
+>>>>>>> d797f1b767ddeb716a03701087999008d9de78c6
background-position: center;
background-repeat: no-repeat;
background-size: cover;
@@ -38,28 +44,28 @@
top: 100vh;
}
} */
-.blue{
- background-color: #81d4fa;
-}
.pink{
background-color: #FFBCFF;
}
-.yellow{
+body:not(.secret) table.summary tr:nth-child(2n+1) th {
background-color: #FFFFB2;
}
-.green{
+body:not(.secret) table.summary tr:nth-child(2n) th {
background-color: #C4FF89;
}
+body:not(.secret) table.summary tr:last-child .blue {
+ background-color: #81d4fa;
+}
.red{
background-color: #FFB2D8;
}
- table{
- margin: 0 auto;
- background-color: white;
- }
- i{
- margin-right: 4px;
- }
+table.summary {margin: 0 auto;}
+body:not(.secret) table {
+ background-color: white;
+}
+i{
+ margin-right: 4px;
+}
body.secret {background: black; color: white;}
div#typing {margin: 1em 1ex; border-top: double cyan 5px;}
div#typing pre {
diff --git a/jtserv/jtserv.rb b/jtserv/jtserv.rb
index e7720db..6be6fc0 100755
--- a/jtserv/jtserv.rb
+++ b/jtserv/jtserv.rb
@@ -567,7 +567,7 @@
tmpkey = db.storeTmpKey(user, token)
j = JSON.generate({"email" => email, "tmpkey" => tmpkey, "user" => user})
else
- j = JSON.generate("tmpley" => "notregistered")
+ j = JSON.generate("tmpkey" => "notregistered")
end
p token
socksend.call(ws_conn, j)