jqh 5 лет назад
Родитель
Сommit
37a1da902a

+ 0 - 3
package.json

@@ -10,7 +10,6 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.19",
         "bootstrap": "^4.1.0",
         "cross-env": "^5.2.1",
         "jquery": "^3.2",
@@ -20,8 +19,6 @@
         "resolve-url-loader": "^2.3.1",
         "sass": "^1.22.12",
         "sass-loader": "^7.3.1",
-        "vue": "^2.5.17",
-        "vue-template-compiler": "^2.6.10",
         "webpack-cli": "^3.3.5",
         "rtlcss": "^2.4.0"
     }

+ 1 - 1
resources/assets/dcat/extra/markdown.scss

@@ -65,7 +65,7 @@ pre.prettyprint.linenums ol.linenums li {
   color: #BEBEC5 !important;
   line-height: 18px !important;
   padding-left: 12px !important;
-  background: #F8F8F8!important;
+  background: #f7f7f9!important;
 }
 
 pre.prettyprint.linenums ol.linenums li.L0, pre.prettyprint.linenums ol.linenums li.L1, pre.prettyprint.linenums ol.linenums li.L2, pre.prettyprint.linenums ol.linenums li.L3, pre.prettyprint.linenums ol.linenums li.L4, pre.prettyprint.linenums ol.linenums li.L5, pre.prettyprint.linenums ol.linenums li.L6, pre.prettyprint.linenums ol.linenums li.L7, pre.prettyprint.linenums ol.linenums li.L8, pre.prettyprint.linenums ol.linenums li.L9 {

+ 4 - 4
resources/assets/dcat/js/bootstrappers/DataActions.js

@@ -27,9 +27,9 @@ let defaultActions = {
                         Dcat.NP.done();
                         if (data.status) {
                             Dcat.reload(redirect);
-                            Dcat.swal.success(data.message);
+                            Dcat.swal.success(data.message, url);
                         } else {
-                            Dcat.swal.error(data.message);
+                            Dcat.swal.error(data.message, url);
                         }
                     }
                 });
@@ -60,9 +60,9 @@ let defaultActions = {
                         Dcat.NP.done();
                         if (data.status) {
                             Dcat.reload();
-                            Dcat.swal.success(data.message);
+                            Dcat.swal.success(data.message, keys.join(', '));
                         } else {
-                            Dcat.swal.error(data.message);
+                            Dcat.swal.error(data.message, keys.join(', '));
                         }
                     }
                 });

+ 12 - 0
resources/assets/dcat/sass/components/_alert.scss

@@ -0,0 +1,12 @@
+.alert {
+  padding: 0.85rem;
+
+  h4 {
+    color: inherit;
+  }
+
+}
+
+.alert-light {
+  color: #666!important;
+}

+ 4 - 3
resources/assets/dcat/sass/components/_dropdown.scss

