diff options
Diffstat (limited to 'app/views/devise/shared')
| -rw-r--r-- | app/views/devise/shared/_footer.html.haml | 3 | ||||
| -rw-r--r-- | app/views/devise/shared/_language_switcher.html.haml | 3 | ||||
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/devise/shared/_footer.html.haml b/app/views/devise/shared/_footer.html.haml index 10cfc07a719..0744faa148c 100644 --- a/app/views/devise/shared/_footer.html.haml +++ b/app/views/devise/shared/_footer.html.haml @@ -1,9 +1,10 @@ %hr.footer-fixed -.container.footer-container +.container.footer-container.gl-display-flex.gl-justify-content-space-between .footer-links - unless public_visibility_restricted? = link_to _("Explore"), explore_root_path = link_to _("Help"), help_path = link_to _("About GitLab"), "https://#{ApplicationHelper.promo_host}" = link_to _("Community forum"), ApplicationHelper.community_forum, target: '_blank', class: 'text-nowrap', rel: 'noopener noreferrer' + = render 'devise/shared/language_switcher' = footer_message diff --git a/app/views/devise/shared/_language_switcher.html.haml b/app/views/devise/shared/_language_switcher.html.haml new file mode 100644 index 00000000000..4c47e3efd0f --- /dev/null +++ b/app/views/devise/shared/_language_switcher.html.haml @@ -0,0 +1,3 @@ +- return unless ::Feature.enabled?(:preferred_language_switcher) + +.js-language-switcher{ data: { locales: ordered_selectable_locales.to_json } } diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index b9c9c99bf1a..a3a5fe690a7 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -44,7 +44,6 @@ .form-group = f.label :email, class: "label-bold #{'gl-mb-1' if Feature.enabled?(:restyle_login_page, @project)}" = f.email_field :email, - value: @invite_email, class: 'form-control gl-form-input middle js-validate-email', data: { qa_selector: 'new_user_email_field' }, required: true, |