jqh 5 years ago
parent
commit
b19856bce6

+ 3 - 1
resources/assets/dcat/sass/components/_layer.scss

@@ -10,6 +10,7 @@
   font-size: 1.1rem!important;
   text-transform: capitalize;
   overflow: hidden;
+  background-color: #fff!important;
 }
 .layui-layer-setwin .layui-layer-min cite {
   background: transparent!important;
@@ -60,7 +61,8 @@
   line-height: 20px!important;
   padding: 4px 15px!important;
   font-size: .95rem;
-  box-shadow: $shadow;
+  box-shadow: $shadow-100;
+  border-color: $white!important;
 }
 
 .layui-layer-btn .layui-layer-btn0 {

+ 1 - 0
resources/assets/dcat/sass/components/_menu.scss

@@ -23,6 +23,7 @@
         display: inline-block;
         max-width: 45px;
         max-height: 40px;
+        margin-top: -1px;
       }
     }
 

+ 2 - 1
resources/assets/sass/core/variables/_variables.scss

@@ -27,10 +27,11 @@ $indigo: #5c6bc6;
 
 $blue: #3085d6; //$info
 $red: #ea5455; //$danger
-$orange: #ff9f43; //$warning
+$orange: #dda451; //$warning
 $green: #21b978; //$success
 $cyan: #7367f0; //$primary
 
+
 $primary: $indigo;
 $info: $blue;
 $warning: $orange;

+ 1 - 1
resources/dist/css/bootstrap-extended.css

