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 | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 85ccbe3..fa34e11 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -124,15 +124,15 @@
// 閲嶇疆鏃堕棿鎻掍欢鏃堕棿婊氬姩鏉�
.ant-calendar-time-picker-select {
- overflow-y: auto;
+ overflow-y: auto!important;
}
.ant-calendar-time-picker-select::-webkit-scrollbar {
- width: 7px;
+ 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::-webkit-scrollbar-track {
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
@@ -441,12 +441,13 @@
color: inherit!important;
}
}
-// .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;
-// }
+.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 {
@@ -468,4 +469,28 @@
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