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
Léo-Paul Géneau
gitlab-ce
Commits
0b278a93
Commit
0b278a93
authored
Jun 01, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style updates
[ci skip]
parent
524ebff5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
10 deletions
+62
-10
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
...ts/javascripts/ide/components/merge_requests/dropdown.vue
+4
-2
app/assets/javascripts/ide/components/merge_requests/list.vue
...assets/javascripts/ide/components/merge_requests/list.vue
+44
-8
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+14
-0
No files found.
app/assets/javascripts/ide/components/merge_requests/dropdown.vue
View file @
0b278a93
...
@@ -39,7 +39,7 @@ export default {
...
@@ -39,7 +39,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"dropdown-menu"
>
<div
class=
"dropdown-menu
ide-merge-requests-dropdown
"
>
<tabs
<tabs
stop-propagation
stop-propagation
@
changed=
"updateActiveTab"
@
changed=
"updateActiveTab"
...
@@ -53,6 +53,7 @@ export default {
...
@@ -53,6 +53,7 @@ export default {
:is-loading=
"isLoading"
:is-loading=
"isLoading"
:items=
"mergeRequests"
:items=
"mergeRequests"
:current-id=
"currentMergeRequestId"
:current-id=
"currentMergeRequestId"
:empty-text=
"__('You have not created any merge requests')"
@
search=
"fetchMergeRequests"
@
search=
"fetchMergeRequests"
/>
/>
</tab>
</tab>
...
@@ -62,6 +63,7 @@ export default {
...
@@ -62,6 +63,7 @@ export default {
:is-loading=
"isLoading"
:is-loading=
"isLoading"
:items=
"mergeRequests"
:items=
"mergeRequests"
:current-id=
"currentMergeRequestId"
:current-id=
"currentMergeRequestId"
:empty-text=
"__('You do not have any assigned merge requests')"
@
search=
"fetchMergeRequests"
@
search=
"fetchMergeRequests"
/>
/>
</tab>
</tab>
...
@@ -71,7 +73,7 @@ export default {
...
@@ -71,7 +73,7 @@ export default {
<
style
scoped
>
<
style
scoped
>
.dropdown-menu
{
.dropdown-menu
{
width
:
40
0px
;
width
:
35
0px
;
padding
:
0
;
padding
:
0
;
max-height
:
initial
!important
;
max-height
:
initial
!important
;
}
}
...
...
app/assets/javascripts/ide/components/merge_requests/list.vue
View file @
0b278a93
...
@@ -21,12 +21,24 @@ export default {
...
@@ -21,12 +21,24 @@ export default {
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
emptyText
:
{
type
:
String
,
required
:
true
,
},
},
},
data
()
{
data
()
{
return
{
return
{
search
:
''
,
search
:
''
,
};
};
},
},
computed
:
{
hasMergeRequests
()
{
return
this
.
items
.
length
!==
0
;
},
hasNoSearchResults
()
{
return
this
.
search
!==
''
&&
!
this
.
hasMergeRequests
;
},
},
watch
:
{
watch
:
{
isLoading
()
{
isLoading
()
{
this
.
focusSearch
();
this
.
focusSearch
();
...
@@ -72,20 +84,44 @@ export default {
...
@@ -72,20 +84,44 @@ export default {
class=
"fa fa-search dropdown-input-search"
class=
"fa fa-search dropdown-input-search"
></i>
></i>
</div>
</div>
<div
class=
"dropdown-content"
>
<div
class=
"dropdown-content
ide-merge-requests-dropdown-content
"
>
<ul
class=
"mb-3"
>
<ul
class=
"mb-3"
>
<template
v-if=
"hasMergeRequests"
>
<li
v-for=
"item in items"
:key=
"item.id"
>
<item
:item=
"item"
:current-id=
"currentId"
@
click=
"viewMergeRequest"
/>
</li>
</
template
>
<li
<li
v-
for=
"item in items"
v-
else
:key=
"item.id
"
class=
"ide-merge-requests-empty d-flex align-items-center justify-content-center
"
>
>
<item
<
template
v-if=
"hasNoSearchResults"
>
:item=
"item"
No merge requests found
:current-id=
"currentId"
</
template
>
@
click=
"viewMergeRequest"
<
template
v-else
>
/>
{{
emptyText
}}
</
template
>
</li>
</li>
</ul>
</ul>
</div>
</div>
</template>
</template>
</div>
</div>
</template>
</template>
<
style
scoped
>
.ide-merge-requests-empty
{
height
:
230px
;
}
.ide-merge-requests-dropdown-content
{
min-height
:
230px
;
max-height
:
470px
;
}
</
style
>
app/assets/stylesheets/pages/repo.scss
View file @
0b278a93
...
@@ -1274,3 +1274,17 @@
...
@@ -1274,3 +1274,17 @@
.ide-job-header
{
.ide-job-header
{
min-height
:
60px
;
min-height
:
60px
;
}
}
.ide-merge-requests-dropdown
{
.nav-links
li
{
width
:
50%
;
}
.nav-links
li
a
{
text-align
:
center
;
}
.nav-links
li
a
:not
(
.active
)
{
background-color
:
#fafafa
;
}
}
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