@@ -3851,7 +3851,7 @@ _:-ms-lang(x),
 }
 
 .modal .modal-header.bg-warning .close span {
-  color: #ff9f43;
+  color: #dda451;
 }
 
 .modal .modal-header.bg-dark .close span {

+ 44 - 44
resources/dist/css/bootstrap.css

@@ -20,7 +20,7 @@
   --purple: #6f42c1;
   --pink: #e83e8c;
   --red: #ea5455;
-  --orange: #ff9f43;
+  --orange: #dda451;
   --yellow: #ffc107;
   --green: #21b978;
   --teal: #20c997;
@@ -32,7 +32,7 @@
   --secondary: #b8c2cc;
   --success: #21b978;
   --info: #3085d6;
-  --warning: #ff9f43;
+  --warning: #dda451;
   --danger: #ea5455;
   --light: #babfc7;
   --dark: #1e1e1e;
@@ -1774,23 +1774,23 @@ pre code {
 .table-warning,
 .table-warning > th,
 .table-warning > td {
-  background-color: #ffe4ca;
+  background-color: #f5e6ce;
 }
 
 .table-warning th,
 .table-warning td,
 .table-warning thead th,
 .table-warning tbody + tbody {
-  border-color: #ffcd9d;
+  border-color: #edd0a5;
 }
 
 .table-hover .table-warning:hover {
-  background-color: #ffd7b1;
+  background-color: #f1dbb9;
 }
 
 .table-hover .table-warning:hover > td,
 .table-hover .table-warning:hover > th {
-  background-color: #ffd7b1;
+  background-color: #f1dbb9;
 }
 
 .table-danger,
@@ -2723,40 +2723,40 @@ fieldset:disabled a.btn {
 
 .btn-warning {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-warning:hover {
   color: #2a2e30;
-  background-color: #ff8b1d;
-  border-color: #ff8510;
+  background-color: #d79331;
+  border-color: #d28d29;
 }
 
 .btn-warning:focus,
 .btn-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(223, 142, 64, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(194, 146, 76, 0.5);
 }
 
 .btn-warning.disabled,
 .btn-warning:disabled {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-warning:not(:disabled):not(.disabled):active,
 .btn-warning:not(:disabled):not(.disabled).active,
 .show > .btn-warning.dropdown-toggle {
   color: #2a2e30;
-  background-color: #ff8510;
-  border-color: #ff7e03;
+  background-color: #d28d29;
+  border-color: #c78627;
 }
 
 .btn-warning:not(:disabled):not(.disabled):active:focus,
 .btn-warning:not(:disabled):not(.disabled).active:focus,
 .show > .btn-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(223, 142, 64, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(194, 146, 76, 0.5);
 }
 
 .btn-danger {
@@ -3018,24 +3018,24 @@ fieldset:disabled a.btn {
 }
 
 .btn-outline-warning {
-  color: #ff9f43;
-  border-color: #ff9f43;
+  color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:hover {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:focus,
 .btn-outline-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 159, 67, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(221, 164, 81, 0.5);
 }
 
 .btn-outline-warning.disabled,
 .btn-outline-warning:disabled {
-  color: #ff9f43;
+  color: #dda451;
   background-color: transparent;
 }
 
@@ -3043,14 +3043,14 @@ fieldset:disabled a.btn {
 .btn-outline-warning:not(:disabled):not(.disabled).active,
 .show > .btn-outline-warning.dropdown-toggle {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:not(:disabled):not(.disabled):active:focus,
 .btn-outline-warning:not(:disabled):not(.disabled).active:focus,
 .show > .btn-outline-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 159, 67, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(221, 164, 81, 0.5);
 }
 
 .btn-outline-danger {
@@ -5230,19 +5230,19 @@ a.badge-info.focus {
 
 .badge-warning {
   color: #2a2e30;
-  background-color: #ff9f43;
+  background-color: #dda451;
 }
 
 a.badge-warning:hover,
 a.badge-warning:focus {
   color: #2a2e30;
-  background-color: #ff8510;
+  background-color: #d28d29;
 }
 
 a.badge-warning:focus,
 a.badge-warning.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(255, 159, 67, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(221, 164, 81, 0.5);
 }
 
 .badge-danger {
@@ -5400,17 +5400,17 @@ a.badge-dark.focus {
 }
 
 .alert-warning {
-  color: #956639;
-  background-color: #ffecd9;
-  border-color: #ffe4ca;
+  color: #836941;
+  background-color: #f8eddc;
+  border-color: #f5e6ce;
 }
 
 .alert-warning hr {
-  border-top-color: #ffd7b1;
+  border-top-color: #f1dbb9;
 }
 
 .alert-warning .alert-link {
-  color: #704d2b;
+  color: #614e30;
 }
 
 .alert-danger {
@@ -5793,20 +5793,20 @@ a.badge-dark.focus {
 }
 
 .list-group-item-warning {
-  color: #956639;
-  background-color: #ffe4ca;
+  color: #836941;
+  background-color: #f5e6ce;
 }
 
 .list-group-item-warning.list-group-item-action:hover,
 .list-group-item-warning.list-group-item-action:focus {
-  color: #956639;
-  background-color: #ffd7b1;
+  color: #836941;
+  background-color: #f1dbb9;
 }
 
 .list-group-item-warning.list-group-item-action.active {
   color: #fff;
-  background-color: #956639;
-  border-color: #956639;
+  background-color: #836941;
+  border-color: #836941;
 }
 
 .list-group-item-danger {
@@ -6778,14 +6778,14 @@ button.bg-info:focus {
 }
 
 .bg-warning {
-  background-color: #ff9f43 !important;
+  background-color: #dda451 !important;
 }
 
 a.bg-warning:hover,
 a.bg-warning:focus,
 button.bg-warning:hover,
 button.bg-warning:focus {
-  background-color: #ff8510 !important;
+  background-color: #d28d29 !important;
 }
 
 .bg-danger {
@@ -6886,7 +6886,7 @@ button.bg-dark:focus {
 }
 
 .border-warning {
-  border-color: #ff9f43 !important;
+  border-color: #dda451 !important;
 }
 
 .border-danger {
@@ -11578,12 +11578,12 @@ a.text-info:focus {
 }
 
 .text-warning {
-  color: #ff9f43 !important;
+  color: #dda451 !important;
 }
 
 a.text-warning:hover,
 a.text-warning:focus {
-  color: #f67800 !important;
+  color: #bd7f25 !important;
 }
 
 .text-danger {

File diff suppressed because it is too large
+ 239 - 239
resources/dist/css/colors.css


+ 1 - 1
resources/dist/css/components.css

@@ -1899,7 +1899,7 @@ body.fixed-footer .main-menu.menu-fixed {
 }
 
 .avatar .avatar-status-away {
-  background-color: #ff9f43;
+  background-color: #dda451;
 }
 
 .avatar .avatar-status-offline {

+ 2 - 2
resources/dist/css/core/colors/palette-gradient.css

@@ -175,7 +175,7 @@
 .bg-gradient-warning {
   background: #fafafa;
   color: #fff;
-  background-image: linear-gradient(30deg, #ff9f43, rgba(255, 159, 67, 0.5));
+  background-image: linear-gradient(30deg, #dda451, rgba(221, 164, 81, 0.5));
   background-repeat: repeat-x;
 }
 
@@ -185,7 +185,7 @@
 }
 
 .gradient-light-warning {
-  background: linear-gradient(30deg, #ff9f43 0%, #fff487 100%);
+  background: linear-gradient(30deg, #dda451 0%, #eff082 100%);
   color: #fff;
 }
 

+ 4 - 4
resources/dist/css/core/colors/palette-noui.css

@@ -135,20 +135,20 @@
 }
 
 .slider-warning .noUi-connect {
-  background: #ff9f43 !important;
+  background: #dda451 !important;
 }
 
 .slider-warning.noUi-connect {
-  background: #ff9f43 !important;
+  background: #dda451 !important;
 }
 
 .slider-warning .noUi-handle {
-  border-color: #ff9f43 !important;
+  border-color: #dda451 !important;
 }
 
 .slider-warning.circle-filled .noUi-handle,
 .slider-warning.square .noUi-handle {
-  background: #ff9f43 !important;
+  background: #dda451 !important;
 }
 
 .slider-danger .noUi-connect {

+ 1 - 1
resources/dist/css/pages/app-ecommerce-details.css

@@ -100,7 +100,7 @@
 }
 
 .product-color-options .selected .b-warning {
-  border-color: #ff9f43;
+  border-color: #dda451;
 }
 
 .product-color-options .selected .b-black {

+ 19 - 19
resources/dist/css/plugins/calendars/fullcalendar.css

@@ -213,40 +213,40 @@ fieldset:disabled .fc a.fc-button,
 
 .btn-warning {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-warning:hover {
   color: #2a2e30;
-  background-color: #ff8b1d;
-  border-color: #ff8510;
+  background-color: #d79331;
+  border-color: #d28d29;
 }
 
 .btn-warning:focus,
 .btn-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(223, 142, 64, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(194, 146, 76, 0.5);
 }
 
 .btn-warning.disabled,
 .btn-warning:disabled {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-warning:not(:disabled):not(.disabled):active,
 .btn-warning:not(:disabled):not(.disabled).active,
 .show > .btn-warning.dropdown-toggle {
   color: #2a2e30;
-  background-color: #ff8510;
-  border-color: #ff7e03;
+  background-color: #d28d29;
+  border-color: #c78627;
 }
 
 .btn-warning:not(:disabled):not(.disabled):active:focus,
 .btn-warning:not(:disabled):not(.disabled).active:focus,
 .show > .btn-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(223, 142, 64, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(194, 146, 76, 0.5);
 }
 
 .btn-danger {
@@ -520,24 +520,24 @@ fieldset:disabled .fc a.fc-button,
 }
 
 .btn-outline-warning {
-  color: #ff9f43;
-  border-color: #ff9f43;
+  color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:hover {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:focus,
 .btn-outline-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 159, 67, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(221, 164, 81, 0.5);
 }
 
 .btn-outline-warning.disabled,
 .btn-outline-warning:disabled {
-  color: #ff9f43;
+  color: #dda451;
   background-color: transparent;
 }
 
@@ -545,14 +545,14 @@ fieldset:disabled .fc a.fc-button,
 .btn-outline-warning:not(:disabled):not(.disabled).active,
 .show > .btn-outline-warning.dropdown-toggle {
   color: #2a2e30;
-  background-color: #ff9f43;
-  border-color: #ff9f43;
+  background-color: #dda451;
+  border-color: #dda451;
 }
 
 .btn-outline-warning:not(:disabled):not(.disabled):active:focus,
 .btn-outline-warning:not(:disabled):not(.disabled).active:focus,
 .show > .btn-outline-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 159, 67, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(221, 164, 81, 0.5);
 }
 
 .btn-outline-danger {

+ 1 - 1
resources/dist/css/plugins/extensions/toastr.css

@@ -30,6 +30,6 @@
 }
 
 .toast-warning {
-  background-color: #ff9f43;
+  background-color: #dda451;
 }
 

+ 36 - 36
resources/dist/css/plugins/loaders/animations/ball-grid-beat.css

@@ -27,66 +27,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: 0.7s;
-          animation-delay: 0.7s;
-  -webkit-animation-duration: 0.62s;
-          animation-duration: 0.62s;
+  -webkit-animation-delay: 0.66s;
+          animation-delay: 0.66s;
+  -webkit-animation-duration: 0.74s;
+          animation-duration: 0.74s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: 0.52s;
-          animation-delay: 0.52s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: 0.24s;
+          animation-delay: 0.24s;
+  -webkit-animation-duration: 0.98s;
+          animation-duration: 0.98s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.37s;
-          animation-delay: 0.37s;
-  -webkit-animation-duration: 0.89s;
-          animation-duration: 0.89s;
+  -webkit-animation-delay: 0.19s;
+          animation-delay: 0.19s;
+  -webkit-animation-duration: 1.22s;
+          animation-duration: 1.22s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.2s;
-          animation-delay: 0.2s;
-  -webkit-animation-duration: 1.43s;
-          animation-duration: 1.43s;
+  -webkit-animation-delay: 0.15s;
+          animation-delay: 0.15s;
+  -webkit-animation-duration: 0.98s;
+          animation-duration: 0.98s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.15s;
-          animation-delay: 0.15s;
-  -webkit-animation-duration: 1.41s;
-          animation-duration: 1.41s;
+  -webkit-animation-delay: 0.47s;
+          animation-delay: 0.47s;
+  -webkit-animation-duration: 1.47s;
+          animation-duration: 1.47s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: -0.17s;
-          animation-delay: -0.17s;
-  -webkit-animation-duration: 1.5s;
-          animation-duration: 1.5s;
+  -webkit-animation-delay: -0.11s;
+          animation-delay: -0.11s;
+  -webkit-animation-duration: 0.74s;
+          animation-duration: 0.74s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: -0.16s;
-          animation-delay: -0.16s;
-  -webkit-animation-duration: 1.32s;
-          animation-duration: 1.32s;
+  -webkit-animation-delay: 0.37s;
+          animation-delay: 0.37s;
+  -webkit-animation-duration: 1.39s;
+          animation-duration: 1.39s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.06s;
-          animation-delay: 0.06s;
-  -webkit-animation-duration: 0.99s;
-          animation-duration: 0.99s;
+  -webkit-animation-delay: 0.41s;
+          animation-delay: 0.41s;
+  -webkit-animation-duration: 0.87s;
+          animation-duration: 0.87s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.07s;
-          animation-delay: 0.07s;
-  -webkit-animation-duration: 0.63s;
-          animation-duration: 0.63s;
+  -webkit-animation-delay: 0.79s;
+          animation-delay: 0.79s;
+  -webkit-animation-duration: 0.61s;
+          animation-duration: 0.61s;
 }
 
 .ball-grid-beat > div {

+ 36 - 36
resources/dist/css/plugins/loaders/animations/ball-grid-pulse.css

@@ -39,66 +39,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: -0.19s;
-          animation-delay: -0.19s;
-  -webkit-animation-duration: 1.12s;
-          animation-duration: 1.12s;
+  -webkit-animation-delay: 0.03s;
+          animation-delay: 0.03s;
+  -webkit-animation-duration: 0.68s;
+          animation-duration: 0.68s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.8s;
-          animation-delay: 0.8s;
-  -webkit-animation-duration: 1.31s;
-          animation-duration: 1.31s;
+  -webkit-animation-delay: 0.2s;
+          animation-delay: 0.2s;
+  -webkit-animation-duration: 0.98s;
+          animation-duration: 0.98s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.51s;
-          animation-delay: 0.51s;
-  -webkit-animation-duration: 1.16s;
-          animation-duration: 1.16s;
+  -webkit-animation-delay: 0.05s;
+          animation-delay: 0.05s;
+  -webkit-animation-duration: 1.14s;
+          animation-duration: 1.14s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.73s;
-          animation-delay: 0.73s;
-  -webkit-animation-duration: 1.01s;
-          animation-duration: 1.01s;
+  -webkit-animation-delay: 0.28s;
+          animation-delay: 0.28s;
+  -webkit-animation-duration: 1.18s;
+          animation-duration: 1.18s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.02s;
-          animation-delay: 0.02s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-delay: 0.18s;
+          animation-delay: 0.18s;
+  -webkit-animation-duration: 1.04s;
+          animation-duration: 1.04s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.58s;
-          animation-delay: 0.58s;
-  -webkit-animation-duration: 0.85s;
-          animation-duration: 0.85s;
+  -webkit-animation-delay: 0.28s;
+          animation-delay: 0.28s;
+  -webkit-animation-duration: 1.11s;
+          animation-duration: 1.11s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0.15s;
-          animation-delay: 0.15s;
-  -webkit-animation-duration: 1.54s;
-          animation-duration: 1.54s;
+  -webkit-animation-delay: 0.4s;
+          animation-delay: 0.4s;
+  -webkit-animation-duration: 1.46s;
+          animation-duration: 1.46s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.32s;
-          animation-delay: 0.32s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: 0.13s;
+          animation-delay: 0.13s;
+  -webkit-animation-duration: 1.48s;
+          animation-duration: 1.48s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: -0.05s;
-          animation-delay: -0.05s;
-  -webkit-animation-duration: 0.83s;
-          animation-duration: 0.83s;
+  -webkit-animation-delay: -0.08s;
+          animation-delay: -0.08s;
+  -webkit-animation-duration: 1.14s;
+          animation-duration: 1.14s;
 }
 
 .ball-grid-pulse > div {

+ 16 - 16
resources/dist/css/plugins/loaders/animations/line-scale-random.css

@@ -31,31 +31,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: 0.71s;
-          animation-delay: 0.71s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: -0.18s;
+          animation-delay: -0.18s;
+  -webkit-animation-duration: 1.22s;
+          animation-duration: 1.22s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.76s;
-          animation-delay: 0.76s;
-  -webkit-animation-duration: 0.99s;
-          animation-duration: 0.99s;
+  -webkit-animation-delay: 0.79s;
+          animation-delay: 0.79s;
+  -webkit-animation-duration: 1.16s;
+          animation-duration: 1.16s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.24s;
-          animation-delay: 0.24s;
-  -webkit-animation-duration: 1.11s;
-          animation-duration: 1.11s;
+  -webkit-animation-delay: 0.29s;
+          animation-delay: 0.29s;
+  -webkit-animation-duration: 1.26s;
+          animation-duration: 1.26s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0.69s;
-          animation-delay: 0.69s;
-  -webkit-animation-duration: 0.6s;
-          animation-duration: 0.6s;
+  -webkit-animation-delay: 0.59s;
+          animation-delay: 0.59s;
+  -webkit-animation-duration: 1.27s;
+          animation-duration: 1.27s;
 }
 
 .line-scale-party > div {

+ 86 - 86
resources/dist/css/plugins/loaders/loaders.css

@@ -1454,66 +1454,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: 0.4s;
-          animation-delay: 0.4s;
-  -webkit-animation-duration: 0.68s;
-          animation-duration: 0.68s;
+  -webkit-animation-delay: 0.36s;
+          animation-delay: 0.36s;
+  -webkit-animation-duration: 1.25s;
+          animation-duration: 1.25s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: 0.68s;
-          animation-delay: 0.68s;
-  -webkit-animation-duration: 1.55s;
-          animation-duration: 1.55s;
+  -webkit-animation-delay: 0.07s;
+          animation-delay: 0.07s;
+  -webkit-animation-duration: 1.45s;
+          animation-duration: 1.45s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.08s;
-          animation-delay: 0.08s;
-  -webkit-animation-duration: 0.89s;
-          animation-duration: 0.89s;
+  -webkit-animation-delay: -0.07s;
+          animation-delay: -0.07s;
+  -webkit-animation-duration: 1.24s;
+          animation-duration: 1.24s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.69s;
-          animation-delay: 0.69s;
-  -webkit-animation-duration: 1.01s;
-          animation-duration: 1.01s;
+  -webkit-animation-delay: 0.74s;
+          animation-delay: 0.74s;
+  -webkit-animation-duration: 1.58s;
+          animation-duration: 1.58s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.55s;
-          animation-delay: 0.55s;
-  -webkit-animation-duration: 1.36s;
-          animation-duration: 1.36s;
+  -webkit-animation-delay: 0.27s;
+          animation-delay: 0.27s;
+  -webkit-animation-duration: 1.02s;
+          animation-duration: 1.02s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: -0.15s;
-          animation-delay: -0.15s;
-  -webkit-animation-duration: 1.38s;
-          animation-duration: 1.38s;
+  -webkit-animation-delay: 0.71s;
+          animation-delay: 0.71s;
+  -webkit-animation-duration: 0.79s;
+          animation-duration: 0.79s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.16s;
-          animation-delay: 0.16s;
-  -webkit-animation-duration: 1.47s;
-          animation-duration: 1.47s;
+  -webkit-animation-delay: 0.06s;
+          animation-delay: 0.06s;
+  -webkit-animation-duration: 0.93s;
+          animation-duration: 0.93s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.19s;
-          animation-delay: 0.19s;
-  -webkit-animation-duration: 0.71s;
-          animation-duration: 0.71s;
+  -webkit-animation-delay: 0.58s;
+          animation-delay: 0.58s;
+  -webkit-animation-duration: 1.47s;
+          animation-duration: 1.47s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.48s;
-          animation-delay: 0.48s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: 0.18s;
+          animation-delay: 0.18s;
+  -webkit-animation-duration: 0.78s;
+          animation-duration: 0.78s;
 }
 
 .ball-grid-beat > div {
@@ -1575,66 +1575,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: 0.41s;
-          animation-delay: 0.41s;
-  -webkit-animation-duration: 1.48s;
-          animation-duration: 1.48s;
+  -webkit-animation-delay: 0.13s;
+          animation-delay: 0.13s;
+  -webkit-animation-duration: 0.7s;
+          animation-duration: 0.7s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.53s;
-          animation-delay: 0.53s;
-  -webkit-animation-duration: 0.66s;
-          animation-duration: 0.66s;
+  -webkit-animation-delay: 0.05s;
+          animation-delay: 0.05s;
+  -webkit-animation-duration: 1.58s;
+          animation-duration: 1.58s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
   -webkit-animation-delay: 0.79s;
           animation-delay: 0.79s;
-  -webkit-animation-duration: 1.43s;
-          animation-duration: 1.43s;
+  -webkit-animation-duration: 1.06s;
+          animation-duration: 1.06s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.52s;
-          animation-delay: 0.52s;
-  -webkit-animation-duration: 1.51s;
-          animation-duration: 1.51s;
+  -webkit-animation-delay: 0.27s;
+          animation-delay: 0.27s;
+  -webkit-animation-duration: 0.72s;
+          animation-duration: 0.72s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.75s;
-          animation-delay: 0.75s;
-  -webkit-animation-duration: 1.21s;
-          animation-duration: 1.21s;
+  -webkit-animation-delay: 0.06s;
+          animation-delay: 0.06s;
+  -webkit-animation-duration: 1.05s;
+          animation-duration: 1.05s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.05s;
-          animation-delay: 0.05s;
-  -webkit-animation-duration: 1.28s;
-          animation-duration: 1.28s;
+  -webkit-animation-delay: 0.29s;
+          animation-delay: 0.29s;
+  -webkit-animation-duration: 0.79s;
+          animation-duration: 0.79s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: -0.02s;
-          animation-delay: -0.02s;
-  -webkit-animation-duration: 1.12s;
-          animation-duration: 1.12s;
+  -webkit-animation-delay: 0.11s;
+          animation-delay: 0.11s;
+  -webkit-animation-duration: 1.31s;
+          animation-duration: 1.31s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.47s;
-          animation-delay: 0.47s;
-  -webkit-animation-duration: 1.02s;
-          animation-duration: 1.02s;
+  -webkit-animation-delay: 0.45s;
+          animation-delay: 0.45s;
+  -webkit-animation-duration: 1.41s;
+          animation-duration: 1.41s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: 0.5s;
-          animation-delay: 0.5s;
-  -webkit-animation-duration: 1.48s;
-          animation-duration: 1.48s;
+  -webkit-animation-delay: 0.66s;
+          animation-delay: 0.66s;
+  -webkit-animation-duration: 1.13s;
+          animation-duration: 1.13s;
 }
 
 .ball-grid-pulse > div {
@@ -2181,31 +2181,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: -0.15s;
-          animation-delay: -0.15s;
-  -webkit-animation-duration: 0.73s;
-          animation-duration: 0.73s;
+  -webkit-animation-delay: 0.41s;
+          animation-delay: 0.41s;
+  -webkit-animation-duration: 0.41s;
+          animation-duration: 0.41s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.45s;
-          animation-delay: 0.45s;
-  -webkit-animation-duration: 0.72s;
-          animation-duration: 0.72s;
+  -webkit-animation-delay: -0.02s;
+          animation-delay: -0.02s;
+  -webkit-animation-duration: 0.63s;
+          animation-duration: 0.63s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.37s;
-          animation-delay: 0.37s;
-  -webkit-animation-duration: 0.75s;
-          animation-duration: 0.75s;
+  -webkit-animation-delay: 0.21s;
+          animation-delay: 0.21s;
+  -webkit-animation-duration: 0.82s;
+          animation-duration: 0.82s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0.42s;
-          animation-delay: 0.42s;
-  -webkit-animation-duration: 0.59s;
-          animation-duration: 0.59s;
+  -webkit-animation-delay: 0.03s;
+          animation-delay: 0.03s;
+  -webkit-animation-duration: 0.74s;
+          animation-duration: 0.74s;
 }
 
 .line-scale-party > div {

+ 1 - 1
resources/dist/css/themes/dark-layout.css

@@ -2021,7 +2021,7 @@ body.dark-layout .toast-container .toast.toast-error {
 }
 
 body.dark-layout .toast-container .toast.toast-warning {
-  background-color: #ff9f43;
+  background-color: #dda451;
 }
 
 body.dark-layout .dropzone {

+ 4 - 1
resources/dist/dcat/css/dcat-app.css

@@ -2362,6 +2362,7 @@ table.dataTable.complex-headers tfoot td {
   font-size: 1.1rem !important;
   text-transform: capitalize;
   overflow: hidden;
+  background-color: #fff !important;
 }
 
 .layui-layer-setwin .layui-layer-min cite {
@@ -2416,7 +2417,8 @@ table.dataTable.complex-headers tfoot td {
   line-height: 20px !important;
   padding: 4px 15px !important;
   font-size: 0.95rem;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.05), 0 1px 5px 1px rgba(0, 0, 0, 0.05);
+  border-color: #fff !important;
 }
 
 .layui-layer-btn .layui-layer-btn0 {
@@ -2737,6 +2739,7 @@ table.dataTable.complex-headers tfoot td {
   display: inline-block;
   max-width: 45px;
   max-height: 40px;
+  margin-top: -1px;
 }
 
 .main-menu .navbar-header .modern-nav-toggle {

+ 3 - 1
src/Controllers/MenuController.php

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

+ 19 - 15
src/Form/Field/Tree.php

@@ -112,18 +112,23 @@ class Tree extends Field
         return $this;
     }
 
-    /**
-     * @param string $idColumn
-     * @param string $textColumn
-     * @param string $parentColumn
-     *
-     * @return $this
-     */
-    public function name(string $idColumn = 'id', string $textColumn = 'name', string $parentColumn = 'parent_id')
+    public function setIdColumn(string $name)
+    {
+        $this->columnNames['id'] = $name;
+
+        return $this;
+    }
+
+    public function setTitleColumn(string $name)
+    {
+        $this->columnNames['text'] = $name;
+
+        return $this;
+    }
+
+    public function setParentColumn(string $name)
     {
-        $this->columnNames['id'] = $idColumn;
-        $this->columnNames['text'] = $textColumn;
-        $this->columnNames['parent'] = $parentColumn;
+        $this->columnNames['parent'] = $name;
 
         return $this;
     }
@@ -217,13 +222,13 @@ class Tree extends Field
     }
 
     /**
-     * Disable expand.
+     * @param bool $value
      *
      * @return $this
      */
-    public function disableExpand()
+    public function expand(bool $value = true)
     {
-        $this->expand = false;
+        $this->expand = $value;
 
         return $this;
     }
@@ -255,7 +260,6 @@ class Tree extends Field
 
         $checkboxes->style('primary');
         $checkboxes->inline();
-        $checkboxes->circle(false);
         $checkboxes->options([
             1 => trans('admin.selectall'),
             2 => trans('admin.expand'),

+ 16 - 11
src/Grid/Displayers/DialogTree.php

@@ -123,18 +123,23 @@ class DialogTree extends AbstractDisplayer
         return $this;
     }
 
-    /**
-     * @param string $idColumn
-     * @param string $textColumn
-     * @param string $parentColumn
-     *
-     * @return $this
-     */
-    public function name(string $idColumn = 'id', string $textColumn = 'name', string $parentColumn = 'parent_id')
+    public function setIdColumn(string $name)
+    {
+        $this->columnNames['id'] = $name;
+
+        return $this;
+    }
+
+    public function setTitleColumn(string $name)
+    {
+        $this->columnNames['text'] = $name;
+
+        return $this;
+    }
+
+    public function setParentColumn(string $name)
     {
-        $this->columnNames['id'] = $idColumn;
-        $this->columnNames['text'] = $textColumn;
-        $this->columnNames['parent'] = $parentColumn;
+        $this->columnNames['parent'] = $name;
 
         return $this;
     }

+ 19 - 16
src/Widgets/Tree.php

@@ -3,6 +3,7 @@
 namespace Dcat\Admin\Widgets;
 
 use Dcat\Admin\Admin;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -86,28 +87,30 @@ class Tree extends Widget
         return $this;
     }
 
-    public function checked($value = [])
+    public function check($value)
     {
-        if ($value instanceof Arrayable) {
-            $value = $value->toArray();
-        }
-        $this->value = (array) $value;
+        $this->value = Helper::array($value);
 
         return $this;
     }
 
-    /**
-     * @param string $idColumn
-     * @param string $textColumn
-     * @param string $parentColumn
-     *
-     * @return $this
-     */
-    public function name(string $idColumn = 'id', string $textColumn = 'name', string $parentColumn = 'parent_id')
+    public function setIdColumn(string $name)
+    {
+        $this->columnNames['id'] = $name;
+
+        return $this;
+    }
+
+    public function setTitleColumn(string $name)
+    {
+        $this->columnNames['text'] = $name;
+
+        return $this;
+    }
+
+    public function setParentColumn(string $name)
     {
-        $this->columnNames['id'] = $idColumn;
-        $this->columnNames['text'] = $textColumn;
-        $this->columnNames['parent'] = $parentColumn;
+        $this->columnNames['parent'] = $name;
 
         return $this;
     }

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