From 1bdd65c4bf21613d5332e9d73ce8d7dee4b7ff52 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 20 Aug 2016 15:58:31 -0400 Subject: [PATCH] Added adding work from calendar, fixed #38 --- hourglass/client/main/main.css | 48 ++++++++++++++++++++ hourglass/client/main/main.html | 4 +- hourglass/client/main/main.js | 80 +++++++++++++++++++++++---------- 3 files changed, 106 insertions(+), 26 deletions(-) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index c7dec1c..be2e4da 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -276,6 +276,8 @@ input, textarea { #classListHolder h3 { font-weight: 200; margin: 5%; + margin-right: 4%; + display: inline-block; } .sideClass { @@ -667,4 +669,50 @@ input, textarea { .workevent span { padding: 2%; display: inline-block; +} + +#calCreWork { + margin-left: 0 !important; + color: #fff; + display: inline-block; + + -webkit-animation: neonglow 1.5s ease-in-out infinite alternate; + -moz-animation: neonglow 1.5s ease-in-out infinite alternate; + animation: neonglow 1.5s ease-in-out infinite alternate; +} + +@-webkit-keyframes neonglow { + from { + text-shadow: + 0 0 10px #fff, + 0 0 20px #fff, + 0 0 30px #fff, + 0 0 40px #228DFF, + 0 0 70px #228DFF, + 0 0 80px #228DFF, + 0 0 100px #228DFF, + 0 0 150px #228DFF; + } + to { + text-shadow: + 0 0 5px #fff, + 0 0 10px #fff, + 0 0 15px #fff, + 0 0 20px #228DFF, + 0 0 35px #228DFF, + 0 0 40px #228DFF, + 0 0 50px #228DFF, + 0 0 75px #228DFF; + } +} + +.fc-day:not(.fc-past):not(.fc-other-month) { + -webkit-transition: background-color 0.4s ease; + -moz-transition: background-color 0.4s ease; + -ms-transition: background-color 0.4s ease; + transition: background-color 0.4s ease; +} + +.fc-day:not(.fc-past):not(.fc-other-month):hover { + background-color: rgba(0,0,0,0.1); } \ No newline at end of file diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index 750506c..704e30a 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -32,7 +32,7 @@
-

Enrolled

+

Enrolled

{{calCreWork}}

{{#each myClasses}} {{> sidebarClasses}} {{/each}} @@ -119,7 +119,7 @@