表格默认样式调整

resources/assets/dcat-admin/main.css

@@ -812,7 +812,7 @@ input.label {
 }
 
 .table-bordered, .table > tbody > tr > td, .table > tbody > tr > th, .table > tfoot > tr > td, .table > tfoot > tr > th, .table > thead > tr > td, .table > thead > tr > th {
-    border-top: 1px solid #ebeff2;
+    border-top: 1px solid #f4f4f4;
     vertical-align: middle;
 }
 
@@ -833,9 +833,9 @@ input.label {
     padding: .75rem 8px;
     letter-spacing: .05em;
 }
-/*.table-header-default.table {*/
-/*border:1px solid #eee;*/
-/*}*/
+.table-header-default.table>thead>tr>th {
+    border-bottom: 2px solid #f4f4f4;
+}
 .table>thead:first-child>tr:first-child>th:first-child {
     padding-left: 18px;
 }
@@ -847,7 +847,7 @@ input.label {
 }
 
 .table-header-default.table:not(.table-striped) thead tr {
-    border-top: 1px solid #e3e7eb;
+    border-top: 1px solid #f4f4f4;
 }
 .table-header-gray.table:not(.table-striped) thead tr {
     border-top: 1px solid #e3e7eb;

src/Controllers/AuthController.php

@@ -15,6 +15,11 @@ use Illuminate\Support\Facades\Validator;
 
 class AuthController extends Controller
 {
+    /**
+     * @var string
+     */
+    protected $redirectTo;
+
     /**
      * Show the login page.
      *
@@ -208,7 +213,7 @@ class AuthController extends Controller
             return $this->redirectTo();
         }
 
-        return property_exists($this, 'redirectTo') ? $this->redirectTo : config('admin.route.prefix');
+        return $this->redirectTo ?: config('admin.route.prefix');
     }
 
     /**
@@ -244,6 +249,6 @@ class AuthController extends Controller
      */
     protected function guard()
     {
-        return Auth::guard('admin');
+        return Admin::guard();
     }
 }

src/Controllers/MenuController.php

@@ -68,10 +68,7 @@ class MenuController extends Controller
         $tree->disableCreateButton();
         $tree->disableQuickCreateButton();
 
-        $roleText = trans('admin.roles');
-        $permissionText = trans('admin.permissions');
-
-        $tree->branch(function ($branch) use ($roleText, $permissionText) {
+        $tree->branch(function ($branch) {
             $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
 
             if (!isset($branch['children'])) {

src/Grid/Column/Sorter.php

@@ -66,7 +66,7 @@ class Sorter implements Renderable
     public function render()
     {
         $icon  = '';
-        $color = 'text-70';
+        $color = '';
         $type  = 'desc';
 
         if ($this->isSorted()) {
@@ -74,7 +74,7 @@ class Sorter implements Renderable
             if ($this->sort['type']) {
                 $icon .= $this->sort['type'] == 'desc' ? '-by-attributes-alt' : '-by-attributes';
 
-                $color = 'text-80';
+                $color = '';
             }
         }
 

src/Grid/Concerns/Options.php

@@ -33,7 +33,7 @@ trait Options
 
         'export_limit'       => 50000,
         'dialog_form_area'   => ['700px', '670px'],
-        'table_header_style' => 'table-header-gray',
+        'table_header_style' => 'table-header-default',
 
     ];
 

src/Middleware/Authenticate.php

@@ -21,7 +21,7 @@ class Authenticate
      */
     public function handle($request, Closure $next)
     {
-        if (Auth::guard('admin')->guest() && !$this->shouldPassThrough($request)) {
+        if (Admin::guard()->guest() && !$this->shouldPassThrough($request)) {
             $loginPage = admin_base_path('auth/login');
 
             if ($request->ajax() && !$request->pjax()) {

src/Middleware/Pjax.php

@@ -3,6 +3,7 @@
 namespace Dcat\Admin\Middleware;
 
 use Closure;
+use Dcat\Admin\Admin;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\MessageBag;
@@ -23,7 +24,7 @@ class Pjax
     {
         $response = $next($request);
 
-        if (!$request->pjax() || $response->isRedirection() || Auth::guard('admin')->guest()) {
+        if (!$request->pjax() || $response->isRedirection() || Admin::guard()->guest()) {
             return $response;
         }