diff options
| author | Jedidiah <hello@jedidiah.eu> | 2017-09-14 17:58:15 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 17:58:15 +0000 |
| commit | 3140006355e35663ca0f4f6e2b4a2157d39480cd (patch) | |
| tree | 95211ff7b76b11c9a26613b19a7374f98a02cc42 | |
| parent | ef37de8adb4e846db5bf7816e3f55f43b1305a03 (diff) | |
| download | gitlab-ce-3140006355e35663ca0f4f6e2b4a2157d39480cd.tar.gz | |
Add missing classes to omniauth remember-me checkbox and add correct font-size
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index d4dc43035eb..cf5f933a762 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -95,6 +95,8 @@ } .omniauth-container { + font-size: 13px; + p { margin: 0; } diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index bfd7dd25a7d..546cec4d565 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -7,6 +7,8 @@ %span.light - has_icon = provider_has_icon?(provider) = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}" - %fieldset.prepend-top-10 - = check_box_tag :remember_me - = label_tag :remember_me, 'Remember me' + %fieldset.prepend-top-10.checkbox.remember-me + %label + = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox' + %span + Remember me diff --git a/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml b/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml new file mode 100644 index 00000000000..34aa3d0db6f --- /dev/null +++ b/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml @@ -0,0 +1,5 @@ +--- +title: Made the "remember me" check boxes have consistent styles and alignment +merge_request: +author: Jedidiah Broadbent +type: fixed |