From b7d4196e1b19afe669f52af116791c61cff11195 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Thu, 24 Dec 2015 21:38:00 -0600 Subject: [PATCH] angular routing --- ctf.nginx | 8 ++- web/css/style.css | 25 ++++++-- web/index.html | 79 +++++++++---------------- web/js/{ascript.js => easyctf.js} | 7 ++- web/pages/about.html | 98 +------------------------------ web/pages/home.html | 15 +---- 6 files changed, 62 insertions(+), 170 deletions(-) rename web/js/{ascript.js => easyctf.js} (82%) diff --git a/ctf.nginx b/ctf.nginx index ed75c5d..9e58b4b 100644 --- a/ctf.nginx +++ b/ctf.nginx @@ -8,8 +8,12 @@ server { server_name localhost; - location / { - try_files $uri $uri/ =404; + # location / { + # try_files $uri $uri/ =404; + # } + location ~^/(about|login|register)$ { + default_type text/html; + try_files /index.html /index.html; } location ~ /api { diff --git a/web/css/style.css b/web/css/style.css index 0d5dc46..651d2cc 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -2,23 +2,40 @@ h1 { font-size: 75px; } ::-webkit-input-placeholder { - color: #999999; + color: #999999; } :-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; } .column { max-width: 450px; +} + +body { + background-color: #F0F0F0; +} +.ui.menu .item img.logo { + margin-right: 1.5em; +} +.main.container { + margin-top: 7em; +} +.wireframe { + margin-top: 2em; +} +.ui.footer.segment { + margin: 5em 0em 0em; + padding: 5em 0em; } \ No newline at end of file diff --git a/web/index.html b/web/index.html index f96b2d2..34c218b 100644 --- a/web/index.html +++ b/web/index.html @@ -1,53 +1,32 @@ - - - EasyCTF 2016 - - - - - - - - - - - -