diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-23 19:08:32 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-23 19:08:32 +0000 |
| commit | ca3759a5ebbf5c29757ae5089f1b3031d6420ab3 (patch) | |
| tree | 62268367f1a7e5269d7b2128eecac58ec515e7a3 | |
| parent | e83e4dbde8a2d713b6803b376a69ffa3237e6716 (diff) | |
| parent | 4014bc321a89b4ae11001889a301c55a02027747 (diff) | |
| download | gitlab-ce-ca3759a5ebbf5c29757ae5089f1b3031d6420ab3.tar.gz | |
Merge branch 'remember-me-missasligned-mobile' into 'master'
Corrected alignment for the remember-me checkbox in the login view
Closes #29012
See merge request !10162
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 8 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/remember-me-missasligned-mobile.yml | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 25d6fbe465a..2890fcd088b 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -211,3 +211,11 @@ label { color: $gl-text-color; } } + +@media(max-width: $screen-xs-max) { + .remember-me { + .remember-me-checkbox { + margin-top: 0; + } + } +} diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 5d359538efe..21c751a23f8 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -8,7 +8,7 @@ - if devise_mapping.rememberable? .remember-me.checkbox %label{ for: "user_remember_me" } - = f.check_box :remember_me + = f.check_box :remember_me, class: 'remember-me-checkbox' %span Remember me .pull-right.forgot-password = link_to "Forgot your password?", new_password_path(resource_name) diff --git a/changelogs/unreleased/remember-me-missasligned-mobile.yml b/changelogs/unreleased/remember-me-missasligned-mobile.yml new file mode 100644 index 00000000000..7071d32727f --- /dev/null +++ b/changelogs/unreleased/remember-me-missasligned-mobile.yml @@ -0,0 +1,4 @@ +--- +title: Corrected alignment for the remember-me checkbox in the login view +merge_request: +author: |