diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-12-13 15:21:39 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-12-13 15:21:39 +0000 |
| commit | b5dbfbbac90d067c51f9d2bb80fa5b368ae21548 (patch) | |
| tree | 24d37f187b6c22f86c68216a38186840713e4337 | |
| parent | 81ddb69255f36bccd79c714a2c12d542cf782f8d (diff) | |
| parent | 0fc2a55773fcc76054241e2ca11b7a4751ada3c1 (diff) | |
| download | gitlab-ce-b5dbfbbac90d067c51f9d2bb80fa5b368ae21548.tar.gz | |
Merge branch '54736-sign-in-bottom-margin' into 'master'
Add margin to .row on signin page and fix missing border-radius
Closes #54736
See merge request gitlab-org/gitlab-ce!23739
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 5 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/54736-sign-in-bottom-margin.yml | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index fa0ab1a3bae..67d7a8175ac 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -49,8 +49,8 @@ .login-box, .omniauth-container { box-shadow: 0 0 0 1px $border-color; - border-bottom-right-radius: 2px; - border-bottom-left-radius: 2px; + border-bottom-right-radius: $border-radius-small; + border-bottom-left-radius: $border-radius-small; padding: 15px; .login-heading h3 { @@ -95,6 +95,7 @@ } .omniauth-container { + border-radius: $border-radius-small; font-size: 13px; p { diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 43bd07679ba..4f8db74382f 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -9,7 +9,7 @@ .container.navless-container .content = render "layouts/flash" - .row + .row.append-bottom-15 .col-sm-7.brand-holder %h1 = brand_title diff --git a/changelogs/unreleased/54736-sign-in-bottom-margin.yml b/changelogs/unreleased/54736-sign-in-bottom-margin.yml new file mode 100644 index 00000000000..32b5b44fe35 --- /dev/null +++ b/changelogs/unreleased/54736-sign-in-bottom-margin.yml @@ -0,0 +1,5 @@ +--- +title: Fix login box bottom margins on signin page +merge_request: 23739 +author: '@gear54' +type: fixed |