Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
499063a8
Commit
499063a8
authored
Dec 13, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
66affd99
b5dbfbba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/stylesheets/pages/login.scss
app/assets/stylesheets/pages/login.scss
+3
-2
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+1
-1
changelogs/unreleased/54736-sign-in-bottom-margin.yml
changelogs/unreleased/54736-sign-in-bottom-margin.yml
+5
-0
No files found.
app/assets/stylesheets/pages/login.scss
View file @
499063a8
...
...
@@ -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
{
...
...
app/views/layouts/devise.html.haml
View file @
499063a8
...
...
@@ -10,7 +10,7 @@
.container.navless-container
.content
=
render
"layouts/flash"
.row
.row
.append-bottom-15
.col-sm-7.brand-holder
%h1
=
brand_title
...
...
changelogs/unreleased/54736-sign-in-bottom-margin.yml
0 → 100644
View file @
499063a8
---
title
:
Fix login box bottom margins on signin page
merge_request
:
23739
author
:
'
@gear54'
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment