diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 6b3d3564..964c3548 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -15,7 +15,7 @@ export function getImageUrl(path) {
if (isDev) {
return `${local}/${path}`
}
- return `/${path}`;
+ return `${path}`;
}
export function getImage(path) {
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 886ab2b7..510f91d3 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -703,8 +703,7 @@ class NewHeader extends Component {
:
-
+
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index b3645351..d8db5f00 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -65,7 +65,7 @@ export default ({ match , history }) => {
{committer && committer.time_from_now && - {committer.time_from_now}
}
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index a8143c55..07991f6a 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -437,9 +437,6 @@
font-size: 16px;
border-bottom: 1px solid #d9d9d9;
}
-.branchUl{
- padding:0px 30px;
-}
.branchUl li{
display: flex;
flex-wrap: wrap;
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index e391ea5f..3b3504da 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";
-import { Popconfirm, Tag } from "antd";
+import { Tag } from "antd";
+import { AlignCenter } from '../Component/layout';
import { getImageUrl } from "educoder";
import "./merge.css";
@@ -80,7 +81,7 @@ class MergeItem extends Component {
height="24"
/>
-
+
-
+