From 18be30194be5b5902d80f6f876f521a8dadf1639 Mon Sep 17 00:00:00 2001 From: Charles Truluck Date: Sat, 26 Dec 2015 01:36:55 -0500 Subject: [PATCH] Added a scoreboard --- .gitignore | 3 ++- ctf.nginx | 4 ++-- web/css/style.css | 23 +++++++++++++++++++---- web/index.html | 11 ++--------- web/js/easyctf.js | 6 +++++- web/pages/about.html | 6 ++++-- web/pages/home.html | 5 ++++- web/pages/scoreboard.html | 19 +++++++++++++++++++ 8 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 web/pages/scoreboard.html diff --git a/.gitignore b/.gitignore index 9f5aebd..c9b09a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .vagrant .secret_key +.bundle/config # Object files *.o @@ -42,4 +43,4 @@ ehthumbs.db a.out *.project *.class -*.pyc \ No newline at end of file +*.pyc diff --git a/ctf.nginx b/ctf.nginx index 6bfe75d..881a82b 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)$ { + location ~^/(about|login|register|scoreboard)$ { default_type text/html; try_files /index.html /index.html; } @@ -25,4 +25,4 @@ server { proxy_pass http://localhost:8000; proxy_redirect off; } -} \ No newline at end of file +} diff --git a/web/css/style.css b/web/css/style.css index 651d2cc..6a27e2b 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -6,15 +6,15 @@ h1 { } :-moz-placeholder { /* Firefox 18- */ - color: #999999; + color: #999999; } ::-moz-placeholder { /* Firefox 19+ */ - color: #999999; + color: #999999; } :-ms-input-placeholder { - color: #999999; + color: #999999; } .intro { text-align: center; @@ -38,4 +38,19 @@ body { .ui.footer.segment { margin: 5em 0em 0em; padding: 5em 0em; -} \ No newline at end of file +} +h1 { + color: #F38630; +} +li { + transition-duration: 0.5s; +} +li:hover { + background-color: #96c5c5; +} +tr { + transition-duration: 0.5s; +} +tr:hover { + background-color: #DDDDDD; +} diff --git a/web/index.html b/web/index.html index ecba155..de02ec9 100644 --- a/web/index.html +++ b/web/index.html @@ -5,18 +5,10 @@ -