From f2a3bb3dae1f87dc9c8d5abc60dc84707d4a122a Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 1 Jan 2016 20:57:40 -0600 Subject: [PATCH] Cleaned meta content --- web/css/style.css | 56 +++++++++-------- web/index.html | 126 +++++++++++++++++++++++-------------- web/pages/about.html | 4 +- web/pages/chat.html | 8 +-- web/pages/home.html | 2 +- web/pages/login.html | 23 ++++--- web/pages/problems.html | 5 +- web/pages/programming.html | 2 +- web/pages/register.html | 11 ++-- web/pages/rules.html | 51 +++++++-------- web/pages/scoreboard.html | 34 +++++----- web/pages/shell.html | 16 ++--- web/pages/updates.html | 17 ++++- 13 files changed, 201 insertions(+), 154 deletions(-) diff --git a/web/css/style.css b/web/css/style.css index 9bff866..0b9b040 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -1,33 +1,42 @@ @import url(https://fonts.googleapis.com/css?family=Exo+2); -h1 { - font-size: 75px; +.heading1 { + font-size: 75px !important; + color: #62AC5B !important; + font-family: "Exo 2" !important; } -::-webkit-input-placeholder { +::-webkit-input-placeholder, :-moz-placeholder, ::-moz-placeholder, :-ms-input-placeholder { color: #999999; } -:-moz-placeholder { - /* Firefox 18- */ - color: #999999; +#style1 { + background-color: #0080FF; + margin: -0.1em; } -img#icn { - position:relative; - bottom:1px; +#email, #password { + margin-bottom: 1em; } -::-moz-placeholder { - /* Firefox 19+ */ - color: #999999; +.style4 { + margin-left: 10em; + margin-right: 10em; } -:-ms-input-placeholder { - color: #999999; +.icn { + position: relative; + bottom: 1px; +} +.style2 { + margin: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; +} +.style3 { + margin-top: 1em; } #question-text { height: 4em; } #question-title { - background-color:#D9EDF7; - text-align:center; - padding:0px 0px 0px 0px; - font-size:1.2em; + background-color: #D9EDF7; + text-align: center; + padding: 0px 0px 0px 0px; + font-size: 1.2em; } .intro { text-align: center; @@ -35,7 +44,7 @@ img#icn { .column { max-width: 450px; } -body { +.mainbody { background-color: #F0F0F0; } .ui.menu .item img.logo { @@ -51,11 +60,7 @@ body { margin: 5em 0em 0em; padding: 5em 0em; } -h1 { - color: #62AC5B; - font-family: "Exo 2"; -} -h2 { +.heading2, table { color: #226C1B; } li { @@ -73,9 +78,6 @@ tr:hover { li a, .navbar-brand { color: white !important; } -table { - color: #226C1B; -} #imp-files { margin-right: auto; padding-left: 2em; diff --git a/web/index.html b/web/index.html index 5d43e85..08829b0 100644 --- a/web/index.html +++ b/web/index.html @@ -1,50 +1,84 @@ - - - EasyCTF 2016 - - - - - - -

-
-
+ + + EasyCTF 2016 + + + + + + + +
+
+
+
+
+ + + + + + + diff --git a/web/pages/about.html b/web/pages/about.html index 296d69f..2840791 100644 --- a/web/pages/about.html +++ b/web/pages/about.html @@ -1,4 +1,4 @@
-

About

-

(insert stuff here)

+

About

+

(insert stuff here)

diff --git a/web/pages/chat.html b/web/pages/chat.html index b26ceb3..db9e5e6 100644 --- a/web/pages/chat.html +++ b/web/pages/chat.html @@ -1,6 +1,6 @@
-

EasyCTF IRC

-
- -
+

EasyCTF IRC

+
+ +
diff --git a/web/pages/home.html b/web/pages/home.html index 760049c..bf6753d 100644 --- a/web/pages/home.html +++ b/web/pages/home.html @@ -1,5 +1,5 @@

-

EasyCTF 3

+

EasyCTF 3


diff --git a/web/pages/login.html b/web/pages/login.html index 8f67ee5..8a98103 100644 --- a/web/pages/login.html +++ b/web/pages/login.html @@ -1,15 +1,14 @@
-

Log-in

-
-
- - - -
-
-
-Register - | -Forgot Password +

Log-in

+
+
+ + + +
+
+
+ Register | + Forgot Password
diff --git a/web/pages/problems.html b/web/pages/problems.html index d5b682c..d0554be 100644 --- a/web/pages/problems.html +++ b/web/pages/problems.html @@ -4,9 +4,8 @@ 2) create an "

Example File

" 3) remove these instructions (:P) --> -
-

Problems

+

Problems

Silly Caesar | Cryptography

@@ -15,7 +14,7 @@

Do we even need this problem, just take the flag. easyctf{no}

-
+
diff --git a/web/pages/programming.html b/web/pages/programming.html index 129566d..daaf1d4 100644 --- a/web/pages/programming.html +++ b/web/pages/programming.html @@ -1,5 +1,5 @@
-

Programming

+

Programming

Problems Avalible: NaN?

diff --git a/web/pages/register.html b/web/pages/register.html index 50628bb..5970f8b 100644 --- a/web/pages/register.html +++ b/web/pages/register.html @@ -1,5 +1,5 @@
-

Register

+

Register

@@ -38,7 +38,7 @@

- +

@@ -53,10 +53,11 @@
-

-
- +
+ +
+
diff --git a/web/pages/rules.html b/web/pages/rules.html index d50fc25..677ad28 100644 --- a/web/pages/rules.html +++ b/web/pages/rules.html @@ -1,32 +1,33 @@
-

