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
1e29b737
Commit
1e29b737
authored
May 24, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
5b0b43cc
83d80bc9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
app/assets/stylesheets/pages/login.scss
app/assets/stylesheets/pages/login.scss
+0
-7
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+7
-5
changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml
...in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml
+5
-0
No files found.
app/assets/stylesheets/pages/login.scss
View file @
1e29b737
...
...
@@ -21,13 +21,6 @@
color
:
$login-brand-holder-color
;
}
h1
:first-child
{
font-weight
:
$gl-font-weight-normal
;
margin-bottom
:
0
.68em
;
margin-top
:
0
;
font-size
:
34px
;
}
h3
{
font-size
:
22px
;
}
...
...
app/views/layouts/devise.html.haml
View file @
1e29b737
...
...
@@ -10,15 +10,17 @@
.container.navless-container
.content
=
render
"layouts/flash"
.row.
append-bottom-15
.col-sm-
7.brand-holder
%h1
.row.
mt-3
.col-sm-
12
%h1
.mb-3.font-weight-normal
=
brand_title
.row.mb-3
.col-sm-7.order-12.order-sm-1.brand-holder
=
brand_image
-
if
current_appearance
&
.
description?
=
brand_text
-
else
%h3
%h3
.mt-sm-0
=
_
(
'Open source software to collaborate on code'
)
%p
...
...
@@ -29,7 +31,7 @@
=
render_if_exists
'layouts/devise_help_text'
.col-sm-5.new-session-forms-container
.col-sm-5.
order-1.order-sm-12.
new-session-forms-container
=
yield
%hr
.footer-fixed
...
...
changelogs/unreleased/59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile.yml
0 → 100644
View file @
1e29b737
---
title
:
Prioritize login form on mobile breakpoint
merge_request
:
28360
author
:
type
:
changed
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