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
b6e03c60
Commit
b6e03c60
authored
Sep 12, 2012
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added back the ie fixes from before
parent
1dceff78
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
17 deletions
+32
-17
lms/static/sass/base/_base.scss
+2
-1
lms/static/sass/ie.scss
+9
-2
lms/static/sass/shared/_footer.scss
+1
-0
lms/templates/login_modal.html
+2
-2
lms/templates/main.html
+3
-3
lms/templates/main_django.html
+8
-2
lms/templates/signup_modal.html
+7
-7
No files found.
lms/static/sass/base/_base.scss
View file @
b6e03c60
html
,
body
{
h
k
tml
,
body
{
background
:
rgb
(
250
,
250
,
250
);
font-family
:
$sans-serif
;
font-size
:
1em
;
font-style
:
normal
;
line-height
:
1em
;
//-webkit-font-smoothing: antialiased;
}
...
...
lms/static/sass/ie.scss
View file @
b6e03c60
...
...
@@ -130,6 +130,13 @@ header.global {
background
:
#000
;
}
.modal
.inner-wrapper
form
label
{
display
:
block
;
nav
.course-material
ol
.course-tabs
li
a
.active
,
nav
.course-material
.xmodule_SequenceModule
nav
.sequence-nav
ol
.course-tabs
li
a
.seq_video.active
,
.xmodule_SequenceModule
nav
.sequence-nav
nav
.course-material
ol
.course-tabs
li
a
.seq_video.active
{
background-color
:
#333
;
background-color
:
rgba
(
0
,
0
,
0
,
.4
);
}
header
.global
ol
.user
>
li
.primary
a
.dropdown
{
padding-top
:
6px
;
padding-bottom
:
6px
;
}
lms/static/sass/shared/_footer.scss
View file @
b6e03c60
...
...
@@ -110,6 +110,7 @@ footer {
padding
:
0
;
a
{
@include
inline-block
;
opacity
:
0
.3
;
@include
transition
(
all
,
0
.1s
,
linear
);
...
...
lms/templates/login_modal.html
View file @
b6e03c60
...
...
@@ -10,9 +10,9 @@
<form
id=
"login_form"
class=
"login_form"
method=
"post"
data-remote=
"true"
action=
"/login"
>
<label>
E-mail
</label>
<input
name=
"email"
type=
"email"
placeholder=
"E-mail"
>
<input
name=
"email"
type=
"email"
>
<label>
Password
</label>
<input
name=
"password"
type=
"password"
placeholder=
"Password"
>
<input
name=
"password"
type=
"password"
>
<label
class=
"remember-me"
>
<input
name=
"remember"
type=
"checkbox"
value=
"true"
>
Remember me
...
...
lms/templates/main.html
View file @
b6e03c60
...
...
@@ -8,9 +8,6 @@
<
%
static:css
group=
'application'
/>
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<
%
static:js
group=
'main_vendor'
/>
<
%
block
name=
"headextra"
/>
...
...
@@ -19,6 +16,9 @@
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<meta
name=
"path_prefix"
content=
"${MITX_ROOT_URL}"
>
</head>
...
...
lms/templates/main_django.html
View file @
b6e03c60
...
...
@@ -12,6 +12,13 @@
{% render_block "css" %}
<meta
name=
"path_prefix"
content=
"{{MITX_ROOT_URL}}"
>
<!--[if lt IE 9]>
<script src="{% static "js/html5shiv.js" %}"></script>
<![endif]-->
<!--[if lte IE 9]>
<link href="{% static "sass/ie.css" %}" rel="stylesheet" type="text/css" />
<![endif]-->
</head>
...
...
@@ -40,4 +47,4 @@
Inheriting from this file allows us to include apps that use the
django templating system without rewriting all of their views in
mako.
{% endcomment %}
\ No newline at end of file
{% endcomment %}
lms/templates/signup_modal.html
View file @
b6e03c60
...
...
@@ -21,18 +21,18 @@
<div
class=
"input-group"
>
% if has_extauth_info is UNDEFINED:
<label
data-field=
"email"
>
E-mail*
</label>
<input
name=
"email"
type=
"email"
placeholder=
"
E-mail*
"
>
<input
name=
"email"
type=
"email"
placeholder=
"
eg. example@edx.org
"
>
<label
data-field=
"password"
>
Password*
</label>
<input
name=
"password"
type=
"password"
placeholder=
"
Password
*"
>
<input
name=
"password"
type=
"password"
placeholder=
"
***
*"
>
<label
data-field=
"username"
>
Public Username*
</label>
<input
name=
"username"
type=
"text"
placeholder=
"
Public Username*
"
>
<input
name=
"username"
type=
"text"
placeholder=
"
Shown on forms
"
>
<label
data-field=
"name"
>
Full Name
</label>
<input
name=
"name"
type=
"text"
placeholder=
"F
ull Name*
"
>
<input
name=
"name"
type=
"text"
placeholder=
"F
or your certificate
"
>
% else:
<p><i>
Welcome
</i>
${extauth_email}
</p><br/>
<p><i>
Enter a public username:
</i></p>
<label
data-field=
"username"
>
Public Username*
</label>
<input
name=
"username"
type=
"text"
value=
"${extauth_username}"
placeholder=
"
Public Username*
"
>
<input
name=
"username"
type=
"text"
value=
"${extauth_username}"
placeholder=
"
Shown on forums
"
>
% endif
</div>
...
...
@@ -75,9 +75,9 @@
</section>
<label
data-field=
"mailing_address"
>
Mailing address
</label>
<textarea
name=
"mailing_address"
placeholder=
"Mailing address"
></textarea>
<textarea
name=
"mailing_address"
></textarea>
<label
data-field=
"goals"
>
Goals in signing up for edX
</label>
<textarea
name=
"goals"
placeholder=
"Goals in signing up for edX"
></textarea>
<textarea
name=
"goals"
></textarea>
</div>
...
...
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