BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
225c1c12
Unverified
Commit
225c1c12
authored
Jan 16, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace pipeline's action icons with svg
parent
9e70ff34
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
21 deletions
+14
-21
async_button.vue
app/assets/javascripts/pipelines/components/async_button.vue
+5
-7
pipelines_actions.vue
...ts/javascripts/pipelines/components/pipelines_actions.vue
+5
-3
pipelines_table_row.vue
.../javascripts/pipelines/components/pipelines_table_row.vue
+1
-1
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-7
async_button_spec.js
spec/javascripts/pipelines/async_button_spec.js
+3
-3
No files found.
app/assets/javascripts/pipelines/components/async_button.vue
View file @
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
View file @
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
View file @
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
View file @
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
View file @
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'
,
()
=>
{
...
...
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