finishing merge

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

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/client/styles/views/misc/kiosk/kiosk.grid.import.less b/client/styles/views/misc/kiosk/kiosk.grid.import.less
@@ -56,7 +56,7 @@
 		}
 
 		.kiosk_events_ongoing {
-			.grid(8);
+			.grid(12);
 			.no-padding;
 			margin-left: -6px;
 
@@ -67,15 +67,14 @@
 			.kiosk_event_header {
 				.kiosk_event_date {
 					.grid(12);
-					padding: 8px;
+					padding-top: 8px;
 				}
 
 				.kiosk_event_home {
 					.grid(12);
-					padding: 8px 8px 0;
 
 					span.glyphicon {
-						padding-right: 0;
+						padding-right: 2px;
 					}
 				}
 			}

diff --git a/client/styles/views/misc/kiosk/kiosk.import.less b/client/styles/views/misc/kiosk/kiosk.import.less
@@ -82,6 +82,7 @@
 				}
 
 				.kiosk_event_home {
+					padding: 0px !important;
 					text-align: left;
 				}
 			}

diff --git a/client/views/misc/kiosk/kiosk.html b/client/views/misc/kiosk/kiosk.html
@@ -140,11 +140,10 @@ <h3>{{plain this.title}}</h3>
 <template name="kioskEventFuture">
 		<a class="kioskEvent" href="{{pathFor 'showEvent'}}">
 		<div class="calendar_event">
-			&nbsp;{{dateformat_fromnow start}}<br>
 			<div class="kiosk_event_header">
 				<div class="kiosk_event_date">
-					<span class="glyphicon glyphicon-time"></span>
-					{{dateformat start}} - {{dateformat end}}
+					<span class="glyphicon glyphicon-calendar"></span>
+					{{dateformat start}} {{timeformat start}}
 				</div>
 				<div class="kiosk_event_home">
 					{{#if showLocations}} <!-- we dont want to see each time same Location if filtered-->