summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/repo_file.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-19 09:27:16 +0100
committerPhil Hughes <me@iamphill.com>2018-04-19 09:35:45 +0100
commit293364c893bd64cf2fe2521c5b4bb2485ab09773 (patch)
treee6b16e20fa8e77e8d28ab6464ae9a893513769e3 /app/assets/javascripts/ide/components/repo_file.vue
parentc4201f103662f5ff9eb064890a10352ec03bc495 (diff)
downloadgitlab-ce-293364c893bd64cf2fe2521c5b4bb2485ab09773.tar.gz
updated styling
changed to include new files added getter spec
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_file.vue')
-rw-r--r--app/assets/javascripts/ide/components/repo_file.vue32
1 files changed, 20 insertions, 12 deletions
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 965a49d98cf..d572e564b75 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -1,22 +1,24 @@
<script>
import { mapActions, mapGetters } from 'vuex';
-import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
-import fileIcon from '~/vue_shared/components/file_icon.vue';
+import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
+import Icon from '~/vue_shared/components/icon.vue';
+import FileIcon from '~/vue_shared/components/file_icon.vue';
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';
+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',
components: {
- skeletonLoadingContainer,
- newDropdown,
- fileStatusIcon,
- fileIcon,
- changedFileIcon,
- mrFileIcon,
+ SkeletonLoadingContainer,
+ NewDropdown,
+ FileStatusIcon,
+ FileIcon,
+ ChangedFileIcon,
+ MrFileIcon,
+ Icon,
},
props: {
file: {
@@ -107,8 +109,14 @@ export default {
/>
<span
v-if="isTree && folderChangedCount > 0"
+ class="ide-tree-changes"
>
{{ folderChangedCount }}
+ <icon
+ name="file-modified"
+ :size="12"
+ css-classes="prepend-left-5 multi-file-modified"
+ />
</span>
<changed-file-icon
v-else-if="file.changed || file.tempFile"