diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-06 14:44:13 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-06 14:44:13 +0000 |
| commit | fec96453e73ae715c6888c7369cbb1b020e873b5 (patch) | |
| tree | a3ceb858acb6d9c6785f684fa18923cbb2ecfee4 /app/assets/javascripts/notes/components/discussion_counter.vue | |
| parent | c50eed5400d97c9f566b25f76eb8d0057f910a11 (diff) | |
| download | gitlab-ce-fec96453e73ae715c6888c7369cbb1b020e873b5.tar.gz | |
Merge request tabs fixes
- Makes activity dropdown and resolved counter smaller
- Uses grid for spacing
- Removes scrolling on MR tabs
Diffstat (limited to 'app/assets/javascripts/notes/components/discussion_counter.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 307e56708e0..efd84f5722c 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -49,8 +49,8 @@ export default { </script> <template> - <div v-if="resolvableDiscussionsCount > 0" class="line-resolve-all-container prepend-top-8"> - <div> + <div v-if="resolvableDiscussionsCount > 0" class="line-resolve-all-container full-width-mobile"> + <div class="full-width-mobile d-flex d-sm-block"> <div :class="{ 'has-next-btn': hasNextButton }" class="line-resolve-all"> <span :class="{ 'is-active': allResolved }" @@ -64,7 +64,11 @@ export default { {{ n__('discussion resolved', 'discussions resolved', resolvableDiscussionsCount) }} </span> </div> - <div v-if="resolveAllDiscussionsIssuePath && !allResolved" class="btn-group" role="group"> + <div + v-if="resolveAllDiscussionsIssuePath && !allResolved" + class="btn-group btn-group-sm" + role="group" + > <a v-gl-tooltip :href="resolveAllDiscussionsIssuePath" @@ -74,7 +78,7 @@ export default { <icon name="issue-new" /> </a> </div> - <div v-if="isLoggedIn && !allResolved" class="btn-group" role="group"> + <div v-if="isLoggedIn && !allResolved" class="btn-group btn-group-sm" role="group"> <button v-gl-tooltip title="Jump to first unresolved discussion" |