diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-25 11:22:46 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-25 11:22:46 +0300 |
commit | 10bba03843c155beb58b9d054029d2083776cc56 (patch) | |
tree | 54cd7e1d32c7476cd84cda603fce589dd84548ae | |
parent | e1a701c79ac993cb44c7d51ac2540a93774a5ab6 (diff) |
force modified icon in tree list & tab bar
-rw-r--r-- | app/assets/javascripts/ide/components/changed_file_icon.vue | 9 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/repo_tab.vue | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/changed_file_icon.vue b/app/assets/javascripts/ide/components/changed_file_icon.vue index 1fc11c84639..fdbc14a4b8f 100644 --- a/app/assets/javascripts/ide/components/changed_file_icon.vue +++ b/app/assets/javascripts/ide/components/changed_file_icon.vue @@ -26,11 +26,18 @@ export default { required: false, default: false, }, + forceModifiedIcon: { + type: Boolean, + required: false, + default: false, + }, }, computed: { changedIcon() { const suffix = this.file.staged && !this.showStagedIcon ? '-solid' : ''; - return this.file.tempFile ? `file-addition${suffix}` : `file-modified${suffix}`; + return this.file.tempFile && !this.forceModifiedIcon + ? `file-addition${suffix}` + : `file-modified${suffix}`; }, stagedIcon() { return `${this.changedIcon}-solid`; diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 521287da190..e86db2da4a6 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -106,7 +106,8 @@ export default { :file="file" :show-tooltip="true" :show-staged-icon="true" - class="prepend-top-5 pull-right" + :force-modified-icon="true" + class="pull-right" /> </span> <new-dropdown diff --git a/app/assets/javascripts/ide/components/repo_tab.vue b/app/assets/javascripts/ide/components/repo_tab.vue index 35a362b01e0..a3ee3184c19 100644 --- a/app/assets/javascripts/ide/components/repo_tab.vue +++ b/app/assets/javascripts/ide/components/repo_tab.vue @@ -84,6 +84,7 @@ export default { <changed-file-icon v-else :file="tab" + :force-modified-icon="true" /> </button> |