diff --git a/client/containers/User/Profile.js b/client/containers/User/Profile.js index b8de8a2e..3a256867 100644 --- a/client/containers/User/Profile.js +++ b/client/containers/User/Profile.js @@ -138,8 +138,8 @@ class Profile extends Component { userNameEditHtml =
- - + +
} @@ -154,8 +154,8 @@ class Profile extends Component { emailEditHtml =
- - + +
} @@ -175,15 +175,15 @@ class Profile extends Component { } if (this.state.secureEdit === false) { - secureEditHtml = + secureEditHtml = } else { secureEditHtml =
- - + +
} @@ -228,7 +228,7 @@ class Profile extends Component { - 安全 + 密码 {secureEditHtml} diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss index 56dca065..75cbbb3b 100644 --- a/client/containers/User/index.scss +++ b/client/containers/User/index.scss @@ -21,15 +21,22 @@ border-radius:5px; margin-top: 15px; .search{ - margin: 5px; + padding: 5px; + background-color: #eee; } ul{border:none} + .ant-menu-item{ + font-size: 14px; + } } .user-name{ - padding: 10px 0px; + padding: 24px 0px; text-align: center; background-color: #34495e; color: white; + font-size: 16px; + border-top-left-radius:5px; + border-top-right-radius: 5px; span{ margin-right: 10px; } @@ -59,17 +66,27 @@ -webkit-box-flex: 1; margin-top: 15px; margin-left: 15px; - padding: 10px 30px; + padding: 24px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; border-radius:5px; + .ant-btn-group{ + margin-top: 12px; + } .user-item { min-height:35px; line-height:35px; margin: 5px; + margin-left: 0px; margin-bottom:10px; border-bottom: 1px solid #f1f3f6; padding-bottom: 10px; + #old_password,#password,#verify_pass{ + margin-top: 20px; + } + #old_password{ + margin-top: 0px; + } .ant-col-4{ color: black; padding: 0px 10px; @@ -87,13 +104,13 @@ cursor: pointer } - .edit-buttons{ - margin:10px; - } + // .edit-buttons{ + // margin:10px; + // } - .edit-button{ - margin: 5px; - } + // .edit-button{ + // margin: 5px; + // } } }