diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-12 08:58:01 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-12 08:58:01 +0000 |
commit | 4c26b2f204aba7b07868c5d002d89c9a50e60851 (patch) | |
tree | e7569036b2017d216260b0f880a58c01c4fc5850 | |
parent | e206e66bbba9e36a75eb485f65c26f1d5a05e90f (diff) | |
parent | a6e30424918f015e6f2f61796b1f7aada621f3c4 (diff) | |
download | gitlab-ce-4c26b2f204aba7b07868c5d002d89c9a50e60851.tar.gz |
Merge branch '62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard' into 'master'
Resolve "Target area for dropdown list items is too small on Metrics Dashboard"
Closes #62300
See merge request gitlab-org/gitlab-ce!29458
3 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 2314f7b80cf..b0de142d9d8 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -1,12 +1,5 @@ <script> -import { - GlButton, - GlDropdown, - GlDropdownItem, - GlModal, - GlModalDirective, - GlLink, -} from '@gitlab/ui'; +import { GlButton, GlDropdown, GlDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui'; import _ from 'underscore'; import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; @@ -31,7 +24,6 @@ export default { GlButton, GlDropdown, GlDropdownItem, - GlLink, GlModal, }, directives: { @@ -255,7 +247,9 @@ export default { v-for="(value, key) in timeWindows" :key="key" :active="activeTimeWindow(key)" - ><gl-link :href="setTimeWindowParameter(key)">{{ value }}</gl-link></gl-dropdown-item + :href="setTimeWindowParameter(key)" + active-class="active" + >{{ value }}</gl-dropdown-item > </gl-dropdown> </div> diff --git a/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml b/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml new file mode 100644 index 00000000000..7944e6faa27 --- /dev/null +++ b/changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml @@ -0,0 +1,5 @@ +--- +title: Enlarge metrics time-window dropdown links +merge_request: 29458 +author: +type: fixed diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js index 1a371c3adaf..f9c3122088e 100644 --- a/spec/javascripts/monitoring/dashboard_spec.js +++ b/spec/javascripts/monitoring/dashboard_spec.js @@ -314,9 +314,7 @@ describe('Dashboard', () => { }); setTimeout(() => { - const selectedTimeWindow = component.$el.querySelector( - '.js-time-window-dropdown [active="true"]', - ); + const selectedTimeWindow = component.$el.querySelector('.js-time-window-dropdown .active'); expect(selectedTimeWindow.textContent.trim()).toEqual('30 minutes'); done(); |