filter group

update

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

@@ -1,9 +1,14 @@
 .vs-checkbox-con {
   margin: 0;
-}
-.vs-checkbox-con .vs-checkbox.vs-checkbox-sm {
-  width: 17px;
-  height: 17px;
+
+  input {
+    z-index: 10;
+  }
+
+  .vs-checkbox.vs-checkbox-sm {
+    width: 17px;
+    height: 17px;
+  }
 }
 .vs-checkbox-con input:checked ~ .vs-checkbox.vs-checkbox-sm .vs-checkbox--check .vs-icon {
   font-size: 1rem;

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

@@ -0,0 +1,3 @@
+.vs-radio-con input {
+  z-index: 10;
+}

resources/assets/dcat/sass/dcat-app.scss

@@ -46,6 +46,8 @@ html body .content .content-wrapper {
 @import "./components/dropdown";
 // checkbox
 @import "./components/checkbox";
+// radio
+@import "./components/radio";
 // card
 @import "./components/card";
 // tree jquery.nestable

resources/dist/dcat/css/dcat-app.css

@@ -2132,6 +2132,10 @@ table.data-thumb-view.dataTable tbody td {
   margin: 0;
 }
 
+.vs-checkbox-con input {
+  z-index: 10;
+}
+
 .vs-checkbox-con .vs-checkbox.vs-checkbox-sm {
   width: 17px;
   height: 17px;
@@ -2142,6 +2146,10 @@ table.data-thumb-view.dataTable tbody td {
   margin-top: -1px;
 }
 
+.vs-radio-con input {
+  z-index: 10;
+}
+
 .card {
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
 }

resources/views/filter/container.blade.php

@@ -9,13 +9,13 @@
             <div class="pull-left" style="margin-bottom:10px">
                 <div class="btn-group btn-group-sm" style="margin-left:5px;">
                     <button class="btn btn-primary btn-sm btn-mini submit">
-                        <i class="fa fa-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.search') }}</span>
+                        <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.search') }}</span>
                     </button>
                 </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="fa fa-undo"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.reset') }}</span>
+                        <i class="feather icon-rotate-ccw"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.reset') }}</span>
                     </a>
                     @endif
 

resources/views/filter/datetime.blade.php

@@ -1,21 +1,22 @@
 <div class="input-group input-group-sm">
     @if($group)
-        <div class="input-group-btn">
+        <div class="input-group-prepend dropdown">
+            <a class="filter-group input-group-text bg-white dropdown-toggle" data-toggle="dropdown">
+                <span class="{{ $group_name }}-label">{{ $default['label'] }}&nbsp; </span>
+            </a>
             <input type="hidden" name="{{ $id }}_group" class="{{ $group_name }}-operation" value="0"/>
-            <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" style="min-width: 32px;">
-                <span class="{{ $group_name }}-label">{{ $default['label'] }}</span>
-                &nbsp;&nbsp;
-                <span class="fa fa-caret-down"></span>
-            </button>
             <ul class="dropdown-menu {{ $group_name }}">
                 @foreach($group as $index => $item)
-                    <li><a href="#" data-index="{{ $index }}"> {{ $item['label'] }} </a></li>
+                    <li class="dropdown-item"><a href="#" data-index="{{ $index }}"> {{ $item['label'] }} </a></li>
                 @endforeach
             </ul>
         </div>
     @endif
-    <div class="input-group-addon">
-        <b>{{$label}}</b> &nbsp;<i class="feather icon-calendar"></i>
+{{--    <div class="input-group-prepend">--}}
+{{--        <b>{{$label}}</b> &nbsp;<i class="feather icon-calendar"></i>--}}
+{{--    </div>--}}
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white"><b>{!! $label !!}</b>&nbsp;<i class="feather icon-calendar"></i></span>
     </div>
-        <input class="form-control" id="{{$id}}" autocomplete="off" placeholder="{{$label}}" name="{{$name}}" value="{{ request($name, $value) }}">
+    <input class="form-control" id="{{$id}}" autocomplete="off" placeholder="{{$label}}" name="{{$name}}" value="{{ request($name, $value) }}">
 </div>

resources/views/filter/right-side-container.blade.php

@@ -5,11 +5,11 @@
                 <div class="p-1 position-fixed d-flex justify-content-between header">
                     <div>
                         <button type="submit" class=" btn btn-sm btn-primary submit">
-                            <i class="fa fa-search"></i> &nbsp;{{ __('admin.search') }}
+                            <i class="feather icon-search"></i> &nbsp;{{ __('admin.search') }}
                         </button>&nbsp;
                         @if(!$disableResetButton)
                             <a href="{!! $action !!}" class="reset btn btn-sm btn-white">
-                                <i class="fa fa-undo"></i> &nbsp;{{ __('admin.reset') }}
+                                <i class="feather icon-rotate-ccw"></i> &nbsp;{{ __('admin.reset') }}
                             </a>
                         @endif
                     </div>

resources/views/filter/text.blade.php

@@ -1,14 +1,13 @@
 <div class="input-group input-group-sm">
     @if($group)
-        <div class="input-group-prepend">
-            <input type="hidden" name="{{ $id }}_group" class="{{ $group_name }}-operation" value="0"/>
+        <div class="input-group-prepend dropdown">
             <a class="filter-group input-group-text bg-white dropdown-toggle" data-toggle="dropdown">
-                <span class="{{ $group_name }}-label">{{ $default['label'] }} </span>
-                <span class="fa fa-caret-down"></span>
+                <span class="{{ $group_name }}-label">{{ $default['label'] }}&nbsp; </span>
             </a>
+            <input type="hidden" name="{{ $id }}_group" class="{{ $group_name }}-operation" value="0"/>
             <ul class="dropdown-menu {{ $group_name }}">
                 @foreach($group as $index => $item)
-                    <li><a  data-index="{{ $index }}"> {{ $item['label'] }} </a></li>
+                    <li class="dropdown-item"><a  data-index="{{ $index }}"> {{ $item['label'] }} </a></li>
                 @endforeach
             </ul>
         </div>

src/Grid/Filter/AbstractFilter.php

@@ -147,7 +147,7 @@ abstract class AbstractFilter
             $this->width = $width;
         } else {
             $this->style = "width:$width;padding-left:10px;padding-right:10px";
-            $this->width = ' pull-left';
+            $this->width = ' ';
         }
 
         return $this;