Merge pull request #139 from DTStack/beta-2.0.0-zhaoge

Beta 2.0.0 zhaoge
DTStack · Aug 4, 2022 · 156fa21 · 156fa21
2 parents d4932c4 + ef62f4a
commit 156fa21
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/theme/dt-theme/default/button.less b/theme/dt-theme/default/button.less
@@ -167,6 +167,11 @@
         color: @primaryColor;
         border-color: @primaryColor;
     }
+    &.ant-btn.ant-btn-icon-only{
+        .anticon-search{
+            margin-left: 0;
+        }
+    }
     &.ant-btn:hover, &.ant-btn:focus {
         color: @primaryColor;
         border-color: @primaryColor;

diff --git a/theme/dt-theme/default/collapse.less b/theme/dt-theme/default/collapse.less
@@ -32,8 +32,8 @@
             .ant-collapse-content-box{
                 padding: 0 0 0 16px;
                 min-height: 40px;
-                display: flex;
-                align-items: center;
+                display: table;
+                width: 100%;
                 p {
                     padding: 10px 16px 10px 0;
                     margin: 0;

diff --git a/theme/dt-theme/default/datepicker.less b/theme/dt-theme/default/datepicker.less
@@ -135,4 +135,16 @@
             display: flex;
         }
     }
+    .ant-picker-week-panel-row-selected .ant-picker-cell-in-view:not(last), .ant-picker-week-panel-row-selected:hover .ant-picker-cell-in-view{
+        background: #E8F1FF;
+        .ant-picker-cell-inner{
+            color: @black_title;
+        }
+        &:last-child{
+            background: @primaryColor;
+            .ant-picker-cell-inner{
+                color: @white;
+            }
+        }
+    }
 }
diff --git a/theme/dt-theme/default/input.less b/theme/dt-theme/default/input.less
@@ -44,5 +44,5 @@
     }
 }
 .ant-input-search > .ant-input-group > .ant-input-group-addon:last-child .ant-input-search-button:not(.ant-btn-primary){
-    border-left: solid 1px #D8DAE1;
-}
+    border: solid 1px #D8DAE1;
+}
diff --git a/theme/dt-theme/default/upload.less b/theme/dt-theme/default/upload.less
@@ -21,9 +21,12 @@
     .ant-upload-list-item.ant-upload-list-item-list-type-text{
         height: 28px;
         .ant-upload-list-item-info{
-            background: @black_titleBg;
+            background: none;
             border-radius: 4px;
             color: @black_Desc;
+            &:hover{
+                background: @black_titleBg;
+            }
             .ant-upload-text-icon{
                 margin-left: 4px;
             }