Skip to content

Commit a1bec48

Browse files
committed
ticket card visual improvements for widths smaller than bootstrap "lg"
1 parent ba3598d commit a1bec48

2 files changed

Lines changed: 26 additions & 22 deletions

File tree

src/Public/css/panichd.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ h1, h2, h3, h4, h5, h6 {
193193
* Ticket show
194194
*/
195195
/* sm and up */
196-
@media screen and (min-width: 992px){
196+
@media screen and (min-width: 1200px){
197197
#ticket-body .row.row-eq-height {
198198
display: -webkit-box;
199199
display: -webkit-flex;
@@ -214,7 +214,7 @@ h1, h2, h3, h4, h5, h6 {
214214
border-radius: 5px;
215215
}
216216

217-
@media screen and (max-width: 991px){
217+
@media screen and (max-width: 1999px){
218218
#ticket-body .description-col, #ticket-body .intervention-col {
219219
margin: 15px;
220220
}

src/Views/tickets/partials/ticket_body.blade.php

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="panel panel-default">
22
<div id="ticket-body" class="panel-body">
33
<div class="row" style="margin-bottom: 0.2em;">
4-
<div class="col-md-8">
4+
<div class="col-sm-8 col-lg-7">
55
<h2 style="margin: 0em 0em 0.5em 0em;">
66
@if ($ticket->completed_at)
77
<span class="text-success"><span class="glyphicon glyphicon-ok-circle" title="tiquet completat" style="cursor: help"></span> {{ $ticket->subject }}</span>
@@ -10,16 +10,16 @@
1010
@endif
1111
</h2>
1212
</div>
13-
<div class="col-md-4 text-right">
13+
<div class="col-sm-4 col-lg-5 text-right">
1414
@if ($u->currentLevel() > 1)
1515
<a href="{{ route($setting->grab('main_route').'.hide', ['value' => $ticket->hidden ? 'false' : 'true', 'ticket'=>$ticket->id]) }}" class="btn btn-default tooltip-info" style="border: none; color: #aaa;" data-toggle="tooltip" data-placement="auto top" title="{{ trans('panichd::lang.ticket-hidden-button-title') }}">{!! $ticket->hidden ? '<span class="glyphicon glyphicon-eye-close"></span> '.trans('panichd::lang.ticket-hidden') : '<span class="glyphicon glyphicon-eye-open"></span> '.trans('panichd::lang.ticket-visible') !!}</a>
1616
@endif
1717
@if ($ticket->updated_at!=$ticket->created_at)
18-
<span class="tooltip-info" data-toggle="tooltip" data-placement="auto top" title="{{ trans('panichd::lang.date-info-updated') }}" style="color: #aaa; cursor: help">
18+
<span class="tooltip-info" data-toggle="tooltip" data-placement="auto top" title="{{ trans('panichd::lang.date-info-updated') }}" style="display: inline-block; color: #aaa; cursor: help">
1919
<span class="glyphicon glyphicon-pencil"></span> {{ $ticket->updated_at->diffForHumans() }}
2020
</span>
2121
@endif
22-
<span class="tooltip-info" data-toggle="tooltip" data-placement="auto top" title="{{ trans('panichd::lang.date-info-created') }}" style="color: #aaa; cursor: help">
22+
<span class="tooltip-info" data-toggle="tooltip" data-placement="auto top" title="{{ trans('panichd::lang.date-info-created') }}" style="display: inline-block; color: #aaa; cursor: help">
2323
<span class="glyphicon glyphicon-certificate"></span> {{ $ticket->created_at->diffForHumans() }}
2424
</span>&nbsp;
2525

@@ -58,7 +58,7 @@ class="btn btn-default"
5858
</div>
5959

6060
<div class="row">
61-
<div class="col-lg-2 col-sm-3">
61+
<div class="col-lg-3 col-sm-4">
6262
<p>
6363
<strong>{{ trans('panichd::lang.ticket') }}</strong>{{ trans('panichd::lang.colon') . trans('panichd::lang.table-id') . $ticket->id }}
6464
@if ($u->currentLevel() > 1)
@@ -130,21 +130,21 @@ class="btn btn-default"
130130
@if ($ticket->has('tags') && ($u->currentLevel() > 1 || in_array($ticket->user_id, $u->getMyNoticesUsers())) )
131131
<br /><strong>{{ trans('panichd::lang.tags') }}</strong>{{ trans('panichd::lang.colon') }}
132132
@foreach ($ticket->tags as $i=>$tag)
133-
<button class="btn btn-default btn-sm" style="pointer-events: none; color: {{$tag->text_color}}; background: {{$tag->bg_color}}">{{$tag->name}}</button>
133+
<button class="btn btn-default btn-xs" style="pointer-events: none; border: none; color: {{$tag->text_color}}; background: {{$tag->bg_color}}">{{$tag->name}}</button>
134134
@endforeach
135135
@endif
136136
</p>
137137
</div>
138-
<div class="col-lg-10 col-sm-9">
138+
<div class="col-lg-9 col-sm-8">
139139
<div class="row row-eq-height">
140-
<div class="description-col {{ $ticket->intervention_html ? 'col-md-6' : 'col-md-12'}}">
140+
<div class="description-col {{ $ticket->intervention_html ? 'col-lg-6' : 'col-md-12'}}">
141141
<div>
142142
<b>{{ trans('panichd::lang.description') }}</b>
143143
</div>
144144
<div class="summernote-text-wrapper"> {!! $ticket->html !!} </div>
145145
</div>
146146
@if ($ticket->intervention_html)
147-
<div class="intervention-col col-md-6">
147+
<div class="intervention-col col-lg-6">
148148
<div>
149149
<b>{{ trans('panichd::lang.intervention') }}</b>
150150
</div>
@@ -197,17 +197,21 @@ class="btn btn-default"
197197
</div>
198198
</div>
199199

200-
@if(! $ticket->completed_at && $close_perm == 'yes')
201-
<button type="submit" class="btn btn-default" data-toggle="modal" data-target="#ticket-complete-modal" data-status_id="{{ $setting->grab('default_close_status_id') }}">{{ trans('panichd::lang.btn-mark-complete') }}</button>
202-
@elseif($ticket->completed_at && $reopen_perm == 'yes')
203-
{!! link_to_route($setting->grab('main_route').'.reopen', trans('panichd::lang.reopen-ticket'), $ticket->id,
204-
['class' => 'btn btn-default']) !!}
205-
@endif
206-
@if($u->currentLevel() > 1 && $u->canManageTicket($ticket->id))
207-
{!! link_to_route($setting->grab('main_route').'.edit', trans('panichd::lang.btn-edit'), $ticket->id,
208-
['class' => 'btn btn-default']) !!}
209-
<div class="visible-xs"><br /></div>
210-
@endif
200+
<div style="margin: 1em 0em 0em 0em;">
201+
@if(! $ticket->completed_at && $close_perm == 'yes')
202+
<button type="submit" class="btn btn-default" data-toggle="modal" data-target="#ticket-complete-modal" data-status_id="{{ $setting->grab('default_close_status_id') }}">{{ trans('panichd::lang.btn-mark-complete') }}</button>
203+
@elseif($ticket->completed_at && $reopen_perm == 'yes')
204+
{!! link_to_route($setting->grab('main_route').'.reopen', trans('panichd::lang.reopen-ticket'), $ticket->id,
205+
['class' => 'btn btn-default']) !!}
206+
@endif
207+
@if($u->currentLevel() > 1 && $u->canManageTicket($ticket->id))
208+
{!! link_to_route($setting->grab('main_route').'.edit', trans('panichd::lang.btn-edit'), $ticket->id,[
209+
'class' => 'btn btn-default',
210+
'style' => 'margin: 0em 0em 0em 0.5em'
211+
]) !!}
212+
<div class="visible-xs"><br /></div>
213+
@endif
214+
</div>
211215

212216
{!! CollectiveForm::open([
213217
'method' => 'DELETE',

0 commit comments

Comments
 (0)