From 2be0dfd95cd99e58d98685e30ee2a4401aea14bc Mon Sep 17 00:00:00 2001 From: Matt Isenhower Date: Wed, 2 Aug 2017 17:30:20 -0700 Subject: [PATCH] Add battle times --- package.json | 1 + src/css/main.scss | 5 ++++- src/js/components/ScheduleBox.vue | 33 ++++++++++++++++++++++++++++++- yarn.lock | 4 ++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 30f9b71..3364728 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "html-loader": "^0.5.0", "html-webpack-plugin": "^2.30.1", "mkdirp": "^0.5.1", + "moment": "^2.18.1", "node-sass": "^4.5.3", "purify-css": "^1.2.5", "purifycss-webpack": "^0.7.0", diff --git a/src/css/main.scss b/src/css/main.scss index aec1fa2..55ff594 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -68,10 +68,13 @@ html { margin: 0 -5px 15px; border-radius: 12px; + .top-bar { + margin-bottom: 0.5rem; + } + .rule-name { color: $title-color; font-size: 1.25rem; - margin-bottom: 5px; } } diff --git a/src/js/components/ScheduleBox.vue b/src/js/components/ScheduleBox.vue index ae2051e..ab8d474 100644 --- a/src/js/components/ScheduleBox.vue +++ b/src/js/components/ScheduleBox.vue @@ -5,7 +5,18 @@
-
{{ firstSchedule.rule.name }}
+
+
+
{{ firstSchedule.rule.name }}
+
+
+
+ {{ firstSchedule.start_time | time }} – + {{ firstSchedule.end_time | time }} +
+
+
+
@@ -24,6 +35,11 @@ Soon
{{ upcomingSchedule.rule.name }}
+
in {{ upcomingSchedule.start_time - now | duration }}
+
+ {{ upcomingSchedule.start_time | time }} – + {{ upcomingSchedule.end_time | time }} +
@@ -39,6 +55,7 @@