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
fcbee9e5
Commit
fcbee9e5
authored
Jul 03, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the overall UX for the new monitoring dashboard
parent
c8eef2d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
10 deletions
+26
-10
app/assets/javascripts/monitoring/components/monitoring_column.vue
...s/javascripts/monitoring/components/monitoring_column.vue
+9
-7
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+12
-2
app/views/projects/environments/metrics.html.haml
app/views/projects/environments/metrics.html.haml
+1
-1
changelogs/unreleased/monitoring-dashboard-fine-tuning-ux.yml
...gelogs/unreleased/monitoring-dashboard-fine-tuning-ux.yml
+4
-0
No files found.
app/assets/javascripts/monitoring/components/monitoring_column.vue
View file @
fcbee9e5
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
data
()
{
data
()
{
return
{
return
{
graphHeight
:
50
0
,
graphHeight
:
45
0
,
graphWidth
:
600
,
graphWidth
:
600
,
graphHeightOffset
:
120
,
graphHeightOffset
:
120
,
xScale
:
{},
xScale
:
{},
...
@@ -88,7 +88,9 @@
...
@@ -88,7 +88,9 @@
},
},
paddingBottomRootSvg
()
{
paddingBottomRootSvg
()
{
return
(
Math
.
ceil
(
this
.
graphHeight
*
100
)
/
this
.
graphWidth
)
||
0
;
return
{
paddingBottom
:
`
${(
Math
.
ceil
(
this
.
graphHeight
*
100
)
/
this
.
graphWidth
)
||
0
}
%`
,
};
},
},
},
},
...
@@ -198,7 +200,7 @@
...
@@ -198,7 +200,7 @@
watch
:
{
watch
:
{
updateAspectRatio
()
{
updateAspectRatio
()
{
if
(
this
.
updateAspectRatio
)
{
if
(
this
.
updateAspectRatio
)
{
this
.
graphHeight
=
50
0
;
this
.
graphHeight
=
45
0
;
this
.
graphWidth
=
600
;
this
.
graphWidth
=
600
;
this
.
measurements
=
measurements
.
large
;
this
.
measurements
=
measurements
.
large
;
this
.
draw
();
this
.
draw
();
...
@@ -216,14 +218,14 @@
...
@@ -216,14 +218,14 @@
<div
<div
:class=
"classType"
>
:class=
"classType"
>
<h5
<h5
class=
"text-center"
>
class=
"text-center
graph-title
"
>
{{
columnData
.
title
}}
{{
columnData
.
title
}}
</h5>
</h5>
<div
<div
class=
"prometheus-svg-container"
>
class=
"prometheus-svg-container"
:style=
"paddingBottomRootSvg"
>
<svg
<svg
:viewBox=
"outterViewBox"
:viewBox=
"outterViewBox"
:style=
"
{ 'padding-bottom': paddingBottomRootSvg }"
ref=
"baseSvg"
>
ref=
"baseSvg"
>
<g
<g
class=
"x-axis"
class=
"x-axis"
...
...
app/assets/stylesheets/pages/environments.scss
View file @
fcbee9e5
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
.text-metric-usage
{
.text-metric-usage
{
fill
:
$black
;
fill
:
$black
;
font-weight
:
500
;
font-weight
:
500
;
font-size
:
1
4
px
;
font-size
:
1
2
px
;
}
}
.legend-axis-text
{
.legend-axis-text
{
...
@@ -262,7 +262,11 @@
...
@@ -262,7 +262,11 @@
}
}
.tick
>
text
{
.tick
>
text
{
font-size
:
14px
;
font-size
:
12px
;
}
.text-metric-title
{
font-size
:
12px
;
}
}
@media
(
max-width
:
$screen-sm-max
)
{
@media
(
max-width
:
$screen-sm-max
)
{
...
@@ -277,3 +281,9 @@
...
@@ -277,3 +281,9 @@
}
}
}
}
}
}
.prometheus-row
{
h5
{
font-size
:
16px
;
}
}
app/views/projects/environments/metrics.html.haml
View file @
fcbee9e5
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
.top-area
.top-area
.row
.row
.col-sm-6
.col-sm-6
%h3
.page-title
%h3
Environment:
Environment:
=
link_to
@environment
.
name
,
environment_path
(
@environment
)
=
link_to
@environment
.
name
,
environment_path
(
@environment
)
...
...
changelogs/unreleased/monitoring-dashboard-fine-tuning-ux.yml
0 → 100644
View file @
fcbee9e5
---
title
:
Improve the overall UX for the new monitoring dashboard
merge_request
:
author
:
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