From 8a263f4f90a54ae2cd9d86e6c5c3647f09b975f9 Mon Sep 17 00:00:00 2001 From: Charles Truluck Date: Sat, 26 Dec 2015 22:30:44 -0500 Subject: [PATCH] Added rules/prizes, sanitized other things. --- README.md | 2 +- ctf.nginx | 2 +- web/css/style.css | 18 ++++++++++++------ web/index.html | 3 ++- web/js/easyctf.js | 4 ++++ web/pages/home.html | 2 +- web/pages/register.html | 2 ++ web/pages/rules.html | 31 +++++++++++++++++++++++++++++++ 8 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 web/pages/rules.html diff --git a/README.md b/README.md index 2ff64d5..fd5a661 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Main Pages: - chat.html - forgot_password.html - logout.html -- rules.html +- rules.html - team.html - shell.html - updates.html diff --git a/ctf.nginx b/ctf.nginx index aebb455..352463b 100644 --- a/ctf.nginx +++ b/ctf.nginx @@ -13,7 +13,7 @@ server { # } # Put all the pages here so Angular doesn't fail. - location ~^/(about|login|register|scoreboard|chat|updates|problems|programming|shell)$ { + location ~^/(about|login|register|scoreboard|chat|updates|problems|programming|shell|rules)$ { default_type text/html; try_files /index.html /index.html; } diff --git a/web/css/style.css b/web/css/style.css index b105f68..d823a07 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -1,3 +1,5 @@ +@import url(https://fonts.googleapis.com/css?family=Exo+2); + h1 { font-size: 75px; } @@ -40,13 +42,17 @@ body { padding: 5em 0em; } h1 { - color: #ee953b; + color: #62AC5B; + font-family: "Exo 2"; +} +h2 { + color: #226C1B; } li { transition-duration: 0.5s; } li:hover { - background-color: #32bcd0; + background-color: #0066cc; } tr { transition-duration: 0.5s; @@ -58,10 +64,10 @@ li a, .navbar-brand { color: white !important; } table { - color: #29d257; + color: #226C1B; } -textarea:focus, input:focus, input[type]:focus, .uneditable-input:focus { - border-color: #29d257; +/*textarea:focus, input:focus, input[type]:focus, .uneditable-input:focus { + border-color: #62AC5B; box-shadow: 0 1px 1px rgba(229, 103, 23, 0.075) inset, 0 0 8px #29d257; outline: 0 none; -} +}*/ diff --git a/web/index.html b/web/index.html index 81b8247..661a880 100644 --- a/web/index.html +++ b/web/index.html @@ -8,7 +8,7 @@