From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/assets/css/main.scss |   91 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 668699c..fa34e11 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -123,15 +123,18 @@
 }
 
 // 閲嶇疆鏃堕棿鎻掍欢鏃堕棿婊氬姩鏉�
-.ant-calendar-time-picker-select:hover::-webkit-scrollbar {
-  width: 7px;
+.ant-calendar-time-picker-select {
+  overflow-y: auto!important;
 }
-.ant-calendar-time-picker-select:hover::-webkit-scrollbar-thumb {
+.ant-calendar-time-picker-select::-webkit-scrollbar {
+  width: 6px;
+}
+.ant-calendar-time-picker-select::-webkit-scrollbar-thumb {
   border-radius: 5px;
-  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
-  background: rgba(0, 0, 0, 0.13);
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.08);
+  background: rgba(0, 0, 0, 0.08);
 }
-.ant-calendar-time-picker-select:hover::-webkit-scrollbar-track {
+.ant-calendar-time-picker-select::-webkit-scrollbar-track {
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
   border-radius: 3px;
   border: 1px solid rgba(0, 0, 0, 0.07);
@@ -163,7 +166,7 @@
   width: 100%;
   display: inline-block;
   .ant-calendar-picker {
-    width: 100%;
+    width: 100%!important;
   }
 }
 .ant-calendar-picker-container {
@@ -412,12 +415,6 @@
   transition: margin-left 0s cubic-bezier(0.645, 0.045, 0.355, 1)!important;
 }
 
-.ant-progress-status-success .ant-progress-text {
-  color: rgba(0, 0, 0, 0.45)!important;
-}
-.ant-progress-circle.ant-progress-status-success .ant-progress-text {
-  color: rgba(0, 0, 0, 0.65)!important;
-}
 .ant-progress-line.square {
   .ant-progress-inner {
     border-radius: 0;
@@ -435,9 +432,65 @@
 div.ant-input-number {
   width: 100%;
 }
-// .ant-table.ant-table-mini .ant-table-thead > tr > th {
-//   padding: 8px 4px;
-// }
-// .ant-table.ant-table-mini .ant-table-tbody > tr > td {
-//   padding: 4px 4px;
-// }
\ No newline at end of file
+
+.ant-progress {
+  .ant-progress-circle-trail {
+    stroke: inherit!important;
+  }
+  .ant-progress-text {
+    color: inherit!important;
+  }
+}
+.ant-table.ant-table-mini .ant-table-thead > tr > th {
+  padding: 8px 8px!important;
+}
+.ant-table.ant-table-mini .ant-table-tbody > tr > td {
+  padding: 2px 8px!important;
+  line-height: 1.5;
+}
+.mk-date-picker.minute {
+  .ant-calendar-time-picker-combobox {
+    .ant-calendar-time-picker-select {
+      width: 50%;
+    }
+
+    >.ant-calendar-time-picker-select:last-child {
+      display: none;
+    }
+  }
+}
+.mk-date-picker.hour {
+  .ant-calendar-time-picker-combobox {
+    .ant-calendar-time-picker-select {
+      width: 100%;
+    }
+
+    >.ant-calendar-time-picker-select:not(:first-child) {
+      display: none;
+    }
+  }
+}
+.mk-button-progress {
+  position: fixed!important;
+  top: 0px;
+  left: 0px;
+  z-index: 1100;
+  width: 100vw!important;
+  .ant-progress-outer {
+    .ant-progress-inner {
+      vertical-align: top;
+      background-color: transparent;
+      .ant-progress-bg {
+        height: 4px!important;
+        background-color: var(--mk-sys-color);
+      }
+    }
+  }
+}
+
+.video-wrap {
+  overflow: hidden;
+  .video-react .video-react-poster {
+    background-size: cover;
+  }
+}
\ No newline at end of file

--
Gitblit v1.8.0