From 22da70893ab4f55250f6ce514b90630df525a978 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Thu, 11 Jan 2018 23:57:49 -0500 Subject: [PATCH] Fix the dashboard edit-list title when a sort handle is present --- resources/assets/sass/dashboard.scss | 14 +++++------ resources/views/dashboard/edit-list.blade.php | 24 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss index 0b7c265..53e388b 100644 --- a/resources/assets/sass/dashboard.scss +++ b/resources/assets/sass/dashboard.scss @@ -270,13 +270,6 @@ body { margin: 3px; } - .sort-icon { - margin-right: 10px; - display: inline-block; - cursor: grab; - cursor: -webkit-grabbing; - } - .title-column { padding-top: 6px; padding-bottom: 6px; @@ -306,6 +299,13 @@ body { margin-right: 10px; } } + + .sort-icon { + margin-right: 10px; + display: inline-block; + cursor: grab; + cursor: -webkit-grabbing; + } } .button-column { diff --git a/resources/views/dashboard/edit-list.blade.php b/resources/views/dashboard/edit-list.blade.php index c960aca..2ec274b 100644 --- a/resources/views/dashboard/edit-list.blade.php +++ b/resources/views/dashboard/edit-list.blade.php @@ -28,21 +28,19 @@ @endif -
- @if(is_array($column)) - @foreach($column as $col) - @if($row[$col] != '') -
{{ $row[$col] }}
+ @if(is_array($column)) + @foreach($column as $col) + @if($row[$col] != '') +
{{ $row[$col] }}
- @if(!$loop->last) -
|
- @endif + @if(!$loop->last) +
|
@endif - @endforeach - @else - {{ $row[$column] }} - @endif -
+ @endif + @endforeach + @else + {{ $row[$column] }} + @endif