wip

resources/assets/dcat/sass/components/_custom-data-table.scss

@@ -1,3 +1,6 @@
+
+$table-border-radius: .4rem;
+
 .custom-data-table-header .table-responsive .top {
   display: flex;
   justify-content: space-between;
@@ -12,7 +15,7 @@
 
 .custom-data-table-header .table-responsive .top .action-btns .actions-dropodown {
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .14);
-  border-radius:.45rem;
+  border-radius: $table-border-radius;
   margin-right: .75rem
 }
 
@@ -257,7 +260,7 @@ table.custom-data-table.dataTable tbody tr, table.data-thumb-view.dataTable tbod
   box-shadow: $shadow;
   cursor: pointer;
   transition: all .3s ease;
-  border-radius:.45rem
+  border-radius:$table-border-radius
 }
 
 table.custom-data-table.dataTable tbody tr:hover, table.data-thumb-view.dataTable tbody tr:hover {
@@ -269,13 +272,13 @@ table.custom-data-table.dataTable tbody tr:hover, table.data-thumb-view.dataTabl
 
 table.custom-data-table.dataTable tbody tr td:first-child, table.data-thumb-view.dataTable tbody tr td:first-child {
   padding-left: 1rem;
-  border-top-left-radius:.45rem;
-  border-bottom-left-radius:.45rem
+  border-top-left-radius: $table-border-radius;
+  border-bottom-left-radius: $table-border-radius
 }
 
 table.custom-data-table.dataTable tbody tr td:last-child, table.data-thumb-view.dataTable tbody tr td:last-child {
-  border-top-right-radius:.45rem;
-  border-bottom-right-radius:.45rem
+  border-top-right-radius:$table-border-radius;
+  border-bottom-right-radius:$table-border-radius
 }
 
 table.custom-data-table.dataTable tbody tr.selected td, table.data-thumb-view.dataTable tbody tr.selected td {

resources/assets/dcat/sass/components/_tab.scss

@@ -57,7 +57,7 @@
   .nav.nav-tabs {
     background: $primary;
     padding-left: 10px;
-    border-radius: $card-border-radius;
+    border-radius: .15rem;
     box-shadow: $shadow;
     border-bottom: 0;
   }

resources/views/filter/container.blade.php

@@ -1,13 +1,6 @@
-<div class="card p-2 {{ $expand ? '' : 'd-none' }} {{$containerClass}}" style="{{$border}};margin-top: 10px;margin-bottom: 8px;box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.04);border-radius: .3rem">
+<div class="card p-2 {{ $expand ? '' : 'd-none' }} {{$containerClass}}" style="{{$border}};padding-bottom: .5rem!important;margin-top: 10px;margin-bottom: 8px;box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.04);">
     <div class="card-body" style="{!! $style !!}"  id="{{ $filterID }}">
         <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
-            <div class="row">
-                @foreach($layout->columns() as $column)
-                    @foreach($column->filters() as $filter)
-                        {!! $filter->render() !!}
-                    @endforeach
-                @endforeach
-            </div>
             <div class="btn-group">
                 <button class="btn btn-primary btn-sm btn-mini submit">
                     <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.search') }}</span>
@@ -15,12 +8,20 @@
             </div>
             <div class="btn-group btn-group-sm default btn-mini" style="margin-left:5px"  >
                 @if(!$disableResetButton)
-                <a  href="{!! $action !!}" class="reset btn btn-white btn-sm ">
-                    <i class="feather icon-rotate-ccw"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.reset') }}</span>
-                </a>
+                    <a  href="{!! $action !!}" class="reset btn btn-white btn-sm ">
+                        <i class="feather icon-rotate-ccw"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.reset') }}</span>
+                    </a>
                 @endif
+            </div>
 
+            <div class="row mt-1 mb-0">
+                @foreach($layout->columns() as $column)
+                    @foreach($column->filters() as $filter)
+                        {!! $filter->render() !!}
+                    @endforeach
+                @endforeach
             </div>
+
         </form>
     </div>
 </div>