standardizing incoming, ongoing and faded operation display when they…

… are displayed on more than one sized row
BenHUET · Nov 26, 2017 · 85e944a · 85e944a
1 parent 213e56d
commit 85e944a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/src/resources/assets/css/calendar.css b/src/resources/assets/css/calendar.css
@@ -7,6 +7,10 @@
 	padding : 5px 10px;
 }
 
+.text-middle {
+	vertical-align: middle;
+}
+
 .modal-calendar-green, .text-bg-green {
 	background-color: #baffc9;
 }

diff --git a/src/resources/views/operation/includes/faded.blade.php b/src/resources/views/operation/includes/faded.blade.php
@@ -27,33 +27,33 @@
 				@else
 				<tr class="{{ $op->is_cancelled == 0 ? '' : 'danger' }} text-muted" data-attr-op="{{ $op->id }}">
 				@endif
-					<td>
+					<td class="text-middle">
 						<span>{{ $op->title }}</span>
 						<span class="pull-right">
 							@include('calendar::operation.includes.attendees')
 						</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.tags')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.importance')
 						<span class="visible-xs-inline-block">
 							@include('calendar::operation.includes.actions')
 						</span>
 					</td>
-					<td class="hidden-xs">{{ $op->start_at }}</td>
-					<td>{{ $op->end_at }}</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">{{ $op->start_at }}</td>
+					<td class="text-middle">{{ $op->end_at }}</td>
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.fleet_commander')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.staging')
 					</td>
-					<td class="hidden-portrait-xs">
+					<td class="hidden-portrait-xs text-middle">
 						@include('calendar::operation.includes.subscription')
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.actions')
 					</td>
 				</tr>

diff --git a/src/resources/views/operation/includes/incoming.blade.php b/src/resources/views/operation/includes/incoming.blade.php
@@ -27,41 +27,41 @@
 				@else
 				<tr data-attr-op="{{ $op->id }}">
 				@endif
-					<td>
+					<td class="text-middle">
 						<span>{{ $op->title }}</span>
 						<span class="pull-right">
 							@include('calendar::operation.includes.attendees')
 						</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.tags')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.importance')
 						<span class="visible-xs-inline-block">
 							@include('calendar::operation.includes.actions')
 						</span>
 					</td>
-					<td>
+					<td class="text-middle">
 						@if(\Carbon\Carbon::parse($op->start_at)->diffInDays(\Carbon\Carbon::now()) > 1 )
 						{{ $op->start_at }}
 						@else
 						<span data-toggle="tooltip" data-placement="top" title="{{ trans('calendar::seat.starts_at') }} {{ $op->start_at }}">{{ $op->starts_in }}</span>
 						@endif
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						<span data-toggle="tooltip" data-placement="top" title="{{ trans('calendar::seat.ends_at') }} {{ $op->end_at }}">{{ $op->duration }}</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.fleet_commander')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.staging')
 					</td>
-					<td class="hidden-portrait-xs">
+					<td class="hidden-portrait-xs text-middle">
 						@include('calendar::operation.includes.subscription')
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.actions')
 					</td>
 				</tr>

diff --git a/src/resources/views/operation/includes/ongoing.blade.php b/src/resources/views/operation/includes/ongoing.blade.php
@@ -27,37 +27,37 @@
 				@else
 				<tr data-attr-op="{{ $op->id }}">
 				@endif
-					<td>
+					<td class="text-middle">
 						<span>{{ $op->title }}</span>
 						<span class="pull-right">
 							@include('calendar::operation.includes.attendees')
 						</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.tags')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.importance')
 						<span class="visible-xs-inline-block">
 							@include('calendar::operation.includes.actions')
 						</span>
 					</td>
-					<td>
+					<td class="text-middle">
 						<span data-toggle="tooltip" data-placement="top" title="{{ trans('calendar::seat.started_at') }} {{ $op->start_at }}">{{ $op->started }} ago</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						<span data-toggle="tooltip" data-placement="top" title="{{ trans('calendar::seat.ends_at') }} {{ $op->end_at }}">{{ $op->ends_in }}</span>
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.fleet_commander')
 					</td>
-					<td>
+					<td class="text-middle">
 						@include('calendar::operation.includes.staging')
 					</td>
-					<td class="hidden-portrait-xs">
+					<td class="hidden-portrait-xs text-middle">
 						@include('calendar::operation.includes.subscription')
 					</td>
-					<td class="hidden-xs">
+					<td class="hidden-xs text-middle">
 						@include('calendar::operation.includes.actions')
 					</td>
 				</tr>