From 5b1c46e63c9299a12586a2211835f56458967ea4 Mon Sep 17 00:00:00 2001 From: Charles Truluck Date: Sat, 26 Dec 2015 13:06:17 -0500 Subject: [PATCH] Added multiple pages and changed look/feel --- README.md | 15 ++++++++------- ctf.nginx | 2 +- web/css/style.css | 15 +++++++++++++-- web/index.html | 8 ++++++-- web/js/easyctf.js | 12 ++++++++++++ web/pages/home.html | 2 ++ web/pages/login.html | 4 ++-- web/pages/problems.html | 17 +++++++++++++++++ web/pages/programming.html | 11 +++++++++++ web/pages/shell.html | 11 +++++++++++ web/pages/updates.html | 2 +- 11 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 web/pages/problems.html create mode 100644 web/pages/programming.html create mode 100644 web/pages/shell.html diff --git a/README.md b/README.md index 6ac0d17..a819eb4 100644 --- a/README.md +++ b/README.md @@ -32,17 +32,18 @@ Main Pages: - login.html - register.html - about.html -- scoreboard.html -- problems.html +- scoreboard.html +- problems.html - account.html -- programming.html -- chat.html +- programming.html +- chat.html - forgot_password.html - logout.html - rules.html - team.html -- shell.html -- updates.html +- shell.html +- updates.html - resetpassword.html -Color Scheme: #69D2E7 | #A7DBDB | #E0E4CC | #F38630 | #FA6900 +Color Scheme: #69D2E7 | #A7DBDB | #E0E4CC | #F38630 | #FA6900 +(undecided.) diff --git a/ctf.nginx b/ctf.nginx index 283300a..aebb455 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)$ { + location ~^/(about|login|register|scoreboard|chat|updates|problems|programming|shell)$ { default_type text/html; try_files /index.html /index.html; } diff --git a/web/css/style.css b/web/css/style.css index 6a27e2b..b105f68 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -40,13 +40,13 @@ body { padding: 5em 0em; } h1 { - color: #F38630; + color: #ee953b; } li { transition-duration: 0.5s; } li:hover { - background-color: #96c5c5; + background-color: #32bcd0; } tr { transition-duration: 0.5s; @@ -54,3 +54,14 @@ tr { tr:hover { background-color: #DDDDDD; } +li a, .navbar-brand { + color: white !important; +} +table { + color: #29d257; +} +textarea:focus, input:focus, input[type]:focus, .uneditable-input:focus { + border-color: #29d257; + 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 af3230d..81b8247 100644 --- a/web/index.html +++ b/web/index.html @@ -7,8 +7,8 @@ -