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 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 8 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 9c1486d..fa34e11 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -38,6 +38,9 @@
html, body {
width: 100%;
font-size: 14px;
+ // .ant-table, .ant-dropdown {
+ // color: rgba(0, 0, 0, 0.85);
+ // }
}
#root {
height: 100%;
@@ -120,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);
@@ -160,7 +166,7 @@
width: 100%;
display: inline-block;
.ant-calendar-picker {
- width: 100%;
+ width: 100%!important;
}
}
.ant-calendar-picker-container {
@@ -346,7 +352,7 @@
}
.mk-popover-control {
white-space: nowrap;
- i {
+ i, span.anticon {
padding: 5px 8px;
cursor: pointer;
font-size: 16px;
@@ -403,4 +409,88 @@
.ant-btn.ant-btn-link {
border-width: 1px;
}
+}
+
+.ant-tabs .ant-tabs-top-content.ant-tabs-content-animated { // 鍘婚櫎鍒囨崲鏃剁殑鍔ㄧ敾鏁堟灉
+ transition: margin-left 0s cubic-bezier(0.645, 0.045, 0.355, 1)!important;
+}
+
+.ant-progress-line.square {
+ .ant-progress-inner {
+ border-radius: 0;
+ .ant-progress-bg {
+ border-radius: 0;
+ }
+ }
+}
+
+.mk-form-tip {
+ color: #c49f47;
+ margin-right: 3px;
+}
+
+div.ant-input-number {
+ width: 100%;
+}
+
+.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