BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7984d3ca
Commit
7984d3ca
authored
Aug 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI fixes for login page
parent
083990c7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
21 deletions
+14
-21
common.scss
app/assets/stylesheets/common.scss
+0
-14
login.scss
app/assets/stylesheets/sections/login.scss
+9
-1
new.html.haml
app/views/devise/passwords/new.html.haml
+0
-1
_new_base.html.haml
app/views/devise/sessions/_new_base.html.haml
+5
-4
new.html.haml
app/views/devise/sessions/new.html.haml
+0
-1
No files found.
app/assets/stylesheets/common.scss
View file @
7984d3ca
...
...
@@ -193,19 +193,6 @@ li.note {
}
}
.remember_me
{
text-align
:
left
;
input
{
margin
:
0
;
}
span
{
padding-left
:
5px
;
}
}
.rss-icon
{
img
{
width
:
24px
;
...
...
@@ -217,7 +204,6 @@ li.note {
}
}
.supp_diff_link
,
.show-all-commits
{
cursor
:
pointer
;
...
...
app/assets/stylesheets/sections/login.scss
View file @
7984d3ca
/* Login Page */
body
.login-page
{
background
:
#474D57
;
.container
.content
{
padding-top
:
5
%
;
}
.container
.content
{
padding-top
:
4
%
;
}
}
.login-box
{
...
...
@@ -37,3 +37,11 @@ body.login-page{
}
.login-box
a
.forgot
{
float
:
right
;
padding-top
:
6px
}
.remember_me
{
text-align
:
left
;
input
{
margin
:
2px
;
}
}
app/views/devise/passwords/new.html.haml
View file @
7984d3ca
=
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
/
...
...
app/views/devise/sessions/_new_base.html.haml
View file @
7984d3ca
...
...
@@ -2,12 +2,13 @@
=
f
.
text_field
:login
,
class:
"text top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
password_field
:password
,
class:
"text bottom"
,
placeholder:
"Password"
-
if
devise_mapping
.
rememberable?
.clearfix.
inputs-list
.clearfix.
append-bottom-10
%label
.checkbox.remember_me
{
for:
"user_remember_me"
}
=
f
.
check_box
:remember_me
%span
Remember me
=
f
.
submit
"Sign in"
,
class:
"btn-create btn"
.pull-right
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
class:
"btn"
%div
=
f
.
submit
"Sign in"
,
class:
"btn-create btn"
.pull-right
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
class:
"btn"
app/views/devise/sessions/new.html.haml
View file @
7984d3ca
.login-box
%h3
.page-title
Sign in
%br
-
if
ldap_enabled?
%ul
.nav.nav-tabs
%li
.active
...
...
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