diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-24 16:33:52 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-24 16:33:52 +0000 |
commit | 645567120185eaccc841bb41e62495ab7da0df17 (patch) | |
tree | c58009824aa6646e4c4a88b49c1d52751b6e467b | |
parent | 5cb275942946936eed3391f83252ae86108bc6ab (diff) | |
parent | 85062dfd258179021205ff9a22aa3a9d089de40b (diff) | |
download | gitlab-ce-645567120185eaccc841bb41e62495ab7da0df17.tar.gz |
Merge branch 'sign_in_forgot_password' into 'master'
Fix sign in page Forgot your password link overlap
## What does this MR do?
Fix Sign in page 'Forgot your password?' link overlaping on medium-large screens
## Why was this MR needed?
Overlapping text as per #23630
## Screenshots (if relevant)
![sign-in-page](/uploads/a94084297e447fe58f0af6f199e74248/sign-in-page.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#23630
See merge request !7059
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/login.scss | 7 | ||||
-rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ae578852fde..0f02cc1f102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Simpler arguments passed to named_route on toggle_award_url helper method - 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 - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 9496234c773..8dac6ab999e 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -286,6 +286,13 @@ .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) |