From da6cd333e7d29b356b398905c657be81a94b4621 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 6 Apr 2022 18:08:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/jira_connect/users/show.html.haml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/views/jira_connect') diff --git a/app/views/jira_connect/users/show.html.haml b/app/views/jira_connect/users/show.html.haml index cf88acd6976..29805a2c42d 100644 --- a/app/views/jira_connect/users/show.html.haml +++ b/app/views/jira_connect/users/show.html.haml @@ -1,8 +1,14 @@ -.jira-connect-users-container.gl-text-center - - user_link = link_to(current_user.to_reference, user_path(current_user), target: '_blank', rel: 'noopener noreferrer') - %h2= _('You are signed in to GitLab as %{user_link}').html_safe % { user_link: user_link } +.gl-text-center.gl-mx-auto.gl-pt-6 + %h3.gl-mb-4 + = _('You are signed in to GitLab as:') - %p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.') + .gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-mb-4 + = link_to user_path(current_user), target: '_blank', rel: 'noopener noreferrer' do + = user_avatar_without_link(user: current_user, size: 60, css_class: 'gl-mr-0! gl-mb-2', has_tooltip: false) + = link_to current_user.to_reference, user_path(current_user), target: '_blank', rel: 'noopener noreferrer' + + %p.gl-mb-6 + = s_('JiraService|You can now close this window and%{br}return to the GitLab for Jira application.').html_safe % { br: '
'.html_safe } - if @jira_app_link %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-confirm' -- cgit v1.2.3