弹框样式修改

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1630465334247') format('woff2'),
+  src: url('iconfont.woff2?t=1630632852475') format('woff2'),
-       url('iconfont.woff?t=1630465334247') format('woff'),
+       url('iconfont.woff?t=1630632852475') format('woff'),
-       url('iconfont.ttf?t=1630465334247') format('truetype');
+       url('iconfont.ttf?t=1630632852475') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,62 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-gerenziliao1:before {
+  content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+  content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+  content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+  content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+  content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+  content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+  content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+  content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+  content: "\e8cd";
+}
+
 .icon-gerenziliao:before {
   content: "\e8c4";
 }
@@ -121,10 +177,6 @@
   content: "\e883";
 }
 
-.icon-cangkushezhiicon:before {
-  content: "\e885";
-}
-
 .icon-lianjieicon:before {
   content: "\e887";
 }
@@ -133,18 +185,6 @@
   content: "\e888";
 }
 
-.icon-lichengbeiicon:before {
-  content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
-  content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
-  content: "\e88b";
-}
-
 .icon-morendianzan_icon:before {
   content: "\e88e";
 }
@@ -249,10 +289,6 @@
   content: "\e898";
 }
 
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }

public/css/iconfont.json

@@ -5,6 +5,104 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24059956",
+      "name": "个人资料",
+      "font_class": "gerenziliao1",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "24059409",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "24059410",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "24059411",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "24059412",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "24059413",
+      "name": "易修icon",
+      "font_class": "yixiuicon1",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "24059414",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon1",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "24047186",
+      "name": "代码库icon",
+      "font_class": "daimakuicon1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "24047189",
+      "name": "我的通知",
+      "font_class": "wodetongzhi",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "24047190",
+      "name": "通知管理",
+      "font_class": "tongzhiguanli",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "24047191",
+      "name": "选中",
+      "font_class": "xuanzhong3",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "24047192",
+      "name": "系统通知icon",
+      "font_class": "xitongtongzhiicon",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "24047193",
+      "name": "消息",
+      "font_class": "xiaoxi2",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "24047194",
+      "name": "ssh密钥",
+      "font_class": "sshmiyue",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
     {
       "icon_id": "24014152",
       "name": "个人资料",
@@ -194,13 +292,6 @@
       "unicode": "e883",
       "unicode_decimal": 59523
     },
