diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 8ade015d..8a6d4df9 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -2700,6 +2700,12 @@ a.edu-txt-w80, .minH-560 { min-height: 560px; } +.minH-650{ + min-height: 650px; +} +.minH-670{ + min-height: 670px; +} /*超出高度出现滚动条--纵向*/ diff --git a/src/forge/UsersList/common_users.js b/src/forge/UsersList/common_users.js index 8f996a7f..d03e3acb 100644 --- a/src/forge/UsersList/common_users.js +++ b/src/forge/UsersList/common_users.js @@ -85,7 +85,7 @@ class CommonUsers extends Component { ); return (
this.undo_link()}>
-
+
待办事项
@@ -204,10 +204,10 @@ class Infos extends Component {
)}
@@ -230,7 +230,7 @@ class Infos extends Component {
this.organize_link()} >
-
+
组织
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 918368e1..2d31c9d7 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -29,10 +29,10 @@ class InfosUser extends Component {
};
componentDidUpdate = (prevProps) => {
- if (prevProps.project_type!= this.props.project_type) {
- this.get_projects();
- }
- }
+ if (prevProps.project_type != this.props.project_type) {
+ this.get_projects();
+ }
+ };
get_projects = () => {
const { user, project_type } = this.props;
@@ -49,7 +49,7 @@ class InfosUser extends Component {
search,
sort_by,
category,
- project_type
+ project_type,
},
})
.then((result) => {
@@ -112,37 +112,37 @@ class InfosUser extends Component {
);
- const button_lists =
- user && current_user && user.login === current_user.login ?
- [
- { type: undefined, name: "所有" },
- { type: "manage", name: "我自己的" },
- { type: "join", name: "我参与的" },
- { type: "watched", name: "我关注的" },
- { type: "forked", name: "我Fork的" },
- { type: "public", name: "公开的" },
- { type: "private", name: "私有的" }
- ]
- : [ { type: undefined, name: "所有" },
- { type: "manage", name: "TA自己的" },
- { type: "join", name: "TA参与的" },
- { type: "watched", name: "TA关注的" },
- { type: "forked", name: "TAFork的" },
- { type: "public", name: "公开的" }]
+ const button_lists =
+ user && current_user && user.login === current_user.login
+ ? [
+ { type: undefined, name: "所有" },
+ { type: "manage", name: "我自己的" },
+ { type: "join", name: "我参与的" },
+ { type: "watched", name: "我关注的" },
+ { type: "forked", name: "我Fork的" },
+ { type: "public", name: "公开的" },
+ { type: "private", name: "私有的" },
+ ]
+ : [
+ { type: undefined, name: "所有" },
+ { type: "manage", name: "TA自己的" },
+ { type: "join", name: "TA参与的" },
+ { type: "watched", name: "TA关注的" },
+ { type: "forked", name: "TAFork的" },
+ { type: "public", name: "公开的" },
+ ];
const category_button = button_lists.map((item, key) => {
return (
-