Commit f157d02

authored

Merge pull request cangzhang#12 from cangzhang/change/publisher

style: icon & text margin.

2 parents 8eb2c24 + 7572e49 commit f157d02Copy full SHA for f157d02

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "coding-plugin",`
`3`	`3`	`"description": "Coding plugin for VS Code.",`
`4`	`4`	`"version": "0.1.0",`
`5`		`- "publisher": "coding",`
	`5`	`+ "publisher": "coding-net",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"engines": {`
`8`	`8`	`"vscode": "^1.47.0"`
`@@ -96,7 +96,7 @@`
`96`	`96`	`{`
`97`	`97`	`"id": "codingPluginTree",`
`98`	`98`	`"title": "CODING",`
`99`		`- "icon": "src/assets/coding.svg"`
	`99`	`+ "icon": "src/assets/coding.png"`
`100`	`100`	`}`
`101`	`101`	`]`
`102`	`102`	`},`
`@@ -105,13 +105,11 @@`
`105`	`105`	`{`
`106`	`106`	`"id": "mrTreeView",`
`107`	`107`	`"name": "Merge Requests",`
`108`		`- "icon": "src/assets/coding.svg",`
`109`	`108`	`"contextualTitle": "List"`
`110`	`109`	`},`
`111`	`110`	`{`
`112`	`111`	`"id": "releaseTreeView",`
`113`	`112`	`"name": "Releases",`
`114`		`- "icon": "src/assets/coding.svg",`
`115`	`113`	`"contextualTitle": "List"`
`116`	`114`	`}`
`117`	`115`	`]`

11.8 KB

Lines changed: 0 additions & 1 deletion

This file was deleted.

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ interface IProps {`
`15`	`15`	const Time = styled.span`
`16`	`16`	`margin-left: 20px;`
`17`	`17`	`;
	`18`	+const ActionDesc = styled.span`
	`19`	`+ margin-left: 1ex;`
	`20`	`+ margin-right: 1ex;`
	`21`	+`;
`18`	`22`
`19`	`23`	`function Activity({ activity, srcBranch, desBranch }: IProps) {`
`20`	`24`	`const { currentMR } = appStore;`
`@@ -77,7 +81,8 @@ function Activity({ activity, srcBranch, desBranch }: IProps) {`
`77`	`81`	`{ACTIVITY_TYPE[action].icon}`
`78`	`82`	`<div>`
`79`	`83`	`<p>`
`80`		`- <a href={authorUrl}>{activity.author.name}</a> <span>{ACTIVITY_TYPE[action].text}</span>`
	`84`	`+ <a href={authorUrl}>{activity.author.name}</a>{' '}`
	`85`	`+ <ActionDesc>{ACTIVITY_TYPE[action].text}</ActionDesc>`
`81`	`86`	`{(action === 'del_source_branch' \|\| action === 'restore_source_branch') && (`
`82`	`87`	`<span>{srcBranch}</span>`
`83`	`88`	`)}`

Comments

(0)