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
Boxiang Sun
gitlab-ce
Commits
a6e30424
Commit
a6e30424
authored
Jun 11, 2019
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make time window links take up full dropdown width
parent
d7f50276
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+4
-10
changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
...dropdown-list-items-is-too-small-on-metrics-dashboard.yml
+5
-0
spec/javascripts/monitoring/dashboard_spec.js
spec/javascripts/monitoring/dashboard_spec.js
+1
-3
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
a6e30424
<
script
>
<
script
>
import
{
import
{
GlButton
,
GlDropdown
,
GlDropdownItem
,
GlModal
,
GlModalDirective
}
from
'
@gitlab/ui
'
;
GlButton
,
GlDropdown
,
GlDropdownItem
,
GlModal
,
GlModalDirective
,
GlLink
,
}
from
'
@gitlab/ui
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
...
@@ -31,7 +24,6 @@ export default {
...
@@ -31,7 +24,6 @@ export default {
GlButton
,
GlButton
,
GlDropdown
,
GlDropdown
,
GlDropdownItem
,
GlDropdownItem
,
GlLink
,
GlModal
,
GlModal
,
},
},
directives
:
{
directives
:
{
...
@@ -255,7 +247,9 @@ export default {
...
@@ -255,7 +247,9 @@ export default {
v-for=
"(value, key) in timeWindows"
v-for=
"(value, key) in timeWindows"
:key=
"key"
:key=
"key"
:active=
"activeTimeWindow(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>
</gl-dropdown>
</div>
</div>
...
...
changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
0 → 100644
View file @
a6e30424
---
title
:
Enlarge metrics time-window dropdown links
merge_request
:
29458
author
:
type
:
fixed
spec/javascripts/monitoring/dashboard_spec.js
View file @
a6e30424
...
@@ -314,9 +314,7 @@ describe('Dashboard', () => {
...
@@ -314,9 +314,7 @@ describe('Dashboard', () => {
});
});
setTimeout
(()
=>
{
setTimeout
(()
=>
{
const
selectedTimeWindow
=
component
.
$el
.
querySelector
(
const
selectedTimeWindow
=
component
.
$el
.
querySelector
(
'
.js-time-window-dropdown .active
'
);
'
.js-time-window-dropdown [active="true"]
'
,
);
expect
(
selectedTimeWindow
.
textContent
.
trim
()).
toEqual
(
'
30 minutes
'
);
expect
(
selectedTimeWindow
.
textContent
.
trim
()).
toEqual
(
'
30 minutes
'
);
done
();
done
();
...
...
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