Skip to content

Commit ef78d69

Browse files
committed
Ticket card: Switched description and intervention columns to BS 4's integrated flexbox
1 parent 008d049 commit ef78d69

2 files changed

Lines changed: 20 additions & 23 deletions

File tree

src/Public/css/panichd.css

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,7 @@ h1, h2, h3, h4, h5, h6 {
243243
}
244244

245245

246-
#ticket-body .description-col, #ticket-body .intervention-col {
247-
border: 1px solid #ddd;
248-
margin: 0px 15px 0px 0px;
249-
padding: 15px;
250-
border-radius: 5px;
251-
}
252-
253246
@media screen and (max-width: 1999px){
254-
#ticket-body .description-col, #ticket-body .intervention-col {
255-
margin: 15px;
256-
}
257-
258247
#ticket-body .row-ticket-attachments {
259248
margin: 15px -15px 5px -15px;
260249
}

src/Views/tickets/show/body.blade.php

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="card bg-light">
1+
<div class="card">
22
<div id="ticket-body" class="card-body">
33
<div class="row" style="margin-bottom: 0.2em;">
44
<div class="col-sm-8 col-lg-7">
@@ -62,7 +62,7 @@ class="btn btn-light"
6262
</div>
6363

6464
<div class="row">
65-
<div class="col-lg-3 col-sm-4">
65+
<div class="col-xl-2 col-lg-3 col-md-4">
6666
<p>
6767
<strong>{{ trans('panichd::lang.ticket') }}</strong>{{ trans('panichd::lang.colon') . trans('panichd::lang.table-id') . $ticket->id }}
6868
@if ($u->currentLevel() > 1)
@@ -173,20 +173,28 @@ class="btn btn-light"
173173
@endif
174174
</p>
175175
</div>
176-
<div class="col-lg-9 col-sm-8">
177-
<div class="row row-eq-height">
178-
<div class="description-col {{ $ticket->intervention_html ? 'col-lg-6' : 'col-md-12'}}">
179-
<div>
180-
<b>{{ trans('panichd::lang.description') }}</b>
176+
<div class="col-xl-10 col-lg-9 col-md-8">
177+
<div class="row equal">
178+
<div class="{{ $ticket->intervention_html ? 'col-lg-6 mb-3 mb-lg-0' : 'col-md-12'}}">
179+
<div class="card" style="height: 100%">
180+
<div class="card-body">
181+
<div>
182+
<b>{{ trans('panichd::lang.description') }}</b>
183+
</div>
184+
<div class="summernote-text-wrapper"> {!! $ticket->html !!} </div>
185+
</div>
181186
</div>
182-
<div class="summernote-text-wrapper"> {!! $ticket->html !!} </div>
183187
</div>
184188
@if ($ticket->intervention_html)
185-
<div class="intervention-col col-lg-6">
186-
<div>
187-
<b>{{ trans('panichd::lang.intervention') }}</b>
189+
<div class="col-lg-6">
190+
<div class="card" style="height: 100%">
191+
<div class="card-body">
192+
<div>
193+
<b>{{ trans('panichd::lang.intervention') }}</b>
194+
</div>
195+
<div class="summernote-text-wrapper"> {!! $ticket->intervention_html !!} </div>
196+
</div>
188197
</div>
189-
<div class="summernote-text-wrapper"> {!! $ticket->intervention_html !!} </div>
190198
</div>
191199
@endif
192200
</div>

0 commit comments

Comments
 (0)