summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-09 16:05:21 +0100
committerPhil Hughes <me@iamphill.com>2018-04-09 16:05:21 +0100
commit8fba385e792482850c68050ffe4234d0142b3e20 (patch)
treed4602d5222669376dd5874c749b643bd4a7ef9bc /app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
parent3af57c3cbc986a622117e5b722b06db736fd0bf1 (diff)
downloadgitlab-ce-8fba385e792482850c68050ffe4234d0142b3e20.tar.gz
updated icons
fixed bug where unstaged file when discarded would not take staged file changes
Diffstat (limited to 'app/assets/javascripts/ide/components/commit_sidebar/list_item.vue')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/list_item.vue10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index 56fa8ed0725..d3c30623332 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -24,13 +24,19 @@ export default {
required: false,
default: '',
},
+ stagedList: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
computed: {
iconName() {
- return this.file.tempFile ? 'file-addition' : 'file-modified';
+ const prefix = this.stagedList ? '-solid' : '';
+ return this.file.tempFile ? `file-additions${prefix}` : `file-modified${prefix}`;
},
iconClass() {
- return `multi-file-${this.file.tempFile ? 'addition' : 'modified'} append-right-8`;
+ return `multi-file-${this.file.tempFile ? 'additions' : 'modified'} append-right-8`;
},
},
methods: {