diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-07 21:32:17 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-07 21:32:17 +0000 |
| commit | 8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7 (patch) | |
| tree | 43d97fb1751eb11a02ad5ad41e7228960650d30e | |
| parent | be92230c424c8673f80c4b28cd853db706df37d7 (diff) | |
| parent | d6f592b75b25a2dc520e6c516115b8a202bddf55 (diff) | |
| download | gitlab-ce-8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7.tar.gz | |
Merge branch 'gt-align-sign-in-button' into 'master'
Align sign in button
Closes #53673
See merge request gitlab-org/gitlab-ce!22888
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/gt-align-sign-in-button.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index b7d69539eb7..474ef25cef7 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -71,7 +71,7 @@ = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = icon('user-secret') - if header_link?(:sign_in) - %li.nav-item + %li.nav-item.m-auto %div - sign_in_text = allow_signup? ? _('Sign in / Register') : _('Sign in') = link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' diff --git a/changelogs/unreleased/gt-align-sign-in-button.yml b/changelogs/unreleased/gt-align-sign-in-button.yml new file mode 100644 index 00000000000..a51fa319231 --- /dev/null +++ b/changelogs/unreleased/gt-align-sign-in-button.yml @@ -0,0 +1,5 @@ +--- +title: Align sign in button +merge_request: 22888 +author: George Tsiolis +type: fixed |