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
iv
gitlab-ce
Commits
485e55f8
Commit
485e55f8
authored
Feb 05, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up devise views.
parent
0a9cab4e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
39 deletions
+27
-39
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+5
-0
app/views/devise/confirmations/new.html.haml
app/views/devise/confirmations/new.html.haml
+4
-3
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+6
-5
app/views/devise/passwords/new.html.haml
app/views/devise/passwords/new.html.haml
+4
-3
app/views/devise/registrations/new.html.haml
app/views/devise/registrations/new.html.haml
+7
-27
app/views/devise/shared/_signup_box.html.haml
app/views/devise/shared/_signup_box.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/login.scss
View file @
485e55f8
...
@@ -46,6 +46,10 @@
...
@@ -46,6 +46,10 @@
.login-footer
{
.login-footer
{
margin-top
:
10px
;
margin-top
:
10px
;
p
:last-child
{
margin-bottom
:
0
;
}
}
}
a
.forgot
{
a
.forgot
{
...
@@ -88,6 +92,7 @@
...
@@ -88,6 +92,7 @@
.devise-errors
{
.devise-errors
{
h2
{
h2
{
margin-top
:
0
;
font-size
:
14px
;
font-size
:
14px
;
color
:
#a00
;
color
:
#a00
;
}
}
...
...
app/views/devise/confirmations/new.html.haml
View file @
485e55f8
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
=
devise_error_messages!
=
devise_error_messages!
.clearfix.append-bottom-20
.clearfix.append-bottom-20
=
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
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
.login-footer
=
render
'devise/shared/sign_in_link'
.clearfix.prepend-top-20
=
render
'devise/shared/sign_in_link'
app/views/devise/passwords/edit.html.haml
View file @
485e55f8
...
@@ -10,9 +10,10 @@
...
@@ -10,9 +10,10 @@
=
f
.
password_field
:password
,
class:
"form-control top"
,
placeholder:
"New password"
,
required:
true
=
f
.
password_field
:password
,
class:
"form-control top"
,
placeholder:
"New password"
,
required:
true
%div
%div
=
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
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
.login-footer
%p
.clearfix.prepend-top-20
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
%p
=
render
'devise/shared/sign_in_link'
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
=
render
'devise/shared/sign_in_link'
app/views/devise/passwords/new.html.haml
View file @
485e55f8
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
=
devise_error_messages!
=
devise_error_messages!
.clearfix.append-bottom-20
.clearfix.append-bottom-20
=
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
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
.login-footer
=
render
'devise/shared/sign_in_link'
.clearfix.prepend-top-20
=
render
'devise/shared/sign_in_link'
app/views/devise/registrations/new.html.haml
View file @
485e55f8
.login-box
=
render
'devise/shared/signup_box'
.login-heading
%h3
Sign up
.clearfix.prepend-top-20
.login-body
=
render
'devise/shared/sign_in_link'
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
))
do
|
f
|
%p
.devise-errors
%span
.light
Did not receive confirmation email?
=
devise_error_messages!
=
link_to
"Send again"
,
new_confirmation_path
(
resource_name
)
%div
\ No newline at end of file
=
f
.
text_field
:name
,
class:
"form-control top"
,
placeholder:
"Name"
,
required:
true
%div
=
f
.
text_field
:username
,
class:
"form-control middle"
,
placeholder:
"Username"
,
required:
true
%div
=
f
.
email_field
:email
,
class:
"form-control middle"
,
placeholder:
"Email"
,
required:
true
%div
=
f
.
password_field
:password
,
class:
"form-control middle"
,
placeholder:
"Password"
,
required:
true
%div
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm password"
,
required:
true
%div
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
.login-footer
%p
%span
.light
Have an account?
%strong
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
%p
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
)
app/views/devise/shared/_signup_box.html.haml
View file @
485e55f8
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
=
f
.
text_field
:username
,
class:
"form-control middle"
,
placeholder:
"Username"
,
required:
true
=
f
.
text_field
:username
,
class:
"form-control middle"
,
placeholder:
"Username"
,
required:
true
%div
%div
=
f
.
email_field
:email
,
class:
"form-control middle"
,
placeholder:
"Email"
,
required:
true
=
f
.
email_field
:email
,
class:
"form-control middle"
,
placeholder:
"Email"
,
required:
true
.form-group
#password-strength
.form-group
.append-bottom-20
#password-strength
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
id:
"user_password_sign_up"
,
placeholder:
"Password"
,
required:
true
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
id:
"user_password_sign_up"
,
placeholder:
"Password"
,
required:
true
%div
%div
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
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