From 52ab4c585afbb7f790a2333575c0cdfe898c0098 Mon Sep 17 00:00:00 2001 From: Fernando Arias Date: Thu, 28 Jul 2022 00:13:56 -0500 Subject: [PATCH 1/2] Migrate project nothing to compare card to be pajamas compliant * Migrate haml markup to use view helper Changelog: changed --- app/views/projects/compare/show.html.haml | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index a6be6695b754c1..899794151bfc59 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -17,16 +17,17 @@ paginate_diffs: true, paginate_diffs_per_page: Projects::CompareController::COMMIT_DIFFS_PER_PAGE - else - .card.gl-bg-gray-50.gl-border-none.gl-p-2 - .center - %h4 - = s_("CompareBranches|There isn't anything to compare.") - %p.slead - - if params[:to] == params[:from] - - source_branch = capture do - %span.ref-name= params[:from] - - target_branch = capture do - %span.ref-name= params[:to] - = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe - - else - = _("You'll need to use different branch names to get a valid comparison.") + = render Pajamas::CardComponent.new(card_options: { class: 'gl-bg-gray-50 gl-mb-5' }) do |c| + - c.body do + .center + %h4 + = s_("CompareBranches|There isn't anything to compare.") + %p.slead + - if params[:to] == params[:from] + - source_branch = capture do + %span.ref-name= params[:from] + - target_branch = capture do + %span.ref-name= params[:to] + = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe + - else + = _("You'll need to use different branch names to get a valid comparison.") -- GitLab From a002b31cc629cf8683fe4249c06b8a13b9e41c6a Mon Sep 17 00:00:00 2001 From: Fernando Arias Date: Mon, 1 Aug 2022 16:28:31 -0500 Subject: [PATCH 2/2] Apply maintainer feedback * Replace classes with utility classes * Remove default card border --- app/views/projects/compare/show.html.haml | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 899794151bfc59..adb5cceb5d6dc4 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -17,17 +17,16 @@ paginate_diffs: true, paginate_diffs_per_page: Projects::CompareController::COMMIT_DIFFS_PER_PAGE - else - = render Pajamas::CardComponent.new(card_options: { class: 'gl-bg-gray-50 gl-mb-5' }) do |c| + = render Pajamas::CardComponent.new(card_options: { class: "gl-bg-gray-50 gl-mb-5 gl-border-none gl-text-center" }) do |c| - c.body do - .center - %h4 - = s_("CompareBranches|There isn't anything to compare.") - %p.slead - - if params[:to] == params[:from] - - source_branch = capture do - %span.ref-name= params[:from] - - target_branch = capture do - %span.ref-name= params[:to] - = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe - - else - = _("You'll need to use different branch names to get a valid comparison.") + %h4 + = s_("CompareBranches|There isn't anything to compare.") + %p.gl-mb-4.gl-line-height-24 + - if params[:to] == params[:from] + - source_branch = capture do + %span.ref-name= params[:from] + - target_branch = capture do + %span.ref-name= params[:to] + = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe + - else + = _("You'll need to use different branch names to get a valid comparison.") -- GitLab