@@ -1,7 +1,8 @@
 .dropdown {
   .dropdown-menu {
-    box-shadow: $shadow;
-    border: 1px solid rgba(0, 0, 0, 0.03);
+    box-shadow: $shadow-100;
+    border: 0;
+    min-width: 10rem;
 
     .dropdown-item:hover {
       background-color: $dark30;
@@ -23,7 +24,7 @@
   color: #333;
 }
 .dropdown-item a, .dropdown-menu label {
-  font-size: 1rem;
+  font-size: 1.03rem;
   color: #333;
 }
 .dropdown-item a {

+ 2 - 0
resources/assets/dcat/sass/dcat-app.scss

@@ -69,6 +69,8 @@ ol, ul, dl {
 @import "./components/tab";
 // menu
 @import "./components/menu";
+// alert
+@import "./components/alert";
 
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
    font-size: 1.3rem;

+ 0 - 2
resources/assets/sass/colors.scss

@@ -11,8 +11,6 @@
 // Core
 // ------------------------------
 
-$primary-color-var: 'cyan';
-
 // Import variables and mixins
 @import "bootstrap/mixins/gradients";
 @import "core/mixins/hex2rgb";

+ 0 - 25
resources/assets/sass/indigo-colors.scss

@@ -1,25 +0,0 @@
-// ================================================================================================
-//  File Name: colors.scss
-//  Description: Common color file to include color paletter and colors file, its qiore good to
-//  have all color classes in a separate file as it's quite heavy.
-//  ----------------------------------------------------------------------------------------------
-//  Item name: Vuexy  - Vuejs, HTML & Laravel Admin Dashboard Template
-//  Author: PIXINVENT
-//  Author URL: http://www.themeforest.net/user/pixinvent
-// ================================================================================================
-
-// Core
-// ------------------------------
-
-$primary-color-var: 'indigo';
-
-// Import variables and mixins
-@import "bootstrap/mixins/gradients";
-@import "core/mixins/hex2rgb";
-
-//box shadow for alert's heading
-@import "core/mixins/alert";
-
-// Color system, always load last
-// ------------------------------
-@import "core/colors/palette";

+ 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.01s;
-          animation-delay: 0.01s;
-  -webkit-animation-duration: 0.83s;
-          animation-duration: 0.83s;
+  -webkit-animation-delay: 0.02s;
+          animation-delay: 0.02s;
+  -webkit-animation-duration: 1.03s;
+          animation-duration: 1.03s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: -0.04s;
-          animation-delay: -0.04s;
-  -webkit-animation-duration: 1.19s;
-          animation-duration: 1.19s;
+  -webkit-animation-delay: 0.51s;
+          animation-delay: 0.51s;
+  -webkit-animation-duration: 1.15s;
+          animation-duration: 1.15s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.35s;
-          animation-delay: 0.35s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-delay: 0.58s;
+          animation-delay: 0.58s;
+  -webkit-animation-duration: 1.57s;
+          animation-duration: 1.57s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.51s;
-          animation-delay: 0.51s;
-  -webkit-animation-duration: 1.37s;
-          animation-duration: 1.37s;
+  -webkit-animation-delay: 0.41s;
+          animation-delay: 0.41s;
+  -webkit-animation-duration: 0.95s;
+          animation-duration: 0.95s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.2s;
-          animation-delay: 0.2s;
-  -webkit-animation-duration: 0.96s;
-          animation-duration: 0.96s;
+  -webkit-animation-delay: 0.19s;
+          animation-delay: 0.19s;
+  -webkit-animation-duration: 1.02s;
+          animation-duration: 1.02s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: 0.52s;
-          animation-delay: 0.52s;
-  -webkit-animation-duration: 1.6s;
-          animation-duration: 1.6s;
+  -webkit-animation-delay: -0.01s;
+          animation-delay: -0.01s;
+  -webkit-animation-duration: 1.42s;
+          animation-duration: 1.42s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.46s;
-          animation-delay: 0.46s;
-  -webkit-animation-duration: 1.2s;
-          animation-duration: 1.2s;
+  -webkit-animation-delay: 0.27s;
+          animation-delay: 0.27s;
+  -webkit-animation-duration: 1.21s;
+          animation-duration: 1.21s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.22s;
-          animation-delay: 0.22s;
-  -webkit-animation-duration: 0.82s;
-          animation-duration: 0.82s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 1.31s;
+          animation-duration: 1.31s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.25s;
-          animation-delay: 0.25s;
-  -webkit-animation-duration: 0.91s;
-          animation-duration: 0.91s;
+  -webkit-animation-delay: -0.11s;
+          animation-delay: -0.11s;
+  -webkit-animation-duration: 1.5s;
+          animation-duration: 1.5s;
 }
 
 .ball-grid-beat > div {

+ 34 - 34
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.43s;
-          animation-delay: 0.43s;
-  -webkit-animation-duration: 1.2s;
-          animation-duration: 1.2s;
+  -webkit-animation-delay: 0.45s;
+          animation-delay: 0.45s;
+  -webkit-animation-duration: 1.04s;
+          animation-duration: 1.04s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0s;
-          animation-delay: 0s;
+  -webkit-animation-delay: 0.13s;
+          animation-delay: 0.13s;
   -webkit-animation-duration: 0.82s;
           animation-duration: 0.82s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.75s;
-          animation-delay: 0.75s;
-  -webkit-animation-duration: 1.23s;
-          animation-duration: 1.23s;
+  -webkit-animation-delay: -0.17s;
+          animation-delay: -0.17s;
+  -webkit-animation-duration: 1.13s;
+          animation-duration: 1.13s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.23s;
-          animation-delay: 0.23s;
-  -webkit-animation-duration: 1.11s;
-          animation-duration: 1.11s;
+  -webkit-animation-delay: 0.61s;
+          animation-delay: 0.61s;
+  -webkit-animation-duration: 0.82s;
+          animation-duration: 0.82s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: -0.06s;
-          animation-delay: -0.06s;
-  -webkit-animation-duration: 1.16s;
-          animation-duration: 1.16s;
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-duration: 1.55s;
+          animation-duration: 1.55s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.49s;
-          animation-delay: 0.49s;
-  -webkit-animation-duration: 0.9s;
-          animation-duration: 0.9s;
+  -webkit-animation-delay: 0.69s;
+          animation-delay: 0.69s;
+  -webkit-animation-duration: 1.16s;
+          animation-duration: 1.16s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0s;
-          animation-delay: 0s;
-  -webkit-animation-duration: 1.35s;
-          animation-duration: 1.35s;
+  -webkit-animation-delay: 0.23s;
+          animation-delay: 0.23s;
+  -webkit-animation-duration: 1.24s;
+          animation-duration: 1.24s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.21s;
-          animation-delay: 0.21s;
-  -webkit-animation-duration: 1.03s;
-          animation-duration: 1.03s;
+  -webkit-animation-delay: -0.01s;
+          animation-delay: -0.01s;
+  -webkit-animation-duration: 1.48s;
+          animation-duration: 1.48s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: 0.79s;
-          animation-delay: 0.79s;
-  -webkit-animation-duration: 1.32s;
-          animation-duration: 1.32s;
+  -webkit-animation-delay: 0.38s;
+          animation-delay: 0.38s;
+  -webkit-animation-duration: 1.44s;
+          animation-duration: 1.44s;
 }
 
 .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.77s;
-          animation-delay: 0.77s;
-  -webkit-animation-duration: 0.47s;
-          animation-duration: 0.47s;
+  -webkit-animation-delay: 0.63s;
+          animation-delay: 0.63s;
+  -webkit-animation-duration: 0.8s;
+          animation-duration: 0.8s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.11s;
-          animation-delay: 0.11s;
-  -webkit-animation-duration: 0.7s;
-          animation-duration: 0.7s;
+  -webkit-animation-delay: -0.11s;
+          animation-delay: -0.11s;
+  -webkit-animation-duration: 0.73s;
+          animation-duration: 0.73s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.55s;
-          animation-delay: 0.55s;
-  -webkit-animation-duration: 1.3s;
-          animation-duration: 1.3s;
+  -webkit-animation-delay: 0.16s;
+          animation-delay: 0.16s;
+  -webkit-animation-duration: 0.4s;
+          animation-duration: 0.4s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0.55s;
-          animation-delay: 0.55s;
-  -webkit-animation-duration: 0.86s;
-          animation-duration: 0.86s;
+  -webkit-animation-delay: 0.1s;
+          animation-delay: 0.1s;
+  -webkit-animation-duration: 1.06s;
+          animation-duration: 1.06s;
 }
 
 .line-scale-party > div {

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

@@ -1454,66 +1454,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: 0.8s;
-          animation-delay: 0.8s;
-  -webkit-animation-duration: 0.88s;
-          animation-duration: 0.88s;
+  -webkit-animation-delay: 0.44s;
+          animation-delay: 0.44s;
+  -webkit-animation-duration: 1.24s;
+          animation-duration: 1.24s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: 0s;
-          animation-delay: 0s;
-  -webkit-animation-duration: 1.5s;
-          animation-duration: 1.5s;
+  -webkit-animation-delay: 0.62s;
+          animation-delay: 0.62s;
+  -webkit-animation-duration: 1.28s;
+          animation-duration: 1.28s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: -0.02s;
-          animation-delay: -0.02s;
-  -webkit-animation-duration: 1.2s;
-          animation-duration: 1.2s;
+  -webkit-animation-delay: 0.32s;
+          animation-delay: 0.32s;
+  -webkit-animation-duration: 1.37s;
+          animation-duration: 1.37s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.67s;
-          animation-delay: 0.67s;
-  -webkit-animation-duration: 0.67s;
-          animation-duration: 0.67s;
+  -webkit-animation-delay: -0.06s;
+          animation-delay: -0.06s;
+  -webkit-animation-duration: 0.7s;
+          animation-duration: 0.7s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.7s;
-          animation-delay: 0.7s;
-  -webkit-animation-duration: 0.88s;
-          animation-duration: 0.88s;
+  -webkit-animation-delay: 0.11s;
+          animation-delay: 0.11s;
+  -webkit-animation-duration: 0.67s;
+          animation-duration: 0.67s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: -0.06s;
-          animation-delay: -0.06s;
-  -webkit-animation-duration: 1.34s;
-          animation-duration: 1.34s;
+  -webkit-animation-delay: 0.44s;
+          animation-delay: 0.44s;
+  -webkit-animation-duration: 0.9s;
+          animation-duration: 0.9s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.3s;
-          animation-delay: 0.3s;
-  -webkit-animation-duration: 1.41s;
-          animation-duration: 1.41s;
+  -webkit-animation-delay: 0.66s;
+          animation-delay: 0.66s;
+  -webkit-animation-duration: 1.44s;
+          animation-duration: 1.44s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: -0.02s;
-          animation-delay: -0.02s;
-  -webkit-animation-duration: 1.05s;
-          animation-duration: 1.05s;
+  -webkit-animation-delay: 0.16s;
+          animation-delay: 0.16s;
+  -webkit-animation-duration: 0.61s;
+          animation-duration: 0.61s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.24s;
-          animation-delay: 0.24s;
-  -webkit-animation-duration: 1.24s;
-          animation-duration: 1.24s;
+  -webkit-animation-delay: 0.05s;
+          animation-delay: 0.05s;
+  -webkit-animation-duration: 1.13s;
+          animation-duration: 1.13s;
 }
 
 .ball-grid-beat > div {
@@ -1575,66 +1575,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: -0.1s;
-          animation-delay: -0.1s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-delay: 0.25s;
+          animation-delay: 0.25s;
+  -webkit-animation-duration: 1.26s;
+          animation-duration: 1.26s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.21s;
-          animation-delay: 0.21s;
-  -webkit-animation-duration: 1.54s;
-          animation-duration: 1.54s;
+  -webkit-animation-delay: -0.1s;
+          animation-delay: -0.1s;
+  -webkit-animation-duration: 1.4s;
+          animation-duration: 1.4s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.19s;
-          animation-delay: 0.19s;
-  -webkit-animation-duration: 0.76s;
-          animation-duration: 0.76s;
+  -webkit-animation-delay: 0.17s;
+          animation-delay: 0.17s;
+  -webkit-animation-duration: 1.2s;
+          animation-duration: 1.2s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: -0.1s;
-          animation-delay: -0.1s;
-  -webkit-animation-duration: 1.27s;
-          animation-duration: 1.27s;
+  -webkit-animation-delay: 0.42s;
+          animation-delay: 0.42s;
+  -webkit-animation-duration: 0.69s;
+          animation-duration: 0.69s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.58s;
-          animation-delay: 0.58s;
-  -webkit-animation-duration: 1.46s;
-          animation-duration: 1.46s;
+  -webkit-animation-delay: 0.22s;
+          animation-delay: 0.22s;
+  -webkit-animation-duration: 1.52s;
+          animation-duration: 1.52s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.12s;
-          animation-delay: 0.12s;
-  -webkit-animation-duration: 1.43s;
-          animation-duration: 1.43s;
+  -webkit-animation-delay: -0.13s;
+          animation-delay: -0.13s;
+  -webkit-animation-duration: 1.01s;
+          animation-duration: 1.01s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0.53s;
-          animation-delay: 0.53s;
-  -webkit-animation-duration: 1.5s;
-          animation-duration: 1.5s;
+  -webkit-animation-delay: 0.62s;
+          animation-delay: 0.62s;
+  -webkit-animation-duration: 0.75s;
+          animation-duration: 0.75s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.27s;
-          animation-delay: 0.27s;
-  -webkit-animation-duration: 1.09s;
-          animation-duration: 1.09s;
+  -webkit-animation-delay: 0.64s;
+          animation-delay: 0.64s;
+  -webkit-animation-duration: 1.05s;
+          animation-duration: 1.05s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: -0.06s;
-          animation-delay: -0.06s;
-  -webkit-animation-duration: 0.67s;
-          animation-duration: 0.67s;
+  -webkit-animation-delay: 0.19s;
+          animation-delay: 0.19s;
+  -webkit-animation-duration: 0.73s;
+          animation-duration: 0.73s;
 }
 
 .ball-grid-pulse > div {
@@ -2181,31 +2181,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: -0.16s;
-          animation-delay: -0.16s;
-  -webkit-animation-duration: 0.68s;
-          animation-duration: 0.68s;
+  -webkit-animation-delay: 0.73s;
+          animation-delay: 0.73s;
+  -webkit-animation-duration: 0.63s;
+          animation-duration: 0.63s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: -0.06s;
-          animation-delay: -0.06s;
-  -webkit-animation-duration: 0.88s;
-          animation-duration: 0.88s;
+  -webkit-animation-delay: 0.73s;
+          animation-delay: 0.73s;
+  -webkit-animation-duration: 1.05s;
+          animation-duration: 1.05s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.2s;
-          animation-delay: 0.2s;
-  -webkit-animation-duration: 0.79s;
-          animation-duration: 0.79s;
+  -webkit-animation-delay: 0.13s;
+          animation-delay: 0.13s;
+  -webkit-animation-duration: 0.7s;
+          animation-duration: 0.7s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: -0.09s;
-          animation-delay: -0.09s;
-  -webkit-animation-duration: 1.17s;
-          animation-duration: 1.17s;
+  -webkit-animation-delay: 0.7s;
+          animation-delay: 0.7s;
+  -webkit-animation-duration: 1.06s;
+          animation-duration: 1.06s;
 }
 
 .line-scale-party > div {

+ 16 - 3
resources/dist/dcat/css/dcat-app.css

@@ -2233,8 +2233,9 @@ table.dataTable.complex-headers tfoot td {
 }
 
 .dropdown .dropdown-menu {
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
-  border: 1px solid rgba(0, 0, 0, 0.03);
+  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: 0;
+  min-width: 10rem;
 }
 
 .dropdown .dropdown-menu .dropdown-item:hover {
@@ -2261,7 +2262,7 @@ table.dataTable.complex-headers tfoot td {
 
 .dropdown-item a,
 .dropdown-menu label {
-  font-size: 1rem;
+  font-size: 1.03rem;
   color: #333;
 }
 
@@ -2776,6 +2777,18 @@ body.vertical-layout.vertical-menu-modern.menu-collapsed .main-menu:not(.expande
   display: inline-block;
 }
 
+.alert {
+  padding: 0.85rem;
+}
+
+.alert h4 {
+  color: inherit;
+}
+
+.alert-light {
+  color: #666 !important;
+}
+
 body.vertical-layout.vertical-menu-modern.menu-expanded .main-menu .navigation > li > a > i:before {
   font-size: 1.3rem;
 }

+ 1 - 1
resources/dist/dcat/extra/markdown.css

@@ -70,7 +70,7 @@ pre.prettyprint.linenums ol.linenums li {
   color: #BEBEC5 !important;
   line-height: 18px !important;
   padding-left: 12px !important;
-  background: #F8F8F8 !important;
+  background: #f7f7f9 !important;
 }
 
 pre.prettyprint.linenums ol.linenums li.L0,

+ 4 - 4
resources/dist/dcat/js/dcat-app.js

@@ -404,9 +404,9 @@ var defaultActions = {
 
             if (data.status) {
               Dcat.reload(redirect);
-              Dcat.swal.success(data.message);
+              Dcat.swal.success(data.message, url);
             } else {
-              Dcat.swal.error(data.message);
+              Dcat.swal.error(data.message, url);
             }
           }
         });
@@ -439,9 +439,9 @@ var defaultActions = {
 
             if (data.status) {
               Dcat.reload();
-              Dcat.swal.success(data.message);
+              Dcat.swal.success(data.message, keys.join(', '));
             } else {
-              Dcat.swal.error(data.message);
+              Dcat.swal.error(data.message, keys.join(', '));
             }
           }
         });

+ 1 - 1
resources/views/grid/dropdown-actions.blade.php

@@ -2,7 +2,7 @@
     <a href="#" style="padding:0 10px;" data-toggle="dropdown">
         <i class="feather icon-more-vertical"></i>
     </a>
-    <ul class="dropdown-menu" style="min-width:120px !important;left: -65px;">
+    <ul class="dropdown-menu" style="left: -65px;">
 
         @foreach($default as $action)
             <li class="dropdown-item">{!! \Dcat\Admin\Support\Helper::render($action) !!}</li>

+ 0 - 18
resources/views/widgets/accordion.blade.php

@@ -1,18 +0,0 @@
-<div {!! $attributes !!}>
-    @foreach($items as $k => $item)
-        <div class="panel {{$panelStyle}} no-shadow">
-            <div class="panel-heading " >
-                <h4 class="panel-title">
-                    <a data-parent="#{!! $id !!}" data-toggle="collapse" href="#{!! $item['id'] !!}" class=" {!! $item['expand'] ? '' : 'collapsed' !!}">
-                        {!! $item['title'] !!}
-                    </a>
-                </h4>
-            </div>
-            <div id="{{$item['id']}}" class="panel-collapse collapse {!! $item['expand'] ? 'in' : '' !!}"   >
-                <div class="panel-body">
-                    {!! $item['content'] !!}
-                </div>
-            </div>
-        </div>
-    @endforeach
-</div>

+ 1 - 1
resources/views/widgets/alert.blade.php

@@ -3,7 +3,7 @@
     <button type="button" class="close" data-dismiss="alert">×</button>
     @endif
     @if($title)
-    <h4>@if($icon)<i class="icon fa fa-{{ $icon }}"></i>@endif {!! $title !!}</h4>
+    <h4>@if($icon)<i class="{{ $icon }}"></i>@endif {!! $title !!}</h4>
     @endif
     {!! $content !!}
 </div>

+ 0 - 80
src/Widgets/Accordion.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace Dcat\Admin\Widgets;
-
-use Illuminate\Support\Str;
-
-class Accordion extends Widget
-{
-    /**
-     * @var string
-     */
-    protected $view = 'admin::widgets.accordion';
-
-    /**
-     * @var array
-     */
-    protected $items = [];
-
-    /**
-     * @var string
-     */
-    protected $panelStyle = 'panel-default';
-
-    /**
-     * Collapse constructor.
-     */
-    public function __construct()
-    {
-        $this->class('panel-group');
-        $this->id('accordion-'.Str::random(8));
-    }
-
-    /**
-     * @return $this
-     */
-    public function white()
-    {
-        return $this->panelStyle('white');
-    }
-
-    /**
-     * @return $this
-     */
-    public function panelStyle(string $style)
-    {
-        $this->panelStyle = 'panel-'.$style;
-
-        return $this;
-    }
-
-    /**
-     * Add item.
-     *
-     * @param string $title
-     * @param string $content
-     *
-     * @return $this
-     */
-    public function add($title, $content, bool $expand = false)
-    {
-        $this->items[] = [
-            'id'      => 'accordion-'.Str::random(12),
-            'title'   => $title,
-            'content' => $this->toString($content),
-            'expand'  => $expand,
-        ];
-
-        return $this;
-    }
-
-    public function variables()
-    {
-        return [
-            'id'         => $this->getHtmlAttribute('id'),
-            'items'      => $this->items,
-            'panelStyle' => $this->panelStyle,
-            'attributes' => $this->formatHtmlAttributes(),
-        ];
-    }
-}

+ 24 - 4
src/Widgets/Alert.php

@@ -14,22 +14,22 @@ class Alert extends Widget
     /**
      * @var string|\Symfony\Component\Translation\TranslatorInterface
      */
-    protected $title = '';
+    protected $title;
 
     /**
      * @var string
      */
-    protected $content = '';
+    protected $content;
 
     /**
      * @var string
      */
-    protected $style = 'danger';
+    protected $style = 'light';
 
     /**
      * @var string
      */
-    protected $icon = 'ban';
+    protected $icon;
 
     /**
      * @var bool
@@ -110,6 +110,26 @@ class Alert extends Widget
         return $this->style('warning')->icon('fa fa-warning');
     }
 
+    /**
+     * Set warning style.
+     *
+     * @return $this
+     */
+    public function danger()
+    {
+        return $this->style('danger')->icon('fa fa-ban');
+    }
+
+    /**
+     * Set light style.
+     *
+     * @return $this
+     */
+    public function light()
+    {
+        return $this->style('light');
+    }
+
     /**
      * Disable close button.
      *