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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
e72fe97e
Commit
e72fe97e
authored
Jul 16, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align cancel and retry buttons
parent
1395edc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+2
-0
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
e72fe97e
...
@@ -129,6 +129,8 @@
...
@@ -129,6 +129,8 @@
}
}
.cancel-retry-btns
{
.cancel-retry-btns
{
vertical-align
:
middle
;
.btn
:not
(
:first-child
)
{
.btn
:not
(
:first-child
)
{
margin-left
:
8px
;
margin-left
:
8px
;
}
}
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
e72fe97e
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
%span
Download '
#{
build
.
name
}
' artifacts
%span
Download '
#{
build
.
name
}
' artifacts
-
if
can?
(
current_user
,
:update_pipeline
,
@project
)
-
if
can?
(
current_user
,
:update_pipeline
,
@project
)
.cancel-retry-btns
.cancel-retry-btns
.inline
-
if
pipeline
.
retryable?
-
if
pipeline
.
retryable?
=
link_to
retry_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn has-tooltip'
,
title:
"Retry"
,
method: :post
do
=
link_to
retry_namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
),
class:
'btn has-tooltip'
,
title:
"Retry"
,
method: :post
do
=
icon
(
"repeat"
)
=
icon
(
"repeat"
)
...
...
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