Commit acbcbd4a authored by Fatih Acet's avatar Fatih Acet

Merge branch 'pipeline-row-improvements' into 'master'

Pipeline row improvements

## What does this MR do?
Makes minor pipeline row improvements:
* Add margin between labels
* Remove underline hover style on status button
* Add margin between buttons if both retry and cancel are present

## What are the relevant issue numbers?
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920

## Screenshots (if relevant)
![Screen_Shot_2016-07-14_at_12.31.54_PM](/uploads/ae88651cb240ea90a0be58ab0ed65805/Screen_Shot_2016-07-14_at_12.31.54_PM.png)

See merge request !5258
parents c49517a0 9694b992
...@@ -43,6 +43,13 @@ ...@@ -43,6 +43,13 @@
border-top-width: 1px; border-top-width: 1px;
} }
.commit-link {
a:hover {
text-decoration: none;
}
}
.branch-commit { .branch-commit {
.branch-name { .branch-name {
...@@ -80,7 +87,12 @@ ...@@ -80,7 +87,12 @@
margin-left: 0; margin-left: 0;
} }
.label {
margin-right: 4px;
}
.label-container { .label-container {
font-size: 0;
.label { .label {
margin-top: 5px; margin-top: 5px;
...@@ -116,6 +128,12 @@ ...@@ -116,6 +128,12 @@
color: $table-text-gray; color: $table-text-gray;
} }
.cancel-retry-btns {
.btn:not(:first-child) {
margin-left: 8px;
}
}
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu { .dropdown-menu {
color: $table-text-gray; color: $table-text-gray;
......
...@@ -80,9 +80,10 @@ ...@@ -80,9 +80,10 @@
%span Download '#{build.name}' artifacts %span Download '#{build.name}' artifacts
- if can?(current_user, :update_pipeline, @project) - if can?(current_user, :update_pipeline, @project)
- if pipeline.retryable? .cancel-retry-btns
= link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do - if pipeline.retryable?
= icon("repeat") = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do
- if pipeline.cancelable? = icon("repeat")
= link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do - if pipeline.cancelable?
= icon("remove") = 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")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment