Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-24 19:33:52 +0300
committerFatih Acet <acetfatih@gmail.com>2016-10-24 19:33:52 +0300
commit645567120185eaccc841bb41e62495ab7da0df17 (patch)
treec58009824aa6646e4c4a88b49c1d52751b6e467b /app/views
parent5cb275942946936eed3391f83252ae86108bc6ab (diff)
parent85062dfd258179021205ff9a22aa3a9d089de40b (diff)
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
Diffstat (limited to 'app/views')
-rw-r--r--app/views/devise/sessions/_new_base.html.haml2
1 files changed, 1 insertions, 1 deletions
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)