Merge pull request #287 from digitalnatives/develop

Updates master with the new features

.envrc.sample

@@ -0,0 +1,3 @@
+#The following keys are provided by google to always get a "No Recaptcha"
+export RECAPTCHA_SECRET_KEY="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe",
+export RECAPTCHA_SITE_KEY="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"

.gitignore

@@ -28,3 +28,6 @@ erl_crash.dump
 # Docker
 scripts/docker-compose-up.sh
 docker-compose.yml
+
+#Environment variable file
+.envrc

assets/css/app.scss

@@ -17,13 +17,15 @@
   @import "./card.scss";
   @import "./modal.scss";
   @import "./user-bubble.scss";
+  @import "./bubble-clickable.scss";
   @import "./user-list.scss";
   @import "./attendance.scss";
   @import "./calendar.scss";
 
   @import "./list-mixin.scss";
   @import "./class-list.scss";
   @import "./course-list.scss";
+  @import "./term-list.scss";
   @import "./task-list.scss";
   @import "./holiday-list.scss";
 

assets/css/bubble-clickable.scss

@@ -0,0 +1,14 @@
+
+  .bubble-clickable {
+    transition: box-shadow 300ms ease,
+                background-color 300ms ease;
+
+    background-color: transparent;
+    box-shadow: none;
+
+    &:hover {
+      background-color: white;
+      @extend .mdl-shadow--2dp;
+    }
+
+  }

assets/css/calendar.scss

@@ -14,6 +14,15 @@
       text-align: center;
     }
 
+    &__slot {
+      &__class_color{
+        background-color: rgba($primary, 0.5);
+      }
+      &__event_color{
+        background-color: rgba(175, 78, 86, 0.5);
+      }
+    }
+
     &__time {
       display: flex;
       flex-direction: column;
@@ -70,6 +79,28 @@
 
     }
 
+    &__day_full {
+      display: flex;
+      flex-direction: column;
+
+      width: 100%;
+
+      box-sizing: border-box;
+      border-left: $calendar-border;
+
+      &-header {
+        padding-top: 15px;
+        box-sizing: border-box;
+        height: 50px;
+        text-align: center;
+
+        background-color: $secondary;
+        color: white;
+
+      }
+
+    }
+
     &__classes {
       position: relative;
       overflow: hidden;
@@ -101,7 +132,6 @@
       position: absolute;
       padding: 4px;
 
-      background-color: rgba($primary, 0.5);
       border: $calendar-border;
       box-sizing: border-box;
 

assets/css/term-list.scss

@@ -0,0 +1,4 @@
+
+  .term-list {
+    @include list-mixin();
+  }

assets/css/user-bubble.scss

@@ -26,15 +26,4 @@
       text-align: center;
       color: $grey-500;
     }
-
-    transition: box-shadow 300ms ease,
-                background-color 300ms ease;
-
-    background-color: transparent;
-    box-shadow: none;
-
-    &:hover {
-      background-color: white;
-      @extend .mdl-shadow--2dp;
-    }
   }