From 19e58c9c9246c8c60f3ce6f508b3f8afc165a292 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Wed, 24 Aug 2016 08:34:08 -0500 Subject: [PATCH 1/2] Move status icon out of build graph links --- CHANGELOG | 1 + app/views/projects/ci/builds/_build_pipeline.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 83a5d1727f33..92dd5d44f080 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ v 8.12.0 (unreleased) - Capitalize mentioned issue timeline notes (ClemMakesApps) - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger) - Adds response mime type to transaction metric action when it's not HTML + - Fix hover leading space bug in pipeline graph !5980 v 8.11.3 (unreleased) - Allow system info page to handle case where info is unavailable diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index ebdf60ae3707..b399811db1c4 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -3,12 +3,12 @@ .curve .build-content - if is_playable + = render_status_with_link('build', 'play') = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do - = render_status_with_link('build', 'play') = subject.name - elsif can?(current_user, :read_build, @project) + = render_status_with_link('build', subject.status) = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do - = render_status_with_link('build', subject.status) = subject.name - else = render_status_with_link('build', subject.status) -- GitLab From 3e1467ecdbea94dddd4ddaf167ebdcd87de76497 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Fri, 26 Aug 2016 17:34:21 -0500 Subject: [PATCH 2/2] Keep CI icons being clickable --- app/assets/stylesheets/pages/pipelines.scss | 8 ++++++++ app/views/projects/ci/builds/_build_pipeline.html.haml | 8 ++++---- .../_generic_commit_status_pipeline.html.haml | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 743fe89a9f4b..0dcf61dd2ddd 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -319,6 +319,14 @@ a { color: $layout-link-gray; + text-decoration: none; + + &:hover { + .ci-status-text { + text-decoration: underline; + } + } + } } diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index b399811db1c4..36fb0300aebc 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -3,13 +3,13 @@ .curve .build-content - if is_playable - = render_status_with_link('build', 'play') = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do - = subject.name + = render_status_with_link('build', 'play') + %span.ci-status-text= subject.name - elsif can?(current_user, :read_build, @project) - = render_status_with_link('build', subject.status) = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do - = subject.name + = render_status_with_link('build', subject.status) + %span.ci-status-text= subject.name - else = render_status_with_link('build', subject.status) = ci_icon_for_status(subject.status) diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml index 584c0fa18ae4..31d40f6ad032 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml @@ -3,7 +3,7 @@ - if subject.target_url - link_to subject.target_url do = render_status_with_link('commit status', subject.status) - = subject.name + %span.ci-status-text= subject.name - else = render_status_with_link('commit status', subject.status) - = subject.name + %span.ci-status-text= subject.name -- GitLab