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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2b9230af
Commit
2b9230af
authored
Nov 06, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make legend X-offset into a constant
parent
5cc3e235
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
app/assets/javascripts/monitoring/components/graph/legend.vue
...assets/javascripts/monitoring/components/graph/legend.vue
+4
-4
app/assets/javascripts/monitoring/utils/measurements.js
app/assets/javascripts/monitoring/utils/measurements.js
+4
-2
No files found.
app/assets/javascripts/monitoring/components/graph/legend.vue
View file @
2b9230af
...
@@ -173,10 +173,10 @@
...
@@ -173,10 +173,10 @@
:stroke=
"series.lineColor"
:stroke=
"series.lineColor"
:stroke-width=
"measurements.legends.height"
:stroke-width=
"measurements.legends.height"
:stroke-dasharray=
"strokeDashArray(series.lineStyle)"
:stroke-dasharray=
"strokeDashArray(series.lineStyle)"
x1=
"20
"
:x1=
"measurements.legends.offsetX
"
:x2=
"
20
+ measurements.legends.width"
:x2=
"
measurements.legends.offsetX
+ measurements.legends.width"
:y1=
"graphHeight - measurements.legend
Offset
"
:y1=
"graphHeight - measurements.legend
s.offsetY
"
:y2=
"graphHeight - measurements.legend
Offset
"
>
:y2=
"graphHeight - measurements.legend
s.offsetY
"
>
</line>
</line>
<text
<text
v-if=
"timeSeries.length > 1"
v-if=
"timeSeries.length > 1"
...
...
app/assets/javascripts/monitoring/utils/measurements.js
View file @
2b9230af
...
@@ -9,13 +9,14 @@ export default {
...
@@ -9,13 +9,14 @@ export default {
legends
:
{
legends
:
{
width
:
15
,
width
:
15
,
height
:
3
,
height
:
3
,
offsetX
:
20
,
offsetY
:
32
,
},
},
backgroundLegend
:
{
backgroundLegend
:
{
width
:
30
,
width
:
30
,
height
:
50
,
height
:
50
,
},
},
axisLabelLineOffset
:
-
20
,
axisLabelLineOffset
:
-
20
,
legendOffset
:
32
,
},
},
large
:
{
// This covers both md and lg screen sizes
large
:
{
// This covers both md and lg screen sizes
margin
:
{
margin
:
{
...
@@ -27,13 +28,14 @@ export default {
...
@@ -27,13 +28,14 @@ export default {
legends
:
{
legends
:
{
width
:
15
,
width
:
15
,
height
:
3
,
height
:
3
,
offsetX
:
20
,
offsetY
:
34
,
},
},
backgroundLegend
:
{
backgroundLegend
:
{
width
:
30
,
width
:
30
,
height
:
150
,
height
:
150
,
},
},
axisLabelLineOffset
:
20
,
axisLabelLineOffset
:
20
,
legendOffset
:
34
,
},
},
xTicks
:
8
,
xTicks
:
8
,
yTicks
:
3
,
yTicks
:
3
,
...
...
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