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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
d28a27f7
Commit
d28a27f7
authored
Aug 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaner UI for login/signup pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cb33279a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
50 additions
and
32 deletions
+50
-32
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+20
-1
app/views/devise/confirmations/new.html.haml
app/views/devise/confirmations/new.html.haml
+5
-5
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+5
-5
app/views/devise/passwords/new.html.haml
app/views/devise/passwords/new.html.haml
+5
-5
app/views/devise/registrations/new.html.haml
app/views/devise/registrations/new.html.haml
+5
-5
app/views/devise/sessions/_new_base.html.haml
app/views/devise/sessions/_new_base.html.haml
+3
-3
app/views/devise/sessions/_oauth_providers.html.haml
app/views/devise/sessions/_oauth_providers.html.haml
+1
-2
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+5
-5
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/login.scss
View file @
d28a27f7
...
@@ -6,6 +6,21 @@
...
@@ -6,6 +6,21 @@
}
}
.login-box
{
.login-box
{
padding
:
0
15px
;
.login-heading
h3
{
font-weight
:
300
;
line-height
:
2
;
}
.login-footer
{
margin-top
:
10px
;
}
.btn
{
padding
:
12px
!
important
;
@extend
.btn-block
;
}
}
}
.brand-image
{
.brand-image
{
...
@@ -19,7 +34,7 @@
...
@@ -19,7 +34,7 @@
}
}
}
}
.login-logo
{
.login-logo
{
margin
:
10px
0
30px
0
;
margin
:
10px
0
30px
0
;
display
:
block
;
display
:
block
;
}
}
...
@@ -64,4 +79,8 @@
...
@@ -64,4 +79,8 @@
color
:
#a00
;
color
:
#a00
;
}
}
}
}
.brand-holder
{
border-right
:
1px
solid
#EEE
;
}
}
}
app/views/devise/confirmations/new.html.haml
View file @
d28a27f7
.login-box
.panel.panel-default
.login-box
.
panel
-heading
.
login
-heading
%h3
.panel-title
Resend confirmation instructions
%h3
Resend confirmation instructions
.
panel
-body
.
login
-body
=
form_for
(
resource
,
as:
resource_name
,
url:
confirmation_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
confirmation_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
...
@@ -9,5 +9,5 @@
...
@@ -9,5 +9,5 @@
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"form-control"
,
required:
true
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"form-control"
,
required:
true
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
.
panel
-footer
.
login
-footer
=
render
'devise/shared/sign_in_link'
=
render
'devise/shared/sign_in_link'
app/views/devise/passwords/edit.html.haml
View file @
d28a27f7
.login-box
.panel.panel-default
.login-box
.
panel
-heading
.
login
-heading
%h3
.panel-title
Change your password
%h3
Change your password
.
panel
-body
.
login
-body
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
.
panel
-footer
.
login
-footer
%p
%p
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
=
render
'devise/shared/sign_in_link'
=
render
'devise/shared/sign_in_link'
app/views/devise/passwords/new.html.haml
View file @
d28a27f7
.login-box
.panel.panel-default
.login-box
.
panel
-heading
.
login
-heading
%h3
.panel-title
Reset password
%h3
Reset password
.
panel
-body
.
login
-body
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
...
@@ -9,5 +9,5 @@
...
@@ -9,5 +9,5 @@
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"form-control"
,
required:
true
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"form-control"
,
required:
true
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
.
panel
-footer
.
login
-footer
=
render
'devise/shared/sign_in_link'
=
render
'devise/shared/sign_in_link'
app/views/devise/registrations/new.html.haml
View file @
d28a27f7
.login-box
.panel.panel-success
.login-box
.
panel
-heading
.
login
-heading
%h3
.panel-title
Sign up
%h3
Sign up
.
panel
-body
.
login
-body
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
))
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
))
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm password"
,
required:
true
%div
%div
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
.
panel
-footer
.
login
-footer
%p
%p
%span
.light
%span
.light
Have an account?
Have an account?
...
...
app/views/devise/sessions/_new_base.html.haml
View file @
d28a27f7
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%label
.checkbox.remember_me
{
for:
"user_remember_me"
}
%label
.checkbox.remember_me
{
for:
"user_remember_me"
}
=
f
.
check_box
:remember_me
=
f
.
check_box
:remember_me
%span
Remember me
%span
Remember me
.pull-right
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
)
%div
%div
=
f
.
submit
"Sign in"
,
class:
"btn-save btn"
=
f
.
submit
"Sign in"
,
class:
"btn btn-save"
.pull-right
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
class:
"btn"
app/views/devise/sessions/_oauth_providers.html.haml
View file @
d28a27f7
-
providers
=
(
enabled_oauth_providers
-
[
:ldap
])
-
providers
=
(
enabled_oauth_providers
-
[
:ldap
])
-
if
providers
.
present?
-
if
providers
.
present?
%hr
%div
.light-well
{
:'data-no-turbolink'
=>
'data-no-turbolink'
}
%div
{
:'data-no-turbolink'
=>
'data-no-turbolink'
}
%span
Sign in with:
%span
Sign in with:
-
providers
.
each
do
|
provider
|
-
providers
.
each
do
|
provider
|
%span
%span
...
...
app/views/devise/sessions/new.html.haml
View file @
d28a27f7
.login-box
.panel.panel-primary
.login-box
.
panel
-heading
.
login
-heading
%h3
.panel-title
Sign in
%h3
Sign in
.
panel
-body
.
login
-body
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
.active
%li
.active
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
=
render
'devise/sessions/oauth_providers'
if
Gitlab
.
config
.
omniauth
.
enabled
&&
devise_mapping
.
omniauthable?
=
render
'devise/sessions/oauth_providers'
if
Gitlab
.
config
.
omniauth
.
enabled
&&
devise_mapping
.
omniauthable?
.
panel
-footer
.
login
-footer
-
if
gitlab_config
.
signup_enabled
-
if
gitlab_config
.
signup_enabled
%p
%p
%span
.light
%span
.light
...
...
app/views/layouts/devise.html.haml
View file @
d28a27f7
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
.container
.container
.content
.content
.row
.row
.col-md-7
.col-md-7
.brand-holder
-
if
brand_item
-
if
brand_item
.brand-image
.brand-image
=
brand_image
=
brand_image
...
...
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