diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-27 16:56:22 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 12:17:30 +0200 |
| commit | 4afd72377d0ad5fcc8dc5462cc3b80432f3ac79e (patch) | |
| tree | 627c6b436379cb804e093ec1bf06004643ff2840 /app/assets/javascripts/ide/components/repo_file.vue | |
| parent | d9b7c33f779270dd8bb9fae3b452eca3d5a60d98 (diff) | |
| download | gitlab-ce-4afd72377d0ad5fcc8dc5462cc3b80432f3ac79e.tar.gz | |
Added Changes based on UX Review
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_file.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 88a248d5eeb..cdc9cd30a7e 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -6,6 +6,7 @@ import router from '../ide_router'; import newDropdown from './new_dropdown/index.vue'; import fileStatusIcon from './repo_file_status_icon.vue'; import changedFileIcon from './changed_file_icon.vue'; +import mrFileIcon from './mr_file_icon.vue'; export default { name: 'RepoFile', @@ -15,6 +16,7 @@ export default { fileStatusIcon, fileIcon, changedFileIcon, + mrFileIcon, }, props: { file: { @@ -99,11 +101,16 @@ export default { :file="file" /> </span> - <changed-file-icon - :file="file" - v-if="file.changed || file.tempFile || file.mrChange" - class="prepend-top-5 pull-right" - /> + <span class="pull-right"> + <mr-file-icon + :file="file" + v-if="file.mrChange" + /> + <changed-file-icon + :file="file" + v-if="file.changed || file.tempFile" + /> + </span> <new-dropdown v-if="isTree" :project-id="file.projectId" |