Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
225c1c12
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,发现更多精彩内容 >>
未验证
提交
225c1c12
编写于
1月 16, 2018
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace pipeline's action icons with svg
上级
9e70ff34
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
21 deletion
+14
-21
app/assets/javascripts/pipelines/components/async_button.vue
app/assets/javascripts/pipelines/components/async_button.vue
+5
-7
app/assets/javascripts/pipelines/components/pipelines_actions.vue
...ts/javascripts/pipelines/components/pipelines_actions.vue
+5
-3
app/assets/javascripts/pipelines/components/pipelines_table_row.vue
.../javascripts/pipelines/components/pipelines_table_row.vue
+1
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-7
spec/javascripts/pipelines/async_button_spec.js
spec/javascripts/pipelines/async_button_spec.js
+3
-3
未找到文件。
app/assets/javascripts/pipelines/components/async_button.vue
浏览文件 @
225c1c12
...
...
@@ -3,6 +3,7 @@
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
icon
from
'
../../vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
...
...
@@ -11,6 +12,7 @@
},
components
:
{
loadingIcon
,
icon
,
},
props
:
{
endpoint
:
{
...
...
@@ -41,9 +43,6 @@
};
},
computed
:
{
iconClass
()
{
return
`fa fa-
${
this
.
icon
}
`
;
},
buttonClass
()
{
return
`btn
${
this
.
cssClass
}
`
;
},
...
...
@@ -76,10 +75,9 @@
data-container=
"body"
data-placement=
"top"
:disabled=
"isLoading"
>
<i
:class=
"iconClass"
aria-hidden=
"true"
>
</i>
<icon
:name=
"icon"
/>
<loading-icon
v-if=
"isLoading"
/>
</button>
</
template
>
app/assets/javascripts/pipelines/components/pipelines_actions.vue
浏览文件 @
225c1c12
<
script
>
import
playIconSvg
from
'
icons/_icon_play.svg
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
icon
from
'
../../vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
...
...
@@ -10,6 +10,7 @@
},
components
:
{
loadingIcon
,
icon
,
},
props
:
{
actions
:
{
...
...
@@ -19,7 +20,6 @@
},
data
()
{
return
{
playIconSvg
,
isLoading
:
false
,
};
},
...
...
@@ -52,7 +52,9 @@
aria-label=
"Manual job"
:disabled=
"isLoading"
>
<span
v-html=
"playIconSvg"
></span>
<icon
name=
"play"
/>
<i
class=
"fa fa-caret-down"
aria-hidden=
"true"
>
...
...
app/assets/javascripts/pipelines/components/pipelines_table_row.vue
浏览文件 @
225c1c12
...
...
@@ -312,7 +312,7 @@
:endpoint=
"pipeline.cancel_path"
css-class=
"js-pipelines-cancel-button btn-remove"
title=
"Cancel"
icon=
"
remov
e"
icon=
"
clos
e"
confirm-action-message=
"Are you sure you want to cancel this pipeline?"
/>
</div>
...
...
app/assets/stylesheets/pages/pipelines.scss
浏览文件 @
225c1c12
...
...
@@ -69,13 +69,6 @@
border-color
:
$border-white-normal
;
}
}
.btn
{
.icon-play
{
height
:
13px
;
width
:
12px
;
}
}
}
.btn
.text-center
{
...
...
spec/javascripts/pipelines/async_button_spec.js
浏览文件 @
225c1c12
...
...
@@ -13,7 +13,7 @@ describe('Pipelines Async Button', () => {
propsData
:
{
endpoint
:
'
/foo
'
,
title
:
'
Foo
'
,
icon
:
'
fa fa-foo
'
,
icon
:
'
repeat
'
,
cssClass
:
'
bar
'
,
},
}).
$mount
();
...
...
@@ -23,8 +23,8 @@ describe('Pipelines Async Button', () => {
expect
(
component
.
$el
.
tagName
).
toEqual
(
'
BUTTON
'
);
});
it
(
'
should render
the provided
icon
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
i
'
).
getAttribute
(
'
class
'
)).
toContain
(
'
fa fa-foo
'
);
it
(
'
should render
svg
icon
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
svg
'
)).
not
.
toBeNull
(
);
});
it
(
'
should render the provided title
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录