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
9694b992
Commit
9694b992
authored
Jul 14, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add margin between buttons if both retry and cancel are present
parent
94a08ec1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+6
-0
_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+7
-6
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
9694b992
...
...
@@ -128,6 +128,12 @@
color
:
$table-text-gray
;
}
.cancel-retry-btns
{
.btn
:not
(
:first-child
)
{
margin-left
:
8px
;
}
}
.dropdown-toggle
,
.dropdown-menu
{
color
:
$table-text-gray
;
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
9694b992
...
...
@@ -80,9 +80,10 @@
%span
Download '
#{
build
.
name
}
' artifacts
-
if
can?
(
current_user
,
:update_pipeline
,
@project
)
-
if
pipeline
.
retryable?
=
link_to
retry_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn has-tooltip'
,
title:
"Retry"
,
method: :post
do
=
icon
(
"repeat"
)
-
if
pipeline
.
cancelable?
=
link_to
cancel_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn btn-remove has-tooltip'
,
title:
"Cancel"
,
method: :post
do
=
icon
(
"remove"
)
.cancel-retry-btns
-
if
pipeline
.
retryable?
=
link_to
retry_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn has-tooltip'
,
title:
"Retry"
,
method: :post
do
=
icon
(
"repeat"
)
-
if
pipeline
.
cancelable?
=
link_to
cancel_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn btn-remove has-tooltip'
,
title:
"Cancel"
,
method: :post
do
=
icon
(
"remove"
)
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