kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Annabel Dunstone Gray 2018-12-13 15:21:39 +00:00
parent 81ddb69255 0fc2a55773
commit b5dbfbbac9
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/pages/login.scss
View File

@ -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 {

2
app/views/layouts/devise.html.haml
View File

@ -9,7 +9,7 @@
.container.navless-container
.content
= render "layouts/flash"
.row
.row.append-bottom-15
.col-sm-7.brand-holder
%h1
= brand_title

5
changelogs/unreleased/54736-sign-in-bottom-margin.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix login box bottom margins on signin page
merge_request: 23739
author: '@gear54'
type: fixed