diff options
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/status.scss | 23 | ||||
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
5 files changed, 25 insertions, 27 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index ed45ac87f54..fbff0c97355 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -196,16 +196,6 @@ .merge-request-title { margin-bottom: 2px; - - .ci-status-link { - - svg { - height: 13px; - width: 13px; - position: relative; - top: 2px; - } - } } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 8d411bd658b..9cfd8d49318 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -49,6 +49,14 @@ .commit-link { + .ci-running { + + svg { + top: 1px; + margin-right: 0; + } + } + a:hover { text-decoration: none; } @@ -123,7 +131,7 @@ right: 1px; } } - + .stage-cell { svg { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 5572999d19c..ea9f7cf0540 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -536,13 +536,6 @@ pre.light-well { .ci-status { margin-right: $gl-padding; - - &.ci-running { - - svg { - margin-right: 3px; - } - } } .commit-row-message { diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 8f3d9362a0a..a0e008c98e5 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -41,14 +41,6 @@ color: $blue-normal; border-color: $blue-normal; } - - svg { - width: 13px; - height: 13px; - position: relative; - top: 1px; - margin-left: 3px; - } } .ci-status-icon-success { @@ -70,3 +62,18 @@ color: $gl-gray; } } + +.ci-running, +.ci-status-icon-running { + svg { + height: 13px; + width: 13px; + position: relative; + top: 2px; + margin: 0 3px; + } + + &:hover { + text-decoration: none; + } +} diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 26c4ffd2bd4..7ae699832f6 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -35,7 +35,7 @@ - stages_status = pipeline.statuses.latest.stages_status - stages.each do |stage| - %td.stage-cell + %td - status = stages_status[stage] - tooltip = "#{stage.titleize}: #{status || 'not found'}" - if status |