样式优化

resources/assets/dcat/js/bootstrappers/Pjax.js

@@ -36,14 +36,14 @@ export default class Pjax {
 
         $d.on('pjax:send', function (xhr) {
             if (xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
-                $(formContainer + ' :submit').buttonLoading();
+                $(formContainer).find('[type="submit"],.submit').buttonLoading();
             }
             Dcat.NP.start();
         });
 
         $d.on('pjax:complete', function (xhr) {
             if (xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
-                $(formContainer + ' :submit').buttonLoading(false)
+                $(formContainer).find('[type="submit"],.submit').buttonLoading(false)
             }
         });
 

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

@@ -1,10 +1,57 @@
 .alert {
-  padding: 0.85rem;
+  font-weight: 500;
+  border: none;
+  padding: 0.85rem 1.2rem;
+  border-radius: .25rem;
 
+  // close
   h4 {
     color: inherit;
   }
 
+  .close:focus{
+    outline: 0;
+  }
+
+  // For Alert Content
+  p {
+    font-weight: 500;
+    padding: 2px 0;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+
+  span{
+    vertical-align: middle;
+  }
+
+  // For alert heading
+  .alert-heading {
+    font-weight: 700;
+    font-size: 0.9rem;
+    padding: 0;
+    padding-bottom: 8px;
+  }
+
+  // For dark alert
+
+  &.alert-dark {
+    .alert-heading {
+      box-shadow: rgba($dark, 0.4) 0px 6px 15px -7px;
+    }
+  }
+
+  // For light alert
+
+  &.alert-light {
+    .alert-heading {
+      box-shadow: rgba($light, 0.4) 0px 6px 15px -7px;
+    }
+  }
+}
+
+.alert-warning {
+  color: $white
 }
 
 .alert-light {

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

@@ -1,6 +1,6 @@
 .box {
   position: relative;
-  border-radius: .5rem;
+  border-radius: .25rem;
   background: #ffffff;
   margin-bottom: 10px;
   width: 100%;

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

@@ -7,6 +7,13 @@
   cursor: pointer;
 }
 a.btn {
+  line-height: 1.4;
+}
+div.btn {
+  line-height: 1.5;
+}
+
+a.btn-sm, .btn-group-sm > a.btn {
   line-height: 1.3;
 }
 

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

@@ -1,6 +1,7 @@
 .card {
   box-shadow: $shadow;
   margin-bottom: 2rem;
+  border-radius: .25rem;
 }
 
 .card.dcat-box {

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

@@ -12,7 +12,7 @@
 
 .custom-data-table-header .table-responsive .top .action-btns .actions-dropodown {
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .14);
-  border-radius: .5rem;
+  border-radius:.4rem;
   margin-right: .75rem
 }
 
@@ -257,7 +257,7 @@ table.custom-data-table.dataTable tbody tr, table.data-thumb-view.dataTable tbod
   box-shadow: $shadow;
   cursor: pointer;
   transition: all .3s ease;
-  border-radius: .5rem
+  border-radius:.4rem
 }
 
 table.custom-data-table.dataTable tbody tr:hover, table.data-thumb-view.dataTable tbody tr:hover {
@@ -269,13 +269,13 @@ table.custom-data-table.dataTable tbody tr:hover, table.data-thumb-view.dataTabl
 
 table.custom-data-table.dataTable tbody tr td:first-child, table.data-thumb-view.dataTable tbody tr td:first-child {
   padding-left: 1rem;
-  border-top-left-radius: .5rem;
-  border-bottom-left-radius: .5rem
+  border-top-left-radius:.4rem;
+  border-bottom-left-radius:.4rem
 }
 
 table.custom-data-table.dataTable tbody tr td:last-child, table.data-thumb-view.dataTable tbody tr td:last-child {
-  border-top-right-radius: .5rem;
-  border-bottom-right-radius: .5rem
+  border-top-right-radius:.4rem;
+  border-bottom-right-radius:.4rem
 }
 
 table.custom-data-table.dataTable tbody tr.selected td, table.data-thumb-view.dataTable tbody tr.selected td {

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

@@ -3,6 +3,8 @@
   color: $font-color;
   padding: .5rem .7rem;
   font-size: .9rem;
+  max-height: 36px;
+  min-height: 36px;
 }
 
 .form-control-sm {
@@ -14,10 +16,15 @@ select.form-control:not([multiple=multiple]) {
 }
 
 .input-group-sm > .form-control:not(textarea), .input-group-sm > .custom-select, .form-control-sm {
-  height: 30px;
+  max-height: 30px;
+  min-height: 30px;
   line-height: 13px;
 }
 
+.input-group .form-control {
+  height: 100%;
+}
+
 
 .input-group-text {
   padding: 0.7rem 0.9rem;
@@ -121,7 +128,7 @@ select.form-control:not([multiple=multiple]) {
 }
 
 .select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
-  min-height: 35px;
+  min-height: 36px;
   padding: 5px;
   border: 1px solid rgba(0,0,0,.2);
 }

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

@@ -4,8 +4,8 @@
 
 .nav.nav-tabs .nav-item .nav-link {
   font-size: 1rem;
-  padding: 17px;
-  text-transform: uppercase;
+  padding: 17px 14px;
+  text-transform: capitalize;
   letter-spacing: 0.045rem;
 }
 
@@ -30,6 +30,27 @@
   }
 }
 
+.nav-tabs .nav-item {
+  margin-bottom: 0;
+}
+.nav.nav-tabs {
+  border-bottom: 1px solid #eee;
+}
+
+.nav-vertical {
+  .nav.nav-tabs {
+    border-bottom: 0;
+  }
+
+  .nav-tabs.flex-column {
+    border-right: 0;
+
+    > li {
+      border-bottom: 0;
+    }
+  }
+}
+
 .nav-theme-primary, .nav-theme-success, .nav-theme-info, .nav-theme-danger {
   .nav.nav-tabs {
     background: $primary;

resources/assets/sass/bootstrap-extended.scss

@@ -11,15 +11,12 @@
 @import "bootstrap/variables";
 @import "variables/variables";
 
-// // Core CSS
+// Components
 @import "bootstrap-extended/code";
 @import "bootstrap-extended/forms";
 @import "bootstrap-extended/buttons";
-
-// // Components
 @import "bootstrap-extended/dropdown";
 @import "bootstrap-extended/navbar";
 @import "bootstrap-extended/nav";
-@import "bootstrap-extended/alert";
 @import "bootstrap-extended/toast";
 @import 'bootstrap-extended/pagination';

resources/assets/sass/bootstrap-extended/_alert.scss

@@ -1,48 +0,0 @@
-// Alerts
-
-.alert {
-  font-weight: 500;
-  border: none;
-
-  // close
-
-  .close:focus{
-    outline: 0;
-  }
-
-  // For Alert Content
-  p {
-    font-weight: 500;
-    padding: 2px 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-
-  span{
-    vertical-align: middle;
-  }
-
-  // For alert heading
-  .alert-heading {
-    font-weight: 700;
-    font-size: 0.9rem;
-    padding: 0;
-    padding-bottom: 8px;
-  }
-
-  // For dark alert
-
-  &.alert-dark {
-    .alert-heading {
-      box-shadow: rgba($dark, 0.4) 0px 6px 15px -7px;
-    }
-  }
-
-  // For light alert
-
-  &.alert-light {
-    .alert-heading {
-      box-shadow: rgba($light, 0.4) 0px 6px 15px -7px;
-    }
-  }
-}

resources/views/helpers/scaffold.blade.php

@@ -21,7 +21,7 @@
     /*    text-transform:uppercase;*/
     /*}*/
     .select2-container .select2-selection--single {
-        height: 34px !important;
+        height: 30px !important;
     }
     /*#inputTableName {*/
     /*    width:300px;*/