forked from Gitlink/forgeplus-react
上线后的getImageURL也不用在前面加/ + 一些小样式修改
This commit is contained in:
parent
798d919447
commit
1e0f522f4a
|
@ -15,7 +15,7 @@ export function getImageUrl(path) {
|
|||
if (isDev) {
|
||||
return `${local}/${path}`
|
||||
}
|
||||
return `/${path}`;
|
||||
return `${path}`;
|
||||
}
|
||||
|
||||
export function getImage(path) {
|
||||
|
|
|
@ -703,8 +703,7 @@ class NewHeader extends Component {
|
|||
:
|
||||
<div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
|
||||
<a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
|
||||
<img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
|
||||
src={getImageUrl(`/` + user.image_url)} width="34">
|
||||
<img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
|
||||
</img>
|
||||
</a>
|
||||
<ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
|
||||
|
|
|
@ -65,7 +65,7 @@ export default ({ match , history }) => {
|
|||
<div className="f-wrap-between" style={{ alignItems: "center" }}>
|
||||
<ul className="df">
|
||||
<User
|
||||
url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
|
||||
url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
|
||||
name={committer && committer.name}
|
||||
/>
|
||||
{committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
|
||||
|
|
|
@ -437,9 +437,6 @@
|
|||
font-size: 16px;
|
||||
border-bottom: 1px solid #d9d9d9;
|
||||
}
|
||||
.branchUl{
|
||||
padding:0px 30px;
|
||||
}
|
||||
.branchUl li{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
|
|
@ -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"
|
||||
/>
|
||||
</Link>
|
||||
<span>
|
||||
<AlignCenter>
|
||||
<Link
|
||||
to={`/users/${item && item.author_login}`}
|
||||
className="show-user-link color-grey-8 ml5"
|
||||
|
@ -124,7 +125,7 @@ class MergeItem extends Component {
|
|||
</Link>
|
||||
</Tag>
|
||||
</span>
|
||||
</span>
|
||||
</AlignCenter>
|
||||
</p>
|
||||
</div>
|
||||
<ul
|
||||
|
|
Loading…
Reference in New Issue