From a2a16503a8ecfe1b38f6ef8e31c96b53537dfe02 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 12 Dec 2016 12:12:37 +0000
Subject: [PATCH] Fix vertical alignment of action icon with status icon
---
app/assets/stylesheets/pages/pipelines.scss | 42 +++++++++------------
app/views/projects/stage/_graph.html.haml | 3 +-
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 304a7932a06..75b127eb7f6 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -654,6 +654,7 @@
i {
font-size: 11px;
+ margin-top: 0;
}
}
@@ -672,33 +673,26 @@
}
// Action Icons
-.ci-action-icon-container {
- padding: 0;
+.ci-action-icon-container .ci-action-icon-wrapper {
+ float: right;
+ margin-top: -1px;
- .ci-action-icon-wrapper {
- display: inline-block;
- float: right;
-
- i {
- color: $stage-badge-text;
- border-radius: 100%;
- border: 1px solid $stage-badge-text;
- text-align: center;
- display: table-cell;
- vertical-align: middle;
- padding: 5px;
- font-size: 13px;
- background: $white-light;
+ i {
+ color: $stage-badge-text;
+ border-radius: 100%;
+ border: 1px solid $stage-badge-text;
+ padding: 5px 6px;
+ font-size: 13px;
+ background: $white-light;
- &:hover {
- color: $gl-text-color;
- background-color: $stage-hover-bg;
- border: 1px solid $stage-hover-bg;
- }
+ &:hover {
+ color: $gl-text-color;
+ background-color: $stage-hover-bg;
+ border: 1px solid $stage-hover-bg;
}
+ }
- .ci-play-icon {
- padding: 5px 4px 5px 7px;
- }
+ .ci-play-icon {
+ padding: 5px 5px 5px 7px;
}
}
diff --git a/app/views/projects/stage/_graph.html.haml b/app/views/projects/stage/_graph.html.haml
index 255091cbfe8..cf3050eea63 100644
--- a/app/views/projects/stage/_graph.html.haml
+++ b/app/views/projects/stage/_graph.html.haml
@@ -10,8 +10,7 @@
- status_groups.each do |group_name, grouped_statuses|
- if grouped_statuses.one?
- status = grouped_statuses.first
- - is_playable = status.playable? && can?(current_user, :update_build, @project)
- %li.build{ class: ("playable" if is_playable) }
+ %li.build
.curve
.build-content
= render 'ci/status/graph_icon_with_name_and_action', subject: status
--
GitLab