Browse Source

修复时间日期插件时间选择器显示异常问题;优化select2以及popover插件

jqh 5 years ago
parent
commit
c8d15cc072

+ 10 - 0
resources/assets/dcat/sass/components/_datetime-picker.scss

@@ -0,0 +1,10 @@
+.bootstrap-datetimepicker-widget table td span, .bootstrap-datetimepicker-widget table td i {
+  height: 0!important;
+  line-height: 0!important;
+}
+
+.bootstrap-datetimepicker-widget table td.active, .bootstrap-datetimepicker-widget table td.active:hover {
+  background-color: $light!important;
+  color: $primary-darker!important;
+  font-weight: bold;
+}

+ 43 - 26
resources/assets/dcat/sass/components/_form.scss

@@ -98,34 +98,15 @@ select.form-control:not([multiple=multiple]) {
 
 
 // --------------------- select2 ---------------------
-.input-group-sm {
-  .select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
-    min-height: 31px;
-    padding: 1px 2px;
-    font-size: 0.7rem;
-  }
-
-  .select2-container--default .select2-selection--multiple {
-    min-height: 30px !important;
-    padding: 0 2px;
-    font-size: 0.7rem;
-    line-height: 14px;
-  }
-
-  .select2-container--default .select2-selection--single .select2-selection__arrow {
-    top: -3px;
-  }
-
-  .select2-container--classic .select2-selection--multiple .select2-selection__rendered li .select2-search__field, .select2-container--default .select2-selection--multiple .select2-selection__rendered li .select2-search__field {
-    margin-top: 6px;
-  }
-}
-
 .select2-container--default .select2-selection--single,
 .select2-container--default .select2-selection--multiple {
   border-color: $input-border-color!important;
 }
 
+.select2-container--classic .select2-selection--multiple .select2-selection__rendered li .select2-search__field, .select2-container--default .select2-selection--multiple .select2-selection__rendered li .select2-search__field {
+  margin-top: 8px;
+}
+
 .input-group {
   .select2-container {
     width: 50%!important;
@@ -150,15 +131,51 @@ select.form-control:not([multiple=multiple]) {
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   padding: 2px 5px!important;
   border: 0!important;
+  font-size: 90%;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__rendered {
+  padding: 2px .7rem!important;
 }
-// --------------------- select2 ---------------------
-
 
 .select2-selection .default-text {
   display: inline-block;
-  padding: 6px;
+  padding: .5rem .7rem 0;
+}
+
+.input-group-sm {
+  .select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
+    min-height: 31px;
+    padding: 1px 2px;
+    font-size: 0.7rem;
+  }
+
+  .select2-selection .default-text {
+    padding: .3rem .5rem 0;
+  }
+
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    padding: 0 0.4rem !important;
+  }
+
+  .select2-container--default .select2-selection--multiple {
+    min-height: 30px !important;
+    padding: 0 2px;
+    font-size: 0.7rem;
+    line-height: 14px;
+  }
+
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    top: -3px;
+  }
+
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered li .select2-search__field, .select2-container--default .select2-selection--multiple .select2-selection__rendered li .select2-search__field {
+    margin-top: 6px;
+  }
 }
 
+// --------------------- select2 ---------------------
+
+
 // listbox图标
 .glyphicon-arrow-right:before {
   font-family: feather;

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

@@ -7,4 +7,16 @@
 
 .bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^=right] > .arrow::before {
   border-right-color: #eee;
+}
+
+.popover.bs-popover-bottom .arrow:after {
+  border-bottom-color: #fff;
+}
+
+.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^=bottom] > .arrow::before {
+  border-bottom-color: #eee;
+}
+
+.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^=top] > .arrow::before {
+  border-top-color: #eee;
 }

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

@@ -100,3 +100,5 @@ ol, ul, dl {
 @import "./components/img";
 // popover
 @import "./components/popover";
+// datetime picker
+@import "./components/datetime-picker";

File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


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