样式兼容

jqhph · Apr 10, 2020 · 8d7ebc8 · 8d7ebc8
1 parent ad2153c
commit 8d7ebc8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/resources/assets/dcat/sass/components/_button.scss b/resources/assets/dcat/sass/components/_button.scss
@@ -1,24 +1,21 @@
 .btn {
   padding: 0.54rem 1.2rem !important;
-  height: 38px;
+  height: 36px;
   line-height: 1.2;
   border-radius: 0.2rem;
   box-shadow: $btn-shadow;
   cursor: pointer;
 }
-a.btn {
+a.btn, div.btn, span.btn {
   line-height: 1.4;
 }
-div.btn {
-  line-height: 1.5;
-}
 
-div.btn.btn-sm, .btn-group-sm > div.btn {
+div.btn.btn-sm, .btn-group-sm > div.btn, span.btn.btn-sm, .btn-group-sm > span.btn {
   line-height: 1.2;
 }
 
 a.btn-sm, .btn-group-sm > a.btn {
-  line-height: 1.3;
+  line-height: 1.2;
 }
 
 .btn-warning {
@@ -46,13 +43,19 @@ a.btn-sm, .btn-group-sm > a.btn {
   height: 30px;
 }
 
+.btn-default {
+  background: white;
+  border-color: white;
+}
+
 //a.btn-sm, .btn-group-sm > a.btn {
 //  line-height: 1.4;
 //}
 
 // --------------------- btn-custom -----------------------
 .btn-custom {
   @include button-variant($custom, $custom);
+  color: #fff;
 }
 .btn-outline-custom {
   @include button-outline-variant($custom, $custom);

diff --git a/resources/assets/dcat/sass/components/_form.scss b/resources/assets/dcat/sass/components/_form.scss
@@ -3,6 +3,9 @@
   color: $font-color;
   padding: .5rem .7rem;
   font-size: .9rem;
+}
+
+input.form-control, div.form-control {
   max-height: 36px;
   min-height: 36px;
 }
@@ -15,10 +18,13 @@ select.form-control:not([multiple=multiple]) {
   background-image: none;
 }
 
-.input-group-sm > .form-control:not(textarea), .input-group-sm > .custom-select, .form-control-sm {
+.input-group-sm > .form-control, .input-group-sm > .custom-select, .form-control-sm {
+  line-height: 13px;
+}
+
+.input-group-sm > input.form-control, .input-group-sm > div.form-control, div.form-control-sm, input.form-control-sm {
   max-height: 30px;
   min-height: 30px;
-  line-height: 13px;
 }
 
 .input-group .form-control {
@@ -27,7 +33,7 @@ select.form-control:not([multiple=multiple]) {
 
 
 .input-group-text {
-  padding: 0.7rem 0.9rem;
+  padding: 0.6rem 0.9rem;
 }
 
 .help-block {
@@ -127,6 +133,10 @@ select.form-control:not([multiple=multiple]) {
   }
 }
 
+.select2-container .select2-selection--multiple {
+  min-height: 36px!important;
+}
+
 .select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
   min-height: 36px;
   padding: 5px;

diff --git a/resources/assets/dcat/sass/components/_grid-selector.scss b/resources/assets/dcat/sass/components/_grid-selector.scss
@@ -52,15 +52,15 @@
   visibility: visible;
 }
 
-.data-list-view {
+.custom-data-table {
   .grid-selector {
     padding: 2px;
 
     .wrap {
       border-bottom: 0;
       background: $white;
       box-shadow: $shadow;
-      border-radius: .4rem;
+      border-radius: .35rem;
       margin: 7px 0;
     }
   }

diff --git a/resources/assets/dcat/sass/components/_table.scss b/resources/assets/dcat/sass/components/_table.scss
@@ -79,7 +79,7 @@ table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:
 }
 
 table.dataTable.complex-headers {
-  border-color: #eee;
+  border: 1px solid #eee;
 }
 table.dataTable.complex-headers thead th, table.dataTable.complex-headers thead td, table.dataTable.complex-headers tfoot th, table.dataTable.complex-headers tfoot td {
   border-bottom: 1px solid #eee;

diff --git a/resources/dist/dcat/css/dcat-app.css b/resources/dist/dcat/css/dcat-app.css