Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c9b36995
Commit
c9b36995
authored
Jun 04, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed loading icon hiding content
parent
ce2bc5c0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
47 deletions
+48
-47
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
...ts/javascripts/ide/components/merge_requests/dropdown.vue
+1
-1
app/assets/javascripts/ide/components/merge_requests/list.vue
...assets/javascripts/ide/components/merge_requests/list.vue
+47
-46
No files found.
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
View file @
c9b36995
<
script
>
import
{
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
Tabs
from
'
../../../vue_shared/components/tabs/tabs
'
;
import
Tab
from
'
../../../vue_shared/components/tabs/tab.vue
'
;
import
List
from
'
./list.vue
'
;
...
...
app/assets/javascripts/ide/components/merge_requests/list.vue
View file @
c9b36995
...
...
@@ -80,13 +80,7 @@ export default {
<
template
>
<div>
<loading-icon
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"
>
<div
class=
"dropdown-input mt-3 pb-3 mb-0 border-bottom"
>
<input
type=
"search"
class=
"dropdown-input-field"
...
...
@@ -100,8 +94,16 @@ export default {
class=
"fa fa-search dropdown-input-search"
></i>
</div>
<div
class=
"dropdown-content ide-merge-requests-dropdown-content"
>
<ul
class=
"mb-3"
>
<div
class=
"dropdown-content ide-merge-requests-dropdown-content d-flex"
>
<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"
>
<li
v-for=
"item in mergeRequests"
...
...
@@ -128,7 +130,6 @@ export default {
</li>
</ul>
</div>
</template>
</div>
</template>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment