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
Jérome Perrin
gitlab-ce
Commits
a379bd00
Commit
a379bd00
authored
Jan 01, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style devise views
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5b2aa853
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
64 additions
and
60 deletions
+64
-60
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+48
-45
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+2
-1
app/views/devise/confirmations/new.html.haml
app/views/devise/confirmations/new.html.haml
+1
-1
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+2
-2
app/views/devise/passwords/new.html.haml
app/views/devise/passwords/new.html.haml
+1
-1
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
+2
-2
app/views/devise/sessions/_new_ldap.html.haml
app/views/devise/sessions/_new_ldap.html.haml
+2
-2
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/login.scss
View file @
a379bd00
/* Login Page */
/* Login Page */
body
.login-page
{
.login-page
{
.container
>
.content
{
h1
{
padding-top
:
20px
;
font-size
:
3em
;
font-weight
:
200
;
}
}
}
.login-box
{
width
:
304px
;
position
:
relative
;
@include
border-radius
(
5px
);
margin
:
auto
;
padding
:
20px
;
background
:
white
;
}
.login-box
.login-logo
{
margin
:
10px
0
30px
0
;
display
:
block
;
}
.login-box
input
.text
{
background-color
:
#f1f1f1
;
font-size
:
16px
;
@include
border-radius
(
0
);
padding
:
14px
10px
;
width
:
280px
}
.login-box
input
.text.top
{
@include
border-radius
(
5px
5px
0
0
);
margin-bottom
:
0px
;
}
.login-box
input
.text.bottom
{
.login-box
{
@include
border-radius
(
0
0
5px
5px
);
width
:
304px
;
border-top
:
0
;
position
:
relative
;
margin-bottom
:
20px
;
@include
border-radius
(
5px
);
}
margin
:
auto
;
padding
:
20px
;
.login-box
input
.text.middle
{
background
:
white
;
border-top
:
0
;
}
margin-bottom
:
0px
;
}
.login-box
a
.forgot
{
float
:
right
;
padding-top
:
6px
}
.login-logo
{
margin
:
10px
0
30px
0
;
display
:
block
;
}
.remember_me
{
.form-control
{
text-align
:
left
;
background-color
:
#f1f1f1
;
font-size
:
16px
;
padding
:
14px
10px
;
width
:
280px
;
height
:
auto
;
&
.top
{
@include
border-radius
(
5px
5px
0
0
);
margin-bottom
:
0px
;
}
&
.bottom
{
@include
border-radius
(
0
0
5px
5px
);
border-top
:
0
;
margin-bottom
:
20px
;
}
&
.middle
{
border-top
:
0
;
margin-bottom
:
0px
;
@include
border-radius
(
0
);
}
}
input
{
.login-box
a
.forgot
{
margin
:
2px
;
float
:
right
;
padding-top
:
6px
}
}
}
.devise-errors
{
.devise-errors
{
h2
{
h2
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#a00
;
color
:
#a00
;
}
}
}
}
}
app/assets/stylesheets/sections/notes.scss
View file @
a379bd00
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* Notes
* Notes
*/
*/
@-webkit-keyframes
targe
t
-note
{
@-webkit-keyframes
targe
3
-note
{
from
{
background
:
#fffff0
;
}
from
{
background
:
#fffff0
;
}
50
%
{
background
:
#ffffd3
;
}
50
%
{
background
:
#ffffd3
;
}
to
{
background
:
#fffff0
;
}
to
{
background
:
#fffff0
;
}
...
@@ -80,6 +80,7 @@ ul.notes {
...
@@ -80,6 +80,7 @@ ul.notes {
overflow
:
hidden
;
overflow
:
hidden
;
display
:
block
;
display
:
block
;
position
:relative
;
position
:relative
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
p
{
color
:
$style_color
;
}
p
{
color
:
$style_color
;
}
.avatar
{
.avatar
{
...
...
app/views/devise/confirmations/new.html.haml
View file @
a379bd00
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
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!
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"
text
"
,
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'
%hr
%hr
...
...
app/views/devise/passwords/edit.html.haml
View file @
a379bd00
...
@@ -4,9 +4,9 @@
...
@@ -4,9 +4,9 @@
=
devise_error_messages!
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
=
f
.
hidden_field
:reset_password_token
%div
%div
=
f
.
password_field
:password
,
class:
"
text
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:
"
text
bottom"
,
placeholder:
"Confirm new password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"
form-control
bottom"
,
placeholder:
"Confirm new password"
,
required:
true
%div
%div
.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"
...
...
app/views/devise/passwords/new.html.haml
View file @
a379bd00
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%h3
.page-title
Reset password
%h3
.page-title
Reset password
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"
text
"
,
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"
%hr
%hr
...
...
app/views/devise/registrations/new.html.haml
View file @
a379bd00
...
@@ -3,15 +3,15 @@
...
@@ -3,15 +3,15 @@
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
%div
%div
=
f
.
text_field
:name
,
class:
"
text
top"
,
placeholder:
"Name"
,
required:
true
=
f
.
text_field
:name
,
class:
"
form-control
top"
,
placeholder:
"Name"
,
required:
true
%div
%div
=
f
.
text_field
:username
,
class:
"
text
middle"
,
placeholder:
"Username"
,
required:
true
=
f
.
text_field
:username
,
class:
"
form-control
middle"
,
placeholder:
"Username"
,
required:
true
%div
%div
=
f
.
email_field
:email
,
class:
"
text
middle"
,
placeholder:
"Email"
,
required:
true
=
f
.
email_field
:email
,
class:
"
form-control
middle"
,
placeholder:
"Email"
,
required:
true
%div
%div
=
f
.
password_field
:password
,
class:
"
text
middle"
,
placeholder:
"Password"
,
required:
true
=
f
.
password_field
:password
,
class:
"
form-control
middle"
,
placeholder:
"Password"
,
required:
true
%div
%div
=
f
.
password_field
:password_confirmation
,
class:
"
text
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"
%hr
%hr
...
...
app/views/devise/sessions/_new_base.html.haml
View file @
a379bd00
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
=
f
.
text_field
:login
,
class:
"
text
top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
text_field
:login
,
class:
"
form-control
top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
password_field
:password
,
class:
"
text
bottom"
,
placeholder:
"Password"
=
f
.
password_field
:password
,
class:
"
form-control
bottom"
,
placeholder:
"Password"
-
if
devise_mapping
.
rememberable?
-
if
devise_mapping
.
rememberable?
.clearfix.append-bottom-10
.clearfix.append-bottom-10
%label
.checkbox.remember_me
{
for:
"user_remember_me"
}
%label
.checkbox.remember_me
{
for:
"user_remember_me"
}
...
...
app/views/devise/sessions/_new_ldap.html.haml
View file @
a379bd00
=
form_tag
(
user_omniauth_callback_path
(
:ldap
),
id:
'new_ldap_user'
)
do
=
form_tag
(
user_omniauth_callback_path
(
:ldap
),
id:
'new_ldap_user'
)
do
=
text_field_tag
:username
,
nil
,
{
class:
"
text
top"
,
placeholder:
"LDAP Login"
,
autofocus:
"autofocus"
}
=
text_field_tag
:username
,
nil
,
{
class:
"
form-control
top"
,
placeholder:
"LDAP Login"
,
autofocus:
"autofocus"
}
=
password_field_tag
:password
,
nil
,
{
class:
"
text
bottom"
,
placeholder:
"Password"
}
=
password_field_tag
:password
,
nil
,
{
class:
"
form-control
bottom"
,
placeholder:
"Password"
}
%br
/
%br
/
=
submit_tag
"LDAP Sign in"
,
class:
"btn-create btn"
=
submit_tag
"LDAP Sign in"
,
class:
"btn-create btn"
app/views/devise/sessions/new.html.haml
View file @
a379bd00
.login-box
.login-box
%h3
.page-title
Sign in
%h3
.page-title
Sign in
-
if
ldap_enabled?
-
if
ldap_enabled?
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-20
%li
.active
%li
.active
=
link_to
'LDAP'
,
'#tab-ldap'
,
'data-toggle'
=>
'tab'
=
link_to
'LDAP'
,
'#tab-ldap'
,
'data-toggle'
=>
'tab'
%li
%li
...
...
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