Commit c9b36995 authored by Phil Hughes's avatar Phil Hughes

fixed loading icon hiding content

parent ce2bc5c0
<script> <script>
import { mapGetters, mapState } from 'vuex'; import { mapGetters } from 'vuex';
import Tabs from '../../../vue_shared/components/tabs/tabs'; import Tabs from '../../../vue_shared/components/tabs/tabs';
import Tab from '../../../vue_shared/components/tabs/tab.vue'; import Tab from '../../../vue_shared/components/tabs/tab.vue';
import List from './list.vue'; import List from './list.vue';
......
...@@ -80,13 +80,7 @@ export default { ...@@ -80,13 +80,7 @@ export default {
<template> <template>
<div> <div>
<loading-icon <div class="dropdown-input mt-3 pb-3 mb-0 border-bottom">
class="mt-3 mb-3"
v-if="isLoading"
size="2"
/>
<template v-else>
<div class="dropdown-input mt-3 pb-3 mb-3 border-bottom">
<input <input
type="search" type="search"
class="dropdown-input-field" class="dropdown-input-field"
...@@ -100,8 +94,16 @@ export default { ...@@ -100,8 +94,16 @@ export default {
class="fa fa-search dropdown-input-search" class="fa fa-search dropdown-input-search"
></i> ></i>
</div> </div>
<div class="dropdown-content ide-merge-requests-dropdown-content"> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<ul class="mb-3"> <loading-icon
class="mt-3 mb-3 align-self-center ml-auto mr-auto"
v-if="isLoading"
size="2"
/>
<ul
v-else
class="mb-3 w-100"
>
<template v-if="hasMergeRequests"> <template v-if="hasMergeRequests">
<li <li
v-for="item in mergeRequests" v-for="item in mergeRequests"
...@@ -128,7 +130,6 @@ export default { ...@@ -128,7 +130,6 @@ export default {
</li> </li>
</ul> </ul>
</div> </div>
</template>
</div> </div>
</template> </template>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment