styling Kiosk #179

Openki · Nov 18, 2015 · 9b530dc · 9b530dc
1 parent 9943fb6
commit 9b530dc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/client/styles/views/misc/kiosk/kiosk.import.less b/client/styles/views/misc/kiosk/kiosk.import.less
@@ -25,6 +25,10 @@
 
 
 		.calendar_event {
+			.statingIn{
+				padding-left: 8px;
+				background-color: rgba(255, 255, 255, 0.8);
+			}
 
 			.course_event_desc {
 				& > p {
@@ -42,7 +46,6 @@
 				padding-bottom: 10px;
 				border-bottom: 3px solid @body-bg;
 
-
 				.kiosk_event_home {
 					text-align: right;
 				}

diff --git a/client/views/misc/kiosk/kiosk.html b/client/views/misc/kiosk/kiosk.html
@@ -69,7 +69,9 @@ <h3>{{mf 'kiosk.future' 'Future events:' NUM=future.count}}</h3>
 <template name="kioskEventOngoing">
 	<a class="kioskEvent" href="{{pathFor 'showEvent'}}">
 		<div class="calendar_event">
-			{{mf 'kiosk.started' 'Started'}} {{dateformat_fromnow start}}
+			<div class="statingIn">
+				{{mf 'kiosk.started' 'Started'}} {{dateformat_fromnow start}}
+			</div>
 			<div class="kiosk_event_header">
 					<span class="glyphicon glyphicon-time"></span>
 					{{timeformat start}} - {{timeformat end}}
@@ -102,7 +104,9 @@ <h3>{{plain this.title}}</h3>
 <template name="kioskEventToday">
 		<a class="kioskEvent" href="{{pathFor 'showEvent'}}">
 		<div class="calendar_event">
-			&nbsp;{{dateformat_fromnow start}}<br>
+			<div class="statingIn">
+				{{dateformat_fromnow start}}
+			</div>
 			<div class="kiosk_event_header">
 				<div class="kiosk_event_date">
 					<span class="glyphicon glyphicon-time"></span>

diff --git a/client/views/misc/kiosk/kiosk.js b/client/views/misc/kiosk/kiosk.js
@@ -119,8 +119,11 @@ Template.kioskEventFuture.helpers({
 
 
 Template.kioskEventOngoing.rendered = function() {
+	this.$('.kiosk_event_home').dotdotdot({
+		height: 30,
+	});
 	this.$('.ellipsis').dotdotdot({
-		height: 70,
+		height: 90,
 	});
 };
 Template.kioskEventToday.rendered = function() {