-    {
-      "icon_id": "23472256",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
     {
       "icon_id": "23472258",
       "name": "链接icon",
@@ -215,27 +306,6 @@
       "unicode": "e888",
       "unicode_decimal": 59528
     },
-    {
-      "icon_id": "23472260",
-      "name": "里程碑icon",
-      "font_class": "lichengbeiicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
-    {
-      "icon_id": "23472261",
-      "name": "工作流icon",
-      "font_class": "gongzuoliuicon",
-      "unicode": "e88a",
-      "unicode_decimal": 59530
-    },
-    {
-      "icon_id": "23472262",
-      "name": "动态icon",
-      "font_class": "dongtaiicon",
-      "unicode": "e88b",
-      "unicode_decimal": 59531
-    },
     {
       "icon_id": "23472263",
       "name": "默认点赞_icon",
@@ -418,13 +488,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",

src/forge/Component/ProfileModal/Index.jsx

@@ -56,12 +56,15 @@ function ProfileModal({visible,onCancel,history}) {
         </div>
       }  
     >
-      {
+      <div className="contents">
-        addMemberCheck ?
+        <i className="iconfont icon-gerenziliao1 font-44" style={{color:"#466AFF"}}></i>
-        <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
+        {
-        :
+          addMemberCheck ?
-        <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
+          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
-      }
+          :
+          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
+        }
+      </div>
     </Modals>
   )
 }

src/forge/Component/ProfileModal/Index.scss

@@ -0,0 +1,17 @@
+.contents{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin:10px auto 0px;
+  i{
+    margin-right: 13px;
+  }
+  p{
+    line-height: 29px;
+    max-width: 327px;
+    font-size: 16px!important;
+  }
+}
+.font-44{
+  font-size: 44px!important;
+}

src/forge/Component/PublicModal/Index.jsx

@@ -8,7 +8,7 @@ function Modals({title,children,btn,onCancel,visible}) {
       visible={visible}
       onCancel={onCancel}
       title={title}
-      width="600px"
+      width={"520px"}
       className="deleteBox"
       footer={btn}
     >

src/forge/Component/PublicModal/Index.scss

@@ -1,16 +1,24 @@
 .deleteBox{
+  .ant-modal-close-x{
+    font-size: 17px!important;
+  }
   .ant-modal-header{
     background-color: #f8f8f8;
-    border-bottom: none;
+    padding:10px 30px;
     .ant-modal-title{
       text-align: left;
-      font-size: 20px;
+      font-size: 16px;
+      font-weight: bold;
     }
   }
+  .ant-modal-close{
+    top:0px !important;
+    font-size: 24px !important;
+  }
   .ant-modal-body{
     padding:30px 50px;
     p{
-      font-size: 16px;
+      font-size: 14px;
       line-height: 26px;
       color:#666;
       word-break: break-all;
@@ -21,9 +29,8 @@
         justify-content: center;
         font-size: 20px;
         margin-bottom: 10px;
-        i{
+        i.red{
-          font-size: 38px!important;
+          color:#DF0002;
-          color:#DF0002
         }
       }
     }
@@ -33,21 +40,31 @@
     text-align: center;
     padding-bottom: 40px;
     button,a{
-      width: 120px;
+      width: 96px;
+      height: 32px;
       margin:0px 20px;
+      font-weight: 400;
+      font-size: 14px;
       &.ant-btn{
         border-color: #D0D0D0;
         color: #666;
+        &:hover,&:active,&:focus{
+          background: #f3f4f6;
+        }
       }
       &.ant-btn-danger{
         background-color: #fff;
         color: #DF0002;
         border-color: #D0D0D0;
+        &:hover,&:active,&:focus{
+          border-color: #DF0002;
+          background-color: #fff;
+        }
       }
       &.ant-btn.ant-btn-primary{
-        background-color: #fff;
+        background-color: #466AFF;
-        color: #466AFF;
+        color: #fff;
-        border-color: #D0D0D0;
+        border-color: #466AFF;
       }
     }
   }

src/forge/SecuritySetting/Index.scss

@@ -124,49 +124,6 @@
     }
   }
 }
-.deleteBox{
-  .ant-modal-header{
-    border-bottom: none;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 20px;
-    }
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 16px;
-      line-height: 26px;
-      color:#666
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i{
-          font-size: 38px!important;
-          color:#DF0002
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button{
-      width: 120px;
-      margin:0px 20px;
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-      }
-    }
-  }
-}
 .descModal{
   .ant-modal-title{
     text-align: left;

src/forge/SecuritySetting/sub/DeleteBox.jsx

@@ -1,17 +1,16 @@
 import React from 'react';
 import { AlignCenter } from '../../Component/layout';
-import { Modal , Button } from 'antd';
+import Modals from '../../Component/PublicModal/Index';
+import { Button } from 'antd';
 
 function DeleteBox({ visible , onCancel ,onSuccess }) {
   
   return(
-    <Modal
+    <Modals
       visible={visible}
       onCancel={onCancel}
-      title="删除SSH密钥"
+      title={"删除SSH密钥"}
-      width="600px"
+      btn={
-      className="deleteBox"
-      footer={
         <div>
           <Button size={'large'} onClick={onCancel}>取消</Button>
           <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
@@ -19,10 +18,11 @@ function DeleteBox({ visible , onCancel ,onSuccess }) {
       }
     >
       <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-jinggao1 mr10"></i>您确定要删除此 SSH 密钥吗？</AlignCenter>
+        <AlignCenter className="descMain">
-        <p>此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。</p>
+          <i className="iconfont icon-jinggao1 mr10 font-20 red"></i>您确定要删除此 SSH 密钥吗？</AlignCenter>
+          <p>此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。</p>
       </div>
-    </Modal>
+    </Modals>
   )
 }
 export default DeleteBox;