wip

resources/assets/adminlte/scss/_main-sidebar.scss

@@ -366,6 +366,7 @@
 [class*='sidebar-dark-'] {
   // Sidebar background color
   background-color: $sidebar-dark-bg;
+  //background-image: linear-gradient(0deg,#7e8ea1,#3c4655);
 
   //.nav .nav-item .nav-link {
   //
@@ -423,6 +424,7 @@
       &:active {
         color: $sidebar-dark-active-color;
         background: $sidebar-dark-active-bg;
+        font-weight: bold;
       }
       &:hover {
         color: $sidebar-dark-hover-color;
@@ -443,6 +445,7 @@
     > .nav-link.active {
       color: $sidebar-dark-active-color;
       background: $sidebar-dark-active-bg;
+      font-weight: bold;
 
       @if $enable-shadows {
         box-shadow: map-get($elevations, 1);
@@ -483,6 +486,7 @@
         &:focus {
           background-color: $sidebar-dark-submenu-hover-bg;
           color: $sidebar-dark-submenu-hover-color;
+          font-weight: bold;
         }
       }
 
@@ -490,6 +494,7 @@
         &,
         &:hover,
         &:focus {
+          font-weight: bold;
           background-color: $sidebar-dark-submenu-active-bg;
           color: $sidebar-dark-submenu-active-color;
         }

resources/assets/adminlte/scss/_variables.scss

@@ -124,26 +124,26 @@ $main-footer-bg: transparent !default;
 //$sidebar-dark-submenu-active-bg: $sidebar-dark-active-bg !default;
 //$sidebar-dark-header-color: hsla(0,0%,100%,.7) !default;
 
-// #262d37
-$sidebar-dark-bg: darken(#505b6b, 2%)!default;
+// #262d37 #313a46 lighten(#8391a2, 8%)
+$sidebar-dark-bg: #3c4655!default;
 $sidebar-dark-hover-bg: transparent !default;
-$sidebar-dark-color: $white!default;
-$sidebar-dark-hover-color: $white !default;
-$sidebar-dark-active-bg: darken(#49525f, 4%) !default;
+$sidebar-dark-color: darken(#ddd, 2%)!default;
+$sidebar-dark-hover-color: lighten($sidebar-dark-color, 10%) !default;
+$sidebar-dark-active-bg: $sidebar-dark-bg !default;
 $sidebar-dark-active-color: $white !default;
-$sidebar-dark-submenu-bg: darken(#49525f, 1%) !default;
+$sidebar-dark-submenu-bg: $sidebar-dark-bg !default;
 //$sidebar-dark-submenu-color: lighten(#C2C7D0, 6%) !default;
 $sidebar-dark-submenu-color: $sidebar-dark-color!default;
 $sidebar-dark-submenu-hover-color: $white !default;
 $sidebar-dark-submenu-hover-bg: $sidebar-dark-hover-bg !default;
 $sidebar-dark-submenu-active-color: $white !default;
-$sidebar-dark-submenu-active-bg: rgba(255,255,255, 0.12) !default;
+$sidebar-dark-submenu-active-bg: $sidebar-dark-bg !default;
 $sidebar-dark-header-color: hsla(0,0%,100%,.8) !default;
 // #505b6b #49525f
 
 // Light sidebar
 $sidebar-light-bg: $white !default;
-$sidebar-light-hover-bg: #f7f7f9 !default;
+$sidebar-light-hover-bg: transparent !default;
 $sidebar-light-color: $pure-black !default;
 $sidebar-light-hover-color: $gray-900 !default;
 $sidebar-light-active-color: $white !default;

resources/assets/dcat/sass/_colors.scss

@@ -154,4 +154,8 @@
 }
 .bg-80 {
   background: $dark80!important;
+}
+
+.bg-primary-gradient {
+  background-image: linear-gradient(60deg, $primary,  0%, lighten($primary, 5%) 37%, lighten($primary, 10%) 65%, lighten($primary, 15%) 100%);
 }

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

@@ -1,6 +1,6 @@
 .btn {
   padding: 0.54rem 1.2rem !important;
-  height: 36px;
+  height: 34px;
   line-height: 1.2;
   border-radius: 0.2rem;
   box-shadow: $btn-shadow;

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

@@ -49,26 +49,30 @@ $table-border-radius: .3rem;
   box-shadow: none
 }
 
-.custom-data-table-header .table-responsive .top .dataTables_filter{
+.table-responsive .table-filter {
   display: inline-block
 }
 
-.custom-data-table-header .table-responsive .top .dataTables_filter .form-control{
-  //padding: 1.45rem 2.8rem !important;
-  //border-radius: 1.428rem;
-  //border: 1px solid #dae1e7;
-  padding: 1.2rem 2.8rem !important;
-  border-radius: 1.4rem;
+.table-filter .form-control {
+  padding: 1.25rem 2.8rem !important;
+  border-radius: 5rem;
   border: 0;
-  box-shadow: $shadow;
+  background: #f0f0f0;
   font-size: .82rem;
 }
 
-.custom-data-table-header .table-responsive .top .dataTables_filter label{
+.table-filter .form-control:focus {
+  background: #fff;
+  border: 2px solid $primary;
+  padding: 1.12rem 2.8rem !important;
+  box-shadow: none;
+}
+
+.table-filter label{
   position: relative
 }
 
-.custom-data-table-header .table-responsive .top .dataTables_filter label:after{
+.table-filter label:after{
   content: "\E8BD";
   font-family: feather;
   position: absolute;
@@ -383,12 +387,12 @@ table.data-thumb-view.dataTable tbody tr td.product-img img {
   width: auto
 }
 
-.custom-data-table.dataTable .table-responsive .top .dataTables_filter .form-control, .data-thumb-view.dataTable .table-responsive .top .dataTables_filter .form-control, _:-ms-lang(x) .table-responsive .top .dataTables_filter .form-control {
+.custom-data-table.dataTable .table-responsive .top .table-filter .form-control, .data-thumb-view.dataTable .table-responsive .top .table-filter .form-control, _:-ms-lang(x) .table-responsive .top .table-filter .form-control {
   height: 1.4rem !important;
   padding: 0 .5rem !important
 }
 
-.custom-data-table.dataTable .table-responsive .top .dataTables_filter .form-control:after, .data-thumb-view.dataTable .table-responsive .top .dataTables_filter .form-control:after, _:-ms-lang(x) .table-responsive .top .dataTables_filter .form-control:after {
+.custom-data-table.dataTable .table-responsive .top .table-filter .form-control:after, .data-thumb-view.dataTable .table-responsive .top .table-filter .form-control:after, _:-ms-lang(x) .table-responsive .top .table-filter .form-control:after {
   display: none
 }
 

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

@@ -72,13 +72,6 @@
       margin-bottom: 1rem;
     }
   }
-
-  .custom-data-table-header .table-responsive .top .dataTables_filter .form-control {
-    border-radius: .4rem;
-    border: 1px solid $input-border-color;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
-  }
-
 }
 
 body:not(.dark-mode) .simple-grid {

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

@@ -22,10 +22,14 @@ table.dataTable thead tr {
   background: transparent;
 }
 
-.table th {
-  padding: .9rem;
+.table thead th {
+  padding: .65rem;
+  font-weight: 600;
   text-transform: capitalize;
   font-size: .95rem!important;
+  border-bottom: 1px solid $table-border-color;
+  //background: #f4f7fa;
+  //border-top: 1px solid $table-border-color!important;
 }
 
 table.dataTable thead th, table.dataTable thead td, table.dataTable tfoot th, table.dataTable tfoot td {
@@ -42,17 +46,13 @@ table.dataTable {
 
 .table td {
   padding: .55rem;
-  height: 48px;
+  height: 55px;
   line-height: 1.42857;
+  border-color: $table-border-color;
 }
 
 .table tr td:first-child, .table tr th:first-child {
-  padding-left: 1.4rem;
-}
-
-
-.card-header.custom-data-table-header .table-responsive .top .dataTables_filter .form-control {
-  box-shadow: $shadow-100;
+  padding-left: 2rem;
 }
 
 .quick-search-clear {

resources/assets/dcat/sass/theme/_colors.scss

@@ -118,4 +118,5 @@ $input-border-color: darken(#e4eaec, 3%);
 // 常用分割线颜色
 $divider-color: #f4f4f4;
 
-$table-border-color: darken(#f1f1f1, 5%);
+//$table-border-color: darken(#f1f1f1, 5%);
+$table-border-color: #f0f0f0;

resources/assets/dcat/sass/theme/_primary.scss

@@ -3,4 +3,5 @@
 $primary: $indigo;
 //$primary: #4e9876; // green
 //$primary: #5686d4; // blue
-//$primary: #62a8ea; //blue-light
+//$primary: #62a8ea; //blue-light
+//$primary: #586cb1;

resources/assets/dcat/sass/variables/_variables.scss

@@ -14,7 +14,8 @@
 $font-family-sans-serif: Nunito, Montserrat,system-ui,BlinkMacSystemFont,-apple-system,sans-serif;
 
 // 常用阴影颜色
-$shadow: 0 2px 4px 0 rgba(0,0,0,.08);
+//$shadow: 0 2px 4px 0 rgba(0,0,0,.08);
+$shadow: 0 1px 3px 0 rgba(0,0,0,.08),0 1px 2px 0 rgba(0,0,0,.06);
 $shadow-100: 0 3px 1px -2px rgba(0,0,0,.05), 0 2px 2px 0 rgba(0,0,0,.05), 0 1px 5px 1px rgba(0,0,0,.05);
 $shadow-150: 0 3px 1px -2px rgba(0,0,0,.065), 0 2px 2px 0 rgba(0,0,0,.065), 0 1px 5px 1px rgba(0,0,0,.065);
 $shadow-180: 0 3px 1px -2px rgba(0,0,0,.08), 0 2px 4px 0 rgba(0,0,0,.08), 0 1px 5px 1px rgba(0,0,0,.08);

resources/views/filter/container.blade.php

@@ -1,25 +1,31 @@
-<div class="filter-box card p-2 {{ $expand ? '' : 'd-none' }} {{$containerClass}}" style="padding-bottom: .5rem!important;margin-top: 10px;margin-bottom: 8px;box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.04);">
+<style>
+    .filter-box {
+        border-top: 1px solid #eee;
+        margin-top: 10px;
+        margin-bottom: -.5rem!important;
+        padding: 1.8rem 1.8rem 0;
+    }
+</style>
+
+<div class="filter-box shadow-0 card mb-0 {{ $expand ? '' : 'd-none' }} {{$containerClass}}">
     <div class="card-body" style="{!! $style !!}"  id="{{ $filterID }}">
         <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
-            <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>
-                </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="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">
+            <div class="row mb-0">
                 @foreach($layout->columns() as $column)
                     @foreach($column->filters() as $filter)
                         {!! $filter->render() !!}
                     @endforeach
                 @endforeach
+
+                <button class="btn btn-primary btn-sm btn-mini submit" style="margin-left: 12px">
+                    <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;{{ trans('admin.search') }}</span>
+                </button>
+
+                @if(!$disableResetButton)
+                <a style="margin-left: 6px" 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>
 
         </form>

resources/views/form/select.blade.php

@@ -12,6 +12,7 @@
         <input type="hidden" name="{{$name}}"/>
 
         <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}" {!! $attributes !!} >
+            <option value=""></option>
             @if($groups)
                 @foreach($groups as $group)
                     <optgroup label="{{ $group['label'] }}">
@@ -21,7 +22,6 @@
                     </optgroup>
                 @endforeach
              @else
-                <option value=""></option>
                 @foreach($options as $select => $option)
                     <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, $value) ?'selected':'' }}>{{$option}}</option>
                 @endforeach

resources/views/grid/pagination.blade.php

@@ -1,4 +1,4 @@
-<ul class="pagination pagination-sm no-margin pull-right shadow-100" style="border-radius: 1.5rem">
+<ul class="pagination pagination-sm no-margin pull-right" style="border-radius: 1.5rem">
     <!-- Previous Page Link -->
     @if ($paginator->onFirstPage())
     <li class="page-item previous disabled"><span class="page-link"></span></li>

resources/views/grid/quick-search.blade.php

@@ -1,7 +1,7 @@
 <style>::-ms-clear,::-ms-reveal{display: none;}</style>
 
 <form action="{!! $action !!}" class="input-no-border d-md-inline-block" pjax-container style="display:none;margin-right: 16px">
-    <div class="dataTables_filter">
+    <div class="table-filter">
         <label style="width: {{ $width }}rem">
             <input
                     type="search"

resources/views/grid/table-pagination.blade.php

@@ -1,9 +1,9 @@
 @if ($paginator = $grid->paginator())
-    <div class="box-footer clearfix " style="padding-bottom:5px;">
+    <div class="box-footer d-block clearfix " style="border:0;padding: 1rem 1.5rem 1.3rem;">
         {!! $paginator->render() !!}
     </div>
 @else
-    <div class="box-footer clearfix text-80 " style="height:48px;line-height:25px;">
+    <div class="box-footer d-block clearfix text-80 " style="border:0;padding: 1rem 1.5rem 1.3rem;height:48px;line-height:25px;">
         @if ($grid->rows()->isEmpty())
             {!! trans('admin.pagination.range', ['first' => '<b>0</b>', 'last' => '<b>'.$grid->rows()->count().'</b>', 'total' => '<b>'.$grid->rows()->count().'</b>',]) !!}
         @else

resources/views/grid/table.blade.php

@@ -1,16 +1,16 @@
 
 <div class="card dcat-box dt-bootstrap4">
 
-    <div class="card-header d-block pb-0" style="border: 0;padding: 1.5rem">
+    <div class="card-header d-block pb-0" style="border: 0;padding: 1.3rem 1.5rem">
         @include('admin::grid.table-toolbar')
-        <hr class="mb-0" />
+{{--        <hr class="mb-0" style="margin-top: .6rem" />--}}
     </div>
 
     {!! $grid->renderFilter() !!}
 
     {!! $grid->renderHeader() !!}
 
-    <div class="card-body table-responsive table-wrapper complex-container table-middle" style="{!! $grid->option('show_bordered') ? 'padding:3px 10px 10px' : '' !!};border-bottom: 1px solid #f8f8f8!important;">
+    <div class="card-body table-responsive table-wrapper complex-container table-middle" style="padding: 1.5rem 0 0;">
         <table class="{{ $grid->formatTableClass() }}" id="{{ $tableId }}" >
             <thead>
             @if ($headers = $grid->getComplexHeaders())
@@ -57,13 +57,5 @@
     @include('admin::grid.table-pagination')
 
 </div>
-<style>
-    .data-list-view-header .table-responsive .top .dataTables_filter .form-control {
-        padding: 1.1rem 2.8rem !important
-    }
-    .data-list-view-header .table-responsive .top .dataTables_filter label:after {
-        top: 0.42rem;
-        left: 1.1rem;
-    }
-</style>
+
 

resources/views/partials/menu.blade.php

@@ -11,7 +11,7 @@
         </li>
     @elseif(! isset($item['children']))
         <li class="nav-item">
-            <a href="{{ $builder->getUrl($item['uri']) }}" class="nav-link {!! $builder->isActive($item) ? 'active' : '' !!}">
+            <a @if(mb_strpos($item['uri'], '://') !== false) target="_blank" @endif href="{{ $builder->getUrl($item['uri']) }}" class="nav-link {!! $builder->isActive($item) ? 'active' : '' !!}">
                 {!! str_repeat('&nbsp;', $layer) !!}<i class="fa {{ $item['icon'] ?: 'feather icon-circle' }}"></i>
                 <p>
                     {{ $builder->translate($item['title']) }}

src/Form/Field/Editor.php

@@ -163,7 +163,7 @@ class Editor extends Field
         return <<<JS
 function (editor) {
     editor.on('Change', function(e) {
-        var content = e.level.content;
+        var content = e.target.getContent();
         if (! content) {
             content = e.level.fragments;
             content = content.length && content.join('');

src/Grid.php

@@ -122,7 +122,7 @@ class Grid
      *
      * @var string
      */
-    protected $view = 'admin::grid.data-table';
+    protected $view = 'admin::grid.table';
 
     /**
      * @var Closure

src/Grid/Tools.php

@@ -33,7 +33,7 @@ class Tools implements Renderable
     /**
      * @var bool
      */
-    protected $outline = true;
+    protected $outline = false;
 
     /**
      * Create a new Tools instance.

src/Repositories/EloquentRepository.php

@@ -788,7 +788,7 @@ class EloquentRepository extends Repository implements TreeRepository
 
                         $instance = $relation->findOrNew(Arr::get($related, $keyName));
 
-                        if ($related[Form::REMOVE_FLAG_NAME] == 1) {
+                        if (Arr::get($related, Form::REMOVE_FLAG_NAME) == 1) {
                             $instance->delete();
 
                             continue;