Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
261c9b15
Commit
261c9b15
authored
Feb 09, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added link to create a new account on login modal and added styles for that too
--HG-- branch : kf-login-errors
parent
bd523c2e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
8 deletions
+26
-8
login.html
+5
-1
marketing.html
+2
-1
sass/_index.scss
+6
-6
sass/_leanmodal.scss
+13
-0
No files found.
login.html
View file @
261c9b15
...
...
@@ -2,7 +2,11 @@
${ error }
<div
id=
"login_div"
>
<h1>
Log in to MITx
</h1>
<header>
<h1>
Log in to MITx
</h1>
<p
class=
"no-account"
>
If you don
’
t have an account yet,
<a
href=
"#enroll"
rel=
"leanModal"
>
please enroll here
</a></p>
</header>
<form
id=
"login_form"
method=
"post"
>
<ol>
<li>
...
...
marketing.html
View file @
261c9b15
...
...
@@ -100,6 +100,7 @@ function postJSON(url, data, callback) {
% if settings.COURSEWARE_ENABLED:
<div
id=
"login"
class=
"leanModal_box"
><
%
include
file=
"login.html"
/></div>
<div
id=
"enroll"
class=
"leanModal_box"
name=
"enroll"
><
%
include
file=
"create_account.html"
/></div>
% endif
<div
id=
"pwd_reset"
class=
"leanModal_box"
><
%
include
file=
"password_reset_form.html"
/></div>
<div
id=
"reset_done"
class=
"leanModal_box"
></div>
...
...
@@ -122,7 +123,7 @@ $(document).ready(function(){
if
(
json
.
success
)
{
location
.
href
=
"/courseware"
;
}
else
if
(
$
(
'#login_error'
).
length
==
0
)
{
$
(
'#login_form'
).
prepend
(
'<div id="login_error">Email or password is incorrect.</div>'
);
$
(
'#login_form'
).
prepend
(
'<div id="login_error">Email or password is incorrect.</div>'
);
}
else
{
$
(
'#login_error'
).
stop
().
css
(
"background-color"
,
"#933"
).
animate
({
backgroundColor
:
"#333"
},
2000
);
}
...
...
sass/_index.scss
View file @
261c9b15
...
...
@@ -167,16 +167,16 @@ header.announcement {
a
{
@extend
.button
;
@include
box-shadow
(
inset
0
1px
0
darken
(
$mit-red
,
5
%
)
,
0
1px
0
lighten
(
$mit-red
,
5%
));
background-color
:
darken
(
$mit-red
,
1
0%
);
@include
box-shadow
(
inset
0
1px
0
darken
(
$mit-red
,
10
%
)
,
0
1px
0
lighten
(
$mit-red
,
5%
));
background-color
:
darken
(
$mit-red
,
2
0%
);
display
:
block
;
padding
:
lh
(
.5
)
lh
();
border-color
:
darken
(
$mit-red
,
2
0%
);
border-color
:
darken
(
$mit-red
,
3
0%
);
text-align
:
center
;
&
:hover
{
background-color
:
darken
(
$mit-red
,
2
0%
);
border-color
:
darken
(
$mit-red
,
3
0%
);
background-color
:
darken
(
$mit-red
,
1
0%
);
border-color
:
darken
(
$mit-red
,
2
0%
);
}
}
}
...
...
@@ -417,7 +417,7 @@ section.index-content {
a
.enroll
{
@extend
.button
;
padding
:
lh
(
.5
)
lh
(
1
.5
);
padding
:
lh
(
.5
)
lh
(
2
);
@include
inline-block
();
text-align
:
center
;
font
:
800
18px
$header-font-family
;
...
...
sass/_leanmodal.scss
View file @
261c9b15
...
...
@@ -160,6 +160,18 @@ div.leanModal_box {
div
#login
{
min-width
:
400px
;
header
{
border-bottom
:
1px
solid
#ddd
;
margin-bottom
:
lh
();
padding-bottom
:
lh
();
h1
{
border-bottom
:
0
;
padding-bottom
:
0
;
margin-bottom
:
lh
(
.25
);
}
}
ol
{
li
{
width
:
auto
;
...
...
@@ -209,6 +221,7 @@ div#feedback_div{
div
#calculator_div
{
max-width
:
500px
;
form
{
padding-bottom
:
lh
();
margin-bottom
:
lh
();
...
...
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