Info

+

Info

-

Rules

-Here are the rules regarding EasyCTF. Please follow these rules to make sure everyone has a fair chance at winning. +

Rules

+ Here are the rules regarding EasyCTF. Please follow these rules to make sure everyone has a fair chance at winning. Use common sense. If you feel like what you're doing is disrupting the competition in any way, STOP doing it. Don't wait for us to yell + at you. Only student members may solve problems for their team. While it is acceptable to use resources from the Internet or from other sources, it is not acceptable for a person outside of the 1-5 members of the team to directly assist in solving + problems. Don't ask questions on public forums involving specific details of the problems. Don't share flags or methods with other teams. Don't disrupt other teams. Don't attack other teams, and don't attack the contest infrastructure in order to + prevent others from solving problems or submitting flags. If you're caught breaking any of these rules, your team may be converted into an observer team (see below), disqualifying you from winning prizes. Decisions made by competition organizers are + final. -Use common sense. If you feel like what you're doing is disrupting the competition in any way, STOP doing it. Don't wait for us to yell at you. -Only student members may solve problems for their team. While it is acceptable to use resources from the Internet or from other sources, it is not acceptable for a person outside of the 1-5 members of the team to directly assist in solving problems. Don't ask questions on public forums involving specific details of the problems. Don't share flags or methods with other teams. -Don't disrupt other teams. Don't attack other teams, and don't attack the contest infrastructure in order to prevent others from solving problems or submitting flags. -If you're caught breaking any of these rules, your team may be converted into an observer team (see below), disqualifying you from winning prizes. Decisions made by competition organizers are final. +

Flag Format

+ Most of the flags that you will find will be have the format + easyctf{example_flag}. -

Flag Format

-Most of the flags that you will find will be have the format easyctf{example_flag}. +

Scoring

+ In EasyCTF, every problem has an assigned point value. Your team's total score is the sum of the points you obtain from every problem you solve. A few problems may have speed bonuses, meaning that the first solve on a problem will earn a bonus percent + of the original problem value. These bonus points will also count toward your team total. Here is a screenshot from the problems page to demonstrate. Teams with higher points will outrank teams with lower points. Should a tie occur between two teams, + the time of the last submission will be used to break the tie. For example, if two teams are tied at 100 points, the team that reached 100 points first will outrank the team that reached 100 points afterwards. -

Scoring

-In EasyCTF, every problem has an assigned point value. Your team's total score is the sum of the points you obtain from every problem you solve. A few problems may have speed bonuses, meaning that the first solve on a problem will earn a bonus percent of the original problem value. These bonus points will also count toward your team total. Here is a screenshot from the problems page to demonstrate. +

Eligibility and Observer Accounts/Teams

+ EasyCTF is targeted at students enrolled in high schools or middle schools across the United States. Therefore, only students who are enrolled in high schools or middle schools in the United States are eligible for prizes. We will verify that the winning + teams meet these conditions; if a winning team does not meet these conditions, then the prizes will be given to the next highest team. If you don't live in the United States, or you're not a high school or middle school student, you are still encouraged + to compete, but under an Observer account. Teams with at least one Observer member will be considered an Observer team. Observer teams still appear in the scoreboard, but are not eligible for prizes. - -Teams with higher points will outrank teams with lower points. Should a tie occur between two teams, the time of the last submission will be used to break the tie. For example, if two teams are tied at 100 points, the team that reached 100 points first will outrank the team that reached 100 points afterwards. - -

Eligibility and Observer Accounts/Teams

-EasyCTF is targeted at students enrolled in high schools or middle schools across the United States. Therefore, only students who are enrolled in high schools or middle schools in the United States are eligible for prizes. We will verify that the winning teams meet these conditions; if a winning team does not meet these conditions, then the prizes will be given to the next highest team. - -If you don't live in the United States, or you're not a high school or middle school student, you are still encouraged to compete, but under an Observer account. Teams with at least one Observer member will be considered an Observer team. Observer teams still appear in the scoreboard, but are not eligible for prizes. - -

Prizes

-1st Place: $512
-2nd Place: $256
-3rd Place: $128
-Top 20: Laptop Stickers
+

Prizes

+ 1st Place: $512 +
2nd Place: $256 +
3rd Place: $128 +
Top 20: Laptop Stickers +
-

+
+
diff --git a/web/pages/scoreboard.html b/web/pages/scoreboard.html index a6a2d73..632ac76 100644 --- a/web/pages/scoreboard.html +++ b/web/pages/scoreboard.html @@ -1,19 +1,19 @@
-

Scoreboard

- - - - - - - - - - - - - - - -
#Team NameSchool
1Charles Is The Bestpg
+

Scoreboard

+ + + + + + + + + + + + + + + +
#Team NameSchool
1Charles Is The Bestpg
diff --git a/web/pages/shell.html b/web/pages/shell.html index f170831..170b400 100644 --- a/web/pages/shell.html +++ b/web/pages/shell.html @@ -1,11 +1,11 @@
-

Shell

-
-
-

Username: (insert username) | Password: (insert password)

+

Shell

+
+
+

Username: (insert username) | Password: (insert password)

+
+
+

Insert Shell Here

+
-
-

Insert Shell Here

-
-
diff --git a/web/pages/updates.html b/web/pages/updates.html index 207c541..aa65442 100644 --- a/web/pages/updates.html +++ b/web/pages/updates.html @@ -1,7 +1,18 @@
-

News / Updates

+

News / Updates

This is where updates about the competition and clarifications about the problems will be posted.
Make sure you check this page frequently during the competition!

- - + +