Skip to content

Commit f157d02

Browse files
authored
Merge pull request #12 from cangzhang/change/publisher
style: icon & text margin.
2 parents 8eb2c24 + 7572e49 commit f157d02

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "coding-plugin",
33
"description": "Coding plugin for VS Code.",
44
"version": "0.1.0",
5-
"publisher": "coding",
5+
"publisher": "coding-net",
66
"license": "MIT",
77
"engines": {
88
"vscode": "^1.47.0"
@@ -96,7 +96,7 @@
9696
{
9797
"id": "codingPluginTree",
9898
"title": "CODING",
99-
"icon": "src/assets/coding.svg"
99+
"icon": "src/assets/coding.png"
100100
}
101101
]
102102
},
@@ -105,13 +105,11 @@
105105
{
106106
"id": "mrTreeView",
107107
"name": "Merge Requests",
108-
"icon": "src/assets/coding.svg",
109108
"contextualTitle": "List"
110109
},
111110
{
112111
"id": "releaseTreeView",
113112
"name": "Releases",
114-
"icon": "src/assets/coding.svg",
115113
"contextualTitle": "List"
116114
}
117115
]

src/assets/coding.png

11.8 KB
Loading

src/assets/coding.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

webviews/components/Activity.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ interface IProps {
1515
const Time = styled.span`
1616
margin-left: 20px;
1717
`;
18+
const ActionDesc = styled.span`
19+
margin-left: 1ex;
20+
margin-right: 1ex;
21+
`;
1822

1923
function Activity({ activity, srcBranch, desBranch }: IProps) {
2024
const { currentMR } = appStore;
@@ -77,7 +81,8 @@ function Activity({ activity, srcBranch, desBranch }: IProps) {
7781
{ACTIVITY_TYPE[action].icon}
7882
<div>
7983
<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>
8186
{(action === 'del_source_branch' || action === 'restore_source_branch') && (
8287
<span>{srcBranch}</span>
8388
)}

0 commit comments

Comments
 (0)