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
Léo-Paul Géneau
gitlab-ce
Commits
5a211152
Commit
5a211152
authored
Jun 20, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New logo/color for login screen
parent
c54d07b9
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
14 deletions
+18
-14
app/assets/images/login-logo.png
app/assets/images/login-logo.png
+0
-0
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+1
-1
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/edit.html.haml
+0
-1
app/views/devise/passwords/new.html.erb
app/views/devise/passwords/new.html.erb
+0
-9
app/views/devise/passwords/new.html.haml
app/views/devise/passwords/new.html.haml
+11
-0
app/views/devise/registrations/new.html.haml
app/views/devise/registrations/new.html.haml
+2
-1
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+2
-2
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+2
-0
No files found.
app/assets/images/login-logo.png
View replaced file @
c54d07b9
View file @
5a211152
1.4 KB
|
W:
|
H:
9.97 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/assets/stylesheets/sections/login.scss
View file @
5a211152
/* Login Page */
/* Login Page */
body
.login-page
{
body
.login-page
{
background
:
#
EEE
;
background
:
#
474D57
;
.container
.content
{
padding-top
:
5%
;
}
.container
.content
{
padding-top
:
5%
;
}
}
}
...
...
app/views/devise/passwords/edit.html.haml
View file @
5a211152
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
,
class:
"login-box"
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
,
class:
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
%h3
Change your password
%h3
Change your password
=
devise_error_messages!
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
=
f
.
hidden_field
:reset_password_token
...
...
app/views/devise/passwords/new.html.erb
deleted
100644 → 0
View file @
c54d07b9
<%=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
class:
"login-box"
,
method: :post
})
do
|
f
|
%>
<%=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
%>
<%=
devise_error_messages!
%>
<%=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"text"
%>
<br/>
<br/>
<%=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
%>
<div
class=
"pull-right"
>
<%=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn"
%>
<br
/></div>
<%
end
%>
app/views/devise/passwords/new.html.haml
0 → 100644
View file @
5a211152
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
class:
"login-box"
,
method: :post
})
do
|
f
|
%h3
.page_title
Reset password
%br
=
devise_error_messages!
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"text"
%br
/
%br
/
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
.pull-right
=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn"
%br
/
app/views/devise/registrations/new.html.haml
View file @
5a211152
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
class:
"login-box"
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
class:
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
%h3
.page_title
Sign Up
%br
=
devise_error_messages!
=
devise_error_messages!
%div
%div
=
f
.
text_field
:name
,
class:
"text top"
,
placeholder:
"Name"
,
required:
true
=
f
.
text_field
:name
,
class:
"text top"
,
placeholder:
"Name"
,
required:
true
...
...
app/views/devise/sessions/new.html.haml
View file @
5a211152
.login-box
.login-box
=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
%h3
.page_title
Sing in
%br
-
if
ldap_enabled?
-
if
ldap_enabled?
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
.active
%li
.active
...
...
app/views/layouts/devise.html.haml
View file @
5a211152
...
@@ -5,4 +5,6 @@
...
@@ -5,4 +5,6 @@
=
render
"layouts/flash"
=
render
"layouts/flash"
.container
.container
.content
.content
%center
=
image_tag
image_path
"login-logo.png"
=
yield
=
yield
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