Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-01 19:30:50 +0300
committerPhil Hughes <me@iamphill.com>2018-06-06 13:19:03 +0300
commit0b278a93f96ca4dd760c069e42d5485460d7b738 (patch)
treeb213332e4add7a0328d4ba8b417f98cc722acc3b /app/assets/javascripts/ide/components/merge_requests/list.vue
parent524ebff5d17fd9111f2277843b384d204ff87a47 (diff)
style updates
[ci skip]
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests/list.vue')
-rw-r--r--app/assets/javascripts/ide/components/merge_requests/list.vue52
1 files changed, 44 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue
index 04b3848f3e2..0d81da12246 100644
--- a/app/assets/javascripts/ide/components/merge_requests/list.vue
+++ b/app/assets/javascripts/ide/components/merge_requests/list.vue
@@ -21,12 +21,24 @@ export default {
type: String,
required: true,
},
+ emptyText: {
+ type: String,
+ required: true,
+ },
},
data() {
return {
search: '',
};
},
+ computed: {
+ hasMergeRequests() {
+ return this.items.length !== 0;
+ },
+ hasNoSearchResults() {
+ return this.search !== '' && !this.hasMergeRequests;
+ },
+ },
watch: {
isLoading() {
this.focusSearch();
@@ -72,20 +84,44 @@ export default {
class="fa fa-search dropdown-input-search"
></i>
</div>
- <div class="dropdown-content">
+ <div class="dropdown-content ide-merge-requests-dropdown-content">
<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
- v-for="item in items"
- :key="item.id"
+ v-else
+ class="ide-merge-requests-empty d-flex align-items-center justify-content-center"
>
- <item
- :item="item"
- :current-id="currentId"
- @click="viewMergeRequest"
- />
+ <template v-if="hasNoSearchResults">
+ No merge requests found
+ </template>
+ <template v-else>
+ {{ emptyText }}
+ </template>
</li>
</ul>
</div>
</template>
</div>
</template>
+
+<style scoped>
+.ide-merge-requests-empty {
+ height: 230px;
+}
+
+.ide-merge-requests-dropdown-content {
+ min-height: 230px;
+ max-height: 470px;
+}
+</style>