Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
495c7fbe
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
495c7fbe
编写于
7月 04, 2017
作者:
J
Jose Ivan Vargas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup minor UX issues in the performance dashboard
上级
d6836a3b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
23 deletion
+40
-23
app/assets/javascripts/monitoring/components/monitoring_column.vue
...s/javascripts/monitoring/components/monitoring_column.vue
+8
-4
app/assets/javascripts/monitoring/components/monitoring_flag.vue
...ets/javascripts/monitoring/components/monitoring_flag.vue
+3
-3
app/assets/javascripts/monitoring/components/monitoring_legends.vue
.../javascripts/monitoring/components/monitoring_legends.vue
+5
-5
app/assets/javascripts/monitoring/utils/measurements.js
app/assets/javascripts/monitoring/utils/measurements.js
+6
-5
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+14
-6
changelogs/unreleased/34653-minor-ux-cleanups-for-performance-dashboard.yml
...sed/34653-minor-ux-cleanups-for-performance-dashboard.yml
+4
-0
未找到文件。
app/assets/javascripts/monitoring/components/monitoring_column.vue
浏览文件 @
495c7fbe
...
...
@@ -159,12 +159,12 @@
const
xAxis
=
d3
.
svg
.
axis
()
.
scale
(
axisXScale
)
.
ticks
(
measurements
.
t
icks
)
.
ticks
(
measurements
.
xT
icks
)
.
orient
(
'
bottom
'
);
const
yAxis
=
d3
.
svg
.
axis
()
.
scale
(
this
.
yScale
)
.
ticks
(
measurements
.
t
icks
)
.
ticks
(
measurements
.
yT
icks
)
.
orient
(
'
left
'
);
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.x-axis
'
).
call
(
xAxis
);
...
...
@@ -172,8 +172,12 @@
const
width
=
this
.
graphWidth
;
d3
.
select
(
this
.
$refs
.
baseSvg
).
select
(
'
.y-axis
'
).
call
(
yAxis
)
.
selectAll
(
'
.tick
'
)
.
each
(
function
createTickLines
()
{
d3
.
select
(
this
).
select
(
'
line
'
).
attr
(
'
x2
'
,
width
);
.
each
(
function
createTickLines
(
d
,
i
)
{
if
(
i
>
0
)
{
d3
.
select
(
this
).
select
(
'
line
'
)
.
attr
(
'
x2
'
,
width
)
.
attr
(
'
class
'
,
'
axis-tick
'
);
}
// Avoid adding the class to the first tick, to prevent coloring
});
// This will select all of the ticks once they're rendered
this
.
xScale
=
d3
.
time
.
scale
()
...
...
app/assets/javascripts/monitoring/components/monitoring_flag.vue
浏览文件 @
495c7fbe
...
...
@@ -87,14 +87,14 @@
</rect>
<text
class=
"text-metric text-metric-bold"
x=
"
8
"
x=
"
16
"
y=
"35"
transform=
"translate(-5, 20)"
>
{{
formatTime
}}
</text>
<text
class=
"text-metric
-date
"
x=
"
8
"
class=
"text-metric"
x=
"
16
"
y=
"15"
transform=
"translate(-5, 20)"
>
{{
formatDate
}}
...
...
app/assets/javascripts/monitoring/components/monitoring_legends.vue
浏览文件 @
495c7fbe
...
...
@@ -109,13 +109,13 @@
</text>
<rect
class=
"rect-axis-text"
:x=
"xPosition +
5
0"
:x=
"xPosition +
6
0"
:y=
"graphHeight - 80"
width=
"
50
"
width=
"
35
"
height=
"50"
>
</rect>
<text
class=
"label-axis-text"
class=
"label-axis-text
x-label-text
"
:x=
"xPosition + 60"
:y=
"yPosition"
dy=
".35em"
>
...
...
@@ -131,13 +131,13 @@
<text
class=
"text-metric-title"
x=
"50"
:y=
"graphHeight -
40
"
>
:y=
"graphHeight -
25
"
>
{{
legendTitle
}}
</text>
<text
class=
"text-metric-usage"
x=
"50"
:y=
"graphHeight -
25
"
>
:y=
"graphHeight -
10
"
>
{{
metricUsage
}}
</text>
</g>
...
...
app/assets/javascripts/monitoring/utils/measurements.js
浏览文件 @
495c7fbe
...
...
@@ -8,14 +8,14 @@ export default {
},
legends
:
{
width
:
15
,
height
:
30
,
height
:
25
,
},
backgroundLegend
:
{
width
:
30
,
height
:
50
,
},
axisLabelLineOffset
:
-
20
,
legendOffset
:
52
,
legendOffset
:
35
,
},
large
:
{
// This covers both md and lg screen sizes
margin
:
{
...
...
@@ -26,14 +26,15 @@ export default {
},
legends
:
{
width
:
20
,
height
:
3
5
,
height
:
3
0
,
},
backgroundLegend
:
{
width
:
30
,
height
:
150
,
},
axisLabelLineOffset
:
20
,
legendOffset
:
55
,
legendOffset
:
38
,
},
ticks
:
3
,
xTicks
:
8
,
yTicks
:
3
,
};
app/assets/stylesheets/pages/environments.scss
浏览文件 @
495c7fbe
...
...
@@ -187,8 +187,7 @@
}
.text-metric
{
font-weight
:
600
;
font-size
:
14px
;
font-size
:
12px
;
}
.selected-metric-line
{
...
...
@@ -232,10 +231,6 @@
width
:
100%
;
padding
:
0
;
padding-bottom
:
100%
;
.text-metric-bold
{
font-weight
:
600
;
}
}
.prometheus-svg-container
>
svg
{
...
...
@@ -250,6 +245,10 @@
stroke-width
:
0
;
}
.text-metric-bold
{
font-weight
:
600
;
}
.label-axis-text
,
.text-metric-usage
{
fill
:
$black
;
...
...
@@ -269,6 +268,15 @@
font-size
:
12px
;
}
.y-label-text
,
.x-label-text
{
fill
:
$gray-darkest
;
}
.axis-tick
{
stroke
:
$gray-darker
;
}
@media
(
max-width
:
$screen-sm-max
)
{
.label-axis-text
,
.text-metric-usage
,
...
...
changelogs/unreleased/34653-minor-ux-cleanups-for-performance-dashboard.yml
0 → 100644
浏览文件 @
495c7fbe
---
title
:
Cleanup minor UX issues in the performance dashboard
merge_request
:
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录