summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-06-03 14:25:26 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-06-03 14:25:26 +0000
commit8a2afff06134447bcf80d39bcb1a5e378789df06 (patch)
treed55c34aa187f929dfc1edbe968b5ccd632f93760
parent6cb750a2bb7e1720413a7c42ec4afebaa3f2f4d2 (diff)
parentde342ef3893e20c332157a155e025ee35535dfb7 (diff)
downloadgitlab-ce-8a2afff06134447bcf80d39bcb1a5e378789df06.tar.gz
Merge branch '62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard' into 'master'
Added padding to time window dropdown in monitor dashboard Closes #62092 See merge request gitlab-org/gitlab-ce!28897
-rw-r--r--app/assets/javascripts/monitoring/components/dashboard.vue2
-rw-r--r--changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index a55a47c277d..cc7b5700215 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -248,7 +248,7 @@ export default {
>
</gl-dropdown>
</div>
- <div v-if="showTimeWindowDropdown" class="d-flex align-items-center">
+ <div v-if="showTimeWindowDropdown" class="d-flex align-items-center prepend-left-8">
<strong>{{ s__('Metrics|Show last') }}</strong>
<gl-dropdown
class="prepend-left-10 js-time-window-dropdown"
diff --git a/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml b/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml
new file mode 100644
index 00000000000..3317d505924
--- /dev/null
+++ b/changelogs/unreleased/62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard.yml
@@ -0,0 +1,5 @@
+---
+title: Added padding to time window dropdown in monitor dashboard
+merge_request: 28897
+author:
+type: fixed