Commit c10cf65b authored by Justin Ho Tuan Duong's avatar Justin Ho Tuan Duong Committed by Michael Lunøe

Polish jira_connect users UI

- Fix nav bar not rendering theme properly.
- Add avatar to user link.
- Adjust headings, margins and spacing of elements.
- Update margin between text and icon in external_link
helper.

Changelog: changed
parent c371e823
@import 'mixins_and_variables_and_functions'; @import '../themes/theme_indigo';
.jira-connect-users-container {
margin-left: auto;
margin-right: auto;
width: px-to-rem(350px);
}
.devise-layout-html body .navless-container {
@include media-breakpoint-down(xs) {
padding-top: 65px;
}
}
...@@ -5,7 +5,7 @@ module ExternalLinkHelper ...@@ -5,7 +5,7 @@ module ExternalLinkHelper
def external_link(body, url, options = {}) def external_link(body, url, options = {})
link = link_to url, { target: '_blank', rel: 'noopener noreferrer' }.merge(options) do link = link_to url, { target: '_blank', rel: 'noopener noreferrer' }.merge(options) do
"#{body}#{sprite_icon('external-link', css_class: 'gl-ml-1')}".html_safe "#{body}#{sprite_icon('external-link', css_class: 'gl-ml-2')}".html_safe
end end
sanitize(link, tags: %w(a svg use), attributes: %w(target rel data-testid class href).concat(options.stringify_keys.keys)) sanitize(link, tags: %w(a svg use), attributes: %w(target rel data-testid class href).concat(options.stringify_keys.keys))
end end
......
.jira-connect-users-container.gl-text-center .gl-text-center.gl-mx-auto.gl-pt-6
- user_link = link_to(current_user.to_reference, user_path(current_user), target: '_blank', rel: 'noopener noreferrer') %h3.gl-mb-4
%h2= _('You are signed in to GitLab as %{user_link}').html_safe % { user_link: user_link } = _('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: '<br>'.html_safe }
- if @jira_app_link - if @jira_app_link
%p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-confirm' %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-confirm'
......
...@@ -20369,9 +20369,6 @@ msgstr "" ...@@ -20369,9 +20369,6 @@ msgstr ""
msgid "Integrations|You can close this window." msgid "Integrations|You can close this window."
msgstr "" msgstr ""
msgid "Integrations|You can now close this window and return to the GitLab for Jira application."
msgstr ""
msgid "Integrations|You can use this alias in your Slack commands" msgid "Integrations|You can use this alias in your Slack commands"
msgstr "" msgstr ""
...@@ -21506,6 +21503,9 @@ msgstr "" ...@@ -21506,6 +21503,9 @@ msgstr ""
msgid "JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}" msgid "JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}"
msgstr "" msgstr ""
msgid "JiraService|You can now close this window and%{br}return to the GitLab for Jira application."
msgstr ""
msgid "JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}" msgid "JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}"
msgstr "" msgstr ""
...@@ -42820,7 +42820,7 @@ msgstr "" ...@@ -42820,7 +42820,7 @@ msgstr ""
msgid "You are receiving this message because you are a GitLab administrator for %{url}." msgid "You are receiving this message because you are a GitLab administrator for %{url}."
msgstr "" msgstr ""
msgid "You are signed in to GitLab as %{user_link}" msgid "You are signed in to GitLab as:"
msgstr "" msgstr ""
msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico." msgid "You are trying to upload something other than an image. Please upload a .png, .jpg, .jpeg, .gif, .bmp, .tiff or .ico."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment