jqh 5 anni fa
parent
commit
e121b0aa6c

+ 3 - 3
resources/assets/dcat-admin/main.css

@@ -1,4 +1,5 @@
 :root {
+    --font: #414750;
     --black: #22292f;
     --white: #fff;
     --white-50: hsla(0,0%,100%,.5);
@@ -41,7 +42,7 @@
 
 html, body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, kbd, pre, samp, .tooltip, .popover, .main-header .logo {
     font-family: Nunito,system-ui,BlinkMacSystemFont,-apple-system,sans-serif;
-    color: #414750;
+    color: var(--font);
     /*color:#525252;*/
 }
 
@@ -2088,8 +2089,7 @@ div.layui-layer-btn{
 }
 .jstree-proton .jstree-anchor {
     font-size:13px;
-    color:#333!important;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, .15);
+    color:var(--font)!important;
 }
 
 .jstree-proton .jstree-ocl,.jstree-proton .jstree-node {

File diff suppressed because it is too large
+ 0 - 0
resources/assets/dcat-admin/main.min.css


+ 1 - 1
src/Controllers/MenuController.php

@@ -45,7 +45,7 @@ class MenuController extends Controller
                     $form->multipleSelect('roles', trans('admin.roles'))
                         ->options($roleModel::all()->pluck('name', 'id'));
                     if ($menuModel::withPermission()) {
-                        $form->multipleSelect('permissions', trans('admin.permission'))->options($permissionModel::selectOptions());
+                        $form->tree('permissions', trans('admin.permission'))->nodes((new $permissionModel)->allNodes());
                     }
                     $form->hidden('_token')->default(csrf_token());
 

Some files were not shown because too many files changed in this diff