diff options
| author | Bernardo Anderson <bernardodsanderson@gmail.com> | 2016-10-22 14:20:13 -0500 |
|---|---|---|
| committer | Bernardo Anderson <bernardodsanderson@gmail.com> | 2016-10-22 14:20:13 -0500 |
| commit | 3b7ca69e530d684faf89a8dc1ea48c26eed5ccb7 (patch) | |
| tree | 4afd1ac01950819b59ee41aba45736653e4a0724 | |
| parent | baec0353df64d75455aa90f7f2f6efbf7f2f6920 (diff) | |
| download | gitlab-ce-3b7ca69e530d684faf89a8dc1ea48c26eed5ccb7.tar.gz | |
Fix sign in page Forgot your password link overlap
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 6 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c39ddca7cf..d4a975e6c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix: Backup restore doesn't clear cache - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method + - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens ## 8.13.0 (2016-10-22) diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index bdb13bee178..51048649383 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -255,6 +255,12 @@ .new_user { position: relative; padding-bottom: 35px; + @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + .forgot-password { + float: none !important; + margin-top: 5px; + } + } } .move-submit-down { diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 525e7d99d71..5fd896f6835 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -12,5 +12,5 @@ %label{for: "user_remember_me"} = f.check_box :remember_me %span Remember me - .pull-right + .pull-right.forgot-password = link_to "Forgot your password?", new_password_path(resource_name) |