From 5ab1e059c48265c72f78bd640284ce8416c0962f Mon Sep 17 00:00:00 2001 From: Charles Truluck Date: Sat, 26 Dec 2015 23:50:52 -0500 Subject: [PATCH] Fade-in for page load? Maybe? --- web/css/style.css | 24 +++++++++++++++++++----- web/pages/about.html | 2 +- web/pages/chat.html | 2 +- web/pages/home.html | 2 +- web/pages/login.html | 2 +- web/pages/problems.html | 2 +- web/pages/programming.html | 2 +- web/pages/register.html | 2 +- web/pages/rules.html | 6 +++--- web/pages/scoreboard.html | 2 +- web/pages/shell.html | 2 +- web/pages/updates.html | 2 +- 12 files changed, 32 insertions(+), 18 deletions(-) diff --git a/web/css/style.css b/web/css/style.css index d823a07..103a4e8 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -66,8 +66,22 @@ li a, .navbar-brand { table { color: #226C1B; } -/*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; -}*/ + +@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } } +@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } } +@keyframes fadeIn { from { opacity:0; } to { opacity:1; } } + +.fade_in { + opacity: 0; + -webkit-animation: fadeIn ease-in-out 1; + -moz-animation: fadeIn ease-in-out 1; + animation: fadeIn ease-in-out 1; + + -webkit-animation-fill-mode: forwards; + -moz-animation-fill-mode: forwards; + animation-fill-mode: forwards; + + -webkit-animation-duration: 1s; + -moz-animation-duration: 1s; + animation-duration: 1s; +} diff --git a/web/pages/about.html b/web/pages/about.html index 4863ddc..296d69f 100644 --- a/web/pages/about.html +++ b/web/pages/about.html @@ -1,4 +1,4 @@ -
+

About

(insert stuff here)

diff --git a/web/pages/chat.html b/web/pages/chat.html index f848fa4..ebe44f6 100644 --- a/web/pages/chat.html +++ b/web/pages/chat.html @@ -1,4 +1,4 @@ -
+

EasyCTF IRC

(Insert iFrame with IRC here)

diff --git a/web/pages/home.html b/web/pages/home.html index 94710a6..dc203c7 100644 --- a/web/pages/home.html +++ b/web/pages/home.html @@ -1,4 +1,4 @@ -
+

EasyCTF 3

Coming 2016


diff --git a/web/pages/login.html b/web/pages/login.html index e501fc7..8f67ee5 100644 --- a/web/pages/login.html +++ b/web/pages/login.html @@ -1,4 +1,4 @@ -
+

Log-in

diff --git a/web/pages/problems.html b/web/pages/problems.html index 80633bf..791fe03 100644 --- a/web/pages/problems.html +++ b/web/pages/problems.html @@ -1,4 +1,4 @@ -
+

Problems

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

Programming

diff --git a/web/pages/register.html b/web/pages/register.html index 7f13b4c..4a68975 100644 --- a/web/pages/register.html +++ b/web/pages/register.html @@ -1,4 +1,4 @@ -
+

Register

diff --git a/web/pages/rules.html b/web/pages/rules.html index 24fe602..afe3a04 100644 --- a/web/pages/rules.html +++ b/web/pages/rules.html @@ -1,6 +1,5 @@ -
-

Info

-
+
+

Info

Rules

Here are the rules regarding EasyCTF. Please follow these rules to make sure everyone has a fair chance at winning. @@ -29,3 +28,4 @@ If you don't live in the United States, or you're not a high school or middle sc 2nd Place: $256
3rd Place: $128
Top 20: Laptop Stickers
+
diff --git a/web/pages/scoreboard.html b/web/pages/scoreboard.html index 012fee1..a6a2d73 100644 --- a/web/pages/scoreboard.html +++ b/web/pages/scoreboard.html @@ -1,4 +1,4 @@ -
+

Scoreboard

diff --git a/web/pages/shell.html b/web/pages/shell.html index dcc7680..f170831 100644 --- a/web/pages/shell.html +++ b/web/pages/shell.html @@ -1,4 +1,4 @@ -
+

Shell

diff --git a/web/pages/updates.html b/web/pages/updates.html index af5a5d0..cb1dab1 100644 --- a/web/pages/updates.html +++ b/web/pages/updates.html @@ -1,4 +1,4 @@ -
+

News / Updates