Merge pull request #597 from koderover/main

Merge main into release-1.10.0

src/assets/css/common/colorEnum.less

@@ -2,9 +2,9 @@
 @fontGray: #888888;
 @fontLightGray: #a0a0a0;
 @themeColor: #0066ff;
-@themeBorderColor: #bbbbff;
+@themeBorderColor: #66bbff;
 @themeBackgroundColor: #eeeeff;
-@themeLightColor: #bbbbff;
+@themeLightColor: #66bbff;
 @backgroundColor: #e5e5e5;
 
 @globalBackgroundColor: #f6f6f6;

src/assets/css/component/dockerfile-template.less

@@ -79,7 +79,7 @@
       align-content: center;
       align-items: center;
       justify-content: center;
-      width: 100%;
+      width: calc(~'100% - 240px');
       height: 100%;
 
       img {

src/assets/css/component/file-tree.less

@@ -1,7 +1,7 @@
 
 .file-tree-container {
   position: relative;
-  width: 250px;
+  width: 100%;
   padding: 0 5px;
   overflow: auto;
   font-size: 13px;
@@ -120,7 +120,7 @@
     vertical-align: middle;
 
     .el-input {
-      width: 150px;
+      width: 170px;
     }
   }
 }

src/assets/css/component/k8s-template.less

@@ -80,7 +80,7 @@
       align-content: center;
       align-items: center;
       justify-content: center;
-      width: 100%;
+      width: calc(~'100% - 240px');
       height: 100%;
 
       img {

src/assets/css/component/service-help.less

@@ -74,23 +74,17 @@
       }
 
       .service-aside-help__step-list-item-counter {
-        display: -webkit-box;
-        display: -ms-flexbox;
         display: flex;
         align-items: center;
         justify-content: center;
         width: 20px;
         height: 20px;
         margin-right: 13px;
         color: #fff;
-        font-weight: bold;
+        font-weight: 400;
         font-size: 13px;
-        background-color: #9b51e0;
+        background-color: @themeColor;
         border-radius: 50%;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
       }
 
       .service-aside-help__step-list-item-text {

src/assets/css/component/service-mgr.less

@@ -46,7 +46,7 @@
     position: relative;
     display: flex;
     height: calc(~'100% - 70px');
-    padding: 15px 5px 0 5px;
+    padding: 10px 5px 0 5px;
 
     &.onboarding {
       height: calc(~'100% - 245px');

src/assets/css/component/service-tree.less

@@ -36,6 +36,10 @@
     .el-tree {
       overflow: auto;
 
+      &.arrange-tree {
+        height: 100%;
+      }
+
       .el-tree__empty-block {
         display: none;
       }

src/assets/css/quote/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1282370 */
-  src: url('//at.alicdn.com/t/font_1282370_tul7gzru1g.eot?t=1646748060131'); /* IE9 */
-  src: url('//at.alicdn.com/t/font_1282370_tul7gzru1g.eot?t=1646748060131#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('//at.alicdn.com/t/font_1282370_tul7gzru1g.woff2?t=1646748060131') format('woff2'),
-       url('//at.alicdn.com/t/font_1282370_tul7gzru1g.woff?t=1646748060131') format('woff'),
-       url('//at.alicdn.com/t/font_1282370_tul7gzru1g.ttf?t=1646748060131') format('truetype'),
-       url('//at.alicdn.com/t/font_1282370_tul7gzru1g.svg?t=1646748060131#iconfont') format('svg');
+  src: url('~@assets/fonts/iconfont.eot?t=1646898536361'); /* IE9 */
+  src: url('~@assets/fonts/iconfont.eot?t=1646898536361#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('~@assets/fonts/iconfont.woff2?t=1646898536361') format('woff2'),
+       url('~@assets/fonts/iconfont.woff?t=1646898536361') format('woff'),
+       url('~@assets/fonts/iconfont.ttf?t=1646898536361') format('truetype'),
+       url('~@assets/icons/font/iconfont.svg?t=1646898536361#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconvery-confirm:before {
+  content: "\e69e";
+}
+
+.iconvery-handshake:before {
+  content: "\e69d";
+}
+
 .iconvery-user:before {
   content: "\e69b";
 }
@@ -827,3 +835,4 @@
 .iconjiaofu1:before {
   content: "\e694";
 }
+