diff --git a/lms/static/images/berkeley.png b/lms/static/images/berkeley.png
new file mode 100644
index 0000000000..01dde485fa
Binary files /dev/null and b/lms/static/images/berkeley.png differ
diff --git a/lms/static/images/circuits.jpeg b/lms/static/images/courses/circuits.jpeg
similarity index 100%
rename from lms/static/images/circuits.jpeg
rename to lms/static/images/courses/circuits.jpeg
diff --git a/lms/static/images/history.png b/lms/static/images/courses/history.png
similarity index 100%
rename from lms/static/images/history.png
rename to lms/static/images/courses/history.png
diff --git a/lms/static/images/math.png b/lms/static/images/courses/math.png
similarity index 100%
rename from lms/static/images/math.png
rename to lms/static/images/courses/math.png
diff --git a/lms/static/images/python.png b/lms/static/images/courses/python.png
similarity index 100%
rename from lms/static/images/python.png
rename to lms/static/images/courses/python.png
diff --git a/lms/static/images/courses/space1.jpg b/lms/static/images/courses/space1.jpg
new file mode 100644
index 0000000000..a7fde7dc4a
Binary files /dev/null and b/lms/static/images/courses/space1.jpg differ
diff --git a/lms/static/images/courses/space2.jpg.REMOVED.git-id b/lms/static/images/courses/space2.jpg.REMOVED.git-id
new file mode 100644
index 0000000000..d6ffb516a8
--- /dev/null
+++ b/lms/static/images/courses/space2.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+69017eed8a9ec5b9caf28814cadf01ba69b4b3bc
\ No newline at end of file
diff --git a/lms/static/images/courses/space3.jpg.REMOVED.git-id b/lms/static/images/courses/space3.jpg.REMOVED.git-id
new file mode 100644
index 0000000000..e037dd6c43
--- /dev/null
+++ b/lms/static/images/courses/space3.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+74bca798766449c9f2c87244410ca8fa30d5482e
\ No newline at end of file
diff --git a/lms/static/images/courses/space4.jpg.REMOVED.git-id b/lms/static/images/courses/space4.jpg.REMOVED.git-id
new file mode 100644
index 0000000000..78001082eb
--- /dev/null
+++ b/lms/static/images/courses/space4.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+184bae027b6853b575b8de2329f77089bcc87966
\ No newline at end of file
diff --git a/lms/static/images/courses/space5.jpg b/lms/static/images/courses/space5.jpg
new file mode 100644
index 0000000000..65dad74b01
Binary files /dev/null and b/lms/static/images/courses/space5.jpg differ
diff --git a/lms/static/images/harvard.png b/lms/static/images/harvard.png
index fed1e5bd77..ecfef5245d 100644
Binary files a/lms/static/images/harvard.png and b/lms/static/images/harvard.png differ
diff --git a/lms/static/images/mit.png b/lms/static/images/mit.png
index 013fd2055e..0a673cfd11 100644
Binary files a/lms/static/images/mit.png and b/lms/static/images/mit.png differ
diff --git a/lms/static/images/teacher.jpg b/lms/static/images/teacher.jpg
deleted file mode 100644
index 620c279035..0000000000
Binary files a/lms/static/images/teacher.jpg and /dev/null differ
diff --git a/lms/static/sass/_about.scss b/lms/static/sass/_about.scss
index 4a4bfda7f0..56cec0aa13 100644
--- a/lms/static/sass/_about.scss
+++ b/lms/static/sass/_about.scss
@@ -1,2 +1,215 @@
.about {
+ margin: 40px auto 120px;
+
+ > nav {
+ margin-bottom: 80px;
+ text-align: center;
+ width: flex-grid(12);
+
+ &::after {
+ @extend .faded-hr-divider;
+ content: "";
+ display: block;
+ }
+
+ a {
+ border-bottom: 3px solid transparent;
+ @include inline-block;
+ letter-spacing: 1px;
+ margin: 0px 5px;
+ padding: 20px 10px;
+ @include transition(all, 0.15s, linear);
+ text-transform: uppercase;
+
+ &:hover, &.active {
+ border-color: rgb(200,200,200);
+ color: $base-font-color;
+ }
+ }
+ }
+
+ .vision {
+ display: none;
+
+ h1 + hr {
+ margin-bottom: 80px;
+ }
+
+ .message {
+ @include clearfix;
+ margin-bottom: 60px;
+ padding-bottom: 60px;
+ position: relative;
+
+ hr {
+ bottom: 0px;
+ margin: 0px;
+ position: absolute;
+ width: 100%;
+ }
+
+ .photo {
+ background: rgb(255,255,255);
+ border: 1px solid rgb(210,210,210);
+ padding: 1px;
+ width: flex-grid(4);
+
+ img {
+ background: rgb(245,245,245);
+ display: block;
+ height: 200px;
+ width: 100%;
+ }
+ }
+
+ &.left {
+ .photo {
+ float: left;
+ margin-right: flex-gutter();
+ }
+ }
+
+ &.right {
+ h2 {
+ text-align: right;
+ }
+
+ .photo {
+ float: right;
+ margin-left: flex-gutter();
+ }
+ }
+
+ &:last-child {
+ margin-bottom: 0px;
+ }
+ }
+ }
+
+ .faq {
+ //display: none;
+ @include clearfix;
+
+ nav.categories {
+ border-right: 1px solid rgb(220,220,220);
+ @include box-sizing(border-box);
+ float: left;
+ margin-right: flex-gutter();
+ padding-right: 20px;
+ width: flex-grid(3);
+
+ a {
+ display: block;
+ letter-spacing: 1px;
+ margin-right: -20px;
+ padding: 10px 20px 10px 0;
+ text-align: right;
+ text-transform: uppercase;
+
+ &:hover {
+ background: rgb(245,245,245);
+ }
+ }
+ }
+
+ .responses {
+ float: left;
+ width: flex-grid(9);
+
+ .category {
+ padding-top: 40px;
+
+ &:first-child {
+ padding-top: 0px;
+ }
+
+ > h2 {
+ border-bottom: 1px solid rgb(220,220,220);
+ margin-bottom: 40px;
+ padding-bottom: 20px;
+ }
+ }
+
+ .response {
+ margin-bottom: 40px;
+
+ h3 {
+ font-family: $sans-serif;
+ font-weight: bold;
+ margin-bottom: 15px;
+ }
+ }
+ }
+ }
+
+ .press {
+ display: none;
+
+ .press-story {
+ border-bottom: 1px solid rgb(220,220,220);
+ @include clearfix;
+ margin-bottom: 40px;
+ padding-bottom: 40px;
+
+ &:last-child {
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ }
+
+ .article-cover {
+ background: rgb(255,255,255);
+ border: 1px solid rgb(120,120,120);
+ @include box-sizing(border-box);
+ float: left;
+ height: 120px;
+ margin-right: flex-gutter();
+ overflow: hidden;
+ width: flex-grid(2);
+
+ img {
+ display: block;
+ min-height: 100%;
+ width: 100%;
+ }
+ }
+
+ .press-info {
+ float: left;
+ width: flex-grid(10);
+
+ header {
+ margin-bottom: 15px;
+
+ h3 {
+ font-family: $sans-serif;
+ font-weight: bold;
+ }
+
+ a {
+ }
+ }
+ }
+ }
+ }
+
+ .contact {
+ display: none;
+ @include clearfix;
+ margin: 0 auto;
+ width: flex-grid(10);
+
+ .map {
+ background: rgb(245,245,245);
+ float: left;
+ height: 180px;
+ margin-right: flex-gutter();
+ width: flex-grid(6);
+ }
+
+ .address {
+ float: left;
+ width: flex-grid(6);
+ }
+ }
}
diff --git a/lms/static/sass/_course_info.scss b/lms/static/sass/_course_info.scss
index 924e0ce754..0dd6eb326d 100644
--- a/lms/static/sass/_course_info.scss
+++ b/lms/static/sass/_course_info.scss
@@ -183,9 +183,9 @@
a {
border-bottom: 3px solid transparent;
- color: $lighter-base-font-color;
@include inline-block;
font: normal 1.2rem/1.6rem $sans-serif;
+ letter-spacing: 1px;
margin: 0 15px;
padding: 0px 5px 15px;
text-align: center;
@@ -196,8 +196,7 @@
}
&:hover, &.active {
- border-color: $pink;
- //background: rgb(240,240,240);
+ border-color: rgb(200,200,200);
color: $base-font-color;
}
}
diff --git a/lms/static/sass/_index.scss b/lms/static/sass/_index.scss
index 368bcd5702..48cddf1bd7 100644
--- a/lms/static/sass/_index.scss
+++ b/lms/static/sass/_index.scss
@@ -120,13 +120,12 @@
.partners {
font-size: 0em;
margin: 0 auto;
- padding: 15px 0px;
+ padding: 20px 0px;
text-align: center;
li.partner {
@include inline-block;
- margin-right: 20px;
- padding-right: 20px;
+ padding: 0px 30px;
position: relative;
vertical-align: middle;
@@ -134,10 +133,10 @@
@extend .faded-vertical-divider;
content: "";
display: block;
- height: 100px;
+ height: 80px;
right: 0px;
position: absolute;
- top: 0px;
+ top: -5px;
width: 1px;
}
@@ -145,21 +144,14 @@
@extend .faded-vertical-divider-light;
content: "";
display: block;
- height: 100px;
+ height: 80px;
right: 1px;
position: absolute;
- top: 0px;
+ top: -5px;
width: 1px;
}
- &.mit {
- padding: 0 35px 0 20px;
- }
-
&:last-child {
- margin-right: 0px;
- padding-right: 0px;
-
&::before {
display: none;
}
@@ -171,7 +163,6 @@
}
a {
- opacity: 0.7;
@include transition(all, 0.25s, ease-in-out);
&::before {
@@ -191,21 +182,28 @@
}
.name {
- color: $base-font-color;
- font: 800 italic 2rem/2.2rem $sans-serif;
left: 0px;
position: absolute;
text-align: center;
- text-shadow: 0 1px rgba(255,255,255, 0.6);
bottom: -60px;
@include transition(all, 0.25s, ease-in-out);
- vertical-align: middle;
width: 100%;
z-index: 2;
+
+ span {
+ color: $base-font-color;
+ font: 800 italic 2rem/2.2rem $sans-serif;
+ text-shadow: 0 1px rgba(255,255,255, 0.6);
+ @include transition(all, 0.15s, ease-in-out);
+
+ &:hover {
+ color: $lighter-base-font-color;
+ }
+ }
}
img {
- max-width: 140px;
+ max-width: 160px;
position: relative;
@include transition(all, 0.25s, ease-in-out);
vertical-align: middle;
@@ -213,18 +211,16 @@
}
&:hover {
- opacity: 0.9;
-
&::before {
opacity: 1;
}
.name {
- bottom: 30px;
+ bottom: 20px;
}
img {
- top: -120px;
+ top: -100px;
}
}
}
diff --git a/lms/static/sass/_jobs.scss b/lms/static/sass/_jobs.scss
index 943b1f8430..60df26822a 100644
--- a/lms/static/sass/_jobs.scss
+++ b/lms/static/sass/_jobs.scss
@@ -40,7 +40,7 @@
}
&.right {
- h2, p {
+ h2 {
text-align: right;
}
@@ -64,7 +64,6 @@
border-bottom: 1px solid rgb(220,220,220);
margin-bottom: 60px;
padding-bottom: 20px;
- //text-align: center;
}
.jobs-sidebar {
@@ -93,7 +92,7 @@
a {
display: block;
margin-left: -20px;
- padding: 10px 0px 10px 20px;
+ padding: 10px 0 10px 20px;
position: relative;
text-transform: uppercase;
@@ -111,9 +110,6 @@
&:hover {
background: rgb(245,245,245);
- //@include background-image(linear-gradient(180deg, rgba(245,245,245, 0) 0%,
- //rgba(245,245,245, 1) 80%,
- //rgba(245,245,245, 1) 100%));
}
}
}
diff --git a/lms/static/sass/_shared_list_of_courses.scss b/lms/static/sass/_shared_list_of_courses.scss
index 8c9814cd30..2b84cfb355 100644
--- a/lms/static/sass/_shared_list_of_courses.scss
+++ b/lms/static/sass/_shared_list_of_courses.scss
@@ -5,14 +5,15 @@
.course {
background: rgb(250,250,250);
- border: 1px solid rgb(220,220,220);
+ border: 1px solid rgb(180,180,180);
@include border-radius(2px);
@include box-sizing(border-box);
- @include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1), inset 0 0 0 1px rgba(255,255,255, 0.9));
+ @include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.15), inset 0 0 0 1px rgba(255,255,255, 0.9));
float: left;
font-size: 0em;
margin-right: flex-gutter();
- margin-bottom: 25px;
+ margin-bottom: 30px;
+ position: relative;
width: flex-grid(4);
@include transition(all, 0.15s, linear);
@@ -20,6 +21,27 @@
margin-right: 0;
}
+ //.meta-info {
+ //background: rgba(0,0,0, 0.6);
+ //bottom: 8px;
+ //border: 1px solid rgba(0,0,0, 0.5);
+ //@include box-shadow(0 1px 5px 0 rgba(0,0,0, 0.15));
+ //@include clearfix;
+ //left: -4px;
+ //position: absolute;
+ //@include transition(all, 0.15s, linear);
+
+ //p {
+ //color: rgb(255,255,255);
+ //font: 300 1.2rem/1.4rem $sans-serif;
+ //padding: 5px 12px;
+
+ //&.university {
+ //float: left;
+ //}
+ //}
+ //}
+
.inner-wrapper {
border: 1px solid rgba(255,255,255, 1);
height: 100%;
@@ -36,7 +58,7 @@
z-index: 3;
> a {
- @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.95), rgba(255,255,255, 0.75)));
+ @include background-image(linear-gradient(-90deg, rgba(255,255,255, 1), rgba(255,255,255, 0.85)));
@include box-shadow(inset 0 -1px 0 0 rgba(255,255,255, 0.2));
border-bottom: 1px solid rgba(150,150,150, 0.7);
display: block;
@@ -83,6 +105,10 @@
color: $blue;
opacity: 1;
}
+
+ h2 {
+ text-decoration: underline;
+ }
}
}
}
@@ -127,7 +153,8 @@
img {
display: block;
- min-width: 100%;
+ min-height: 100%;
+ width: 100%;
}
}
@@ -144,8 +171,8 @@
&:hover {
background: rgb(245,245,245);
- border-color: rgb(190,190,190);
- @include box-shadow(0 1px 16px 0 rgba($blue, 0.35));
+ border-color: rgb(170,170,170);
+ @include box-shadow(0 1px 16px 0 rgba($blue, 0.4));
.info {
top: -130px;
diff --git a/lms/static/sass/application.css b/lms/static/sass/application.css
index 00afd87fca..8e7465fcee 100755
--- a/lms/static/sass/application.css
+++ b/lms/static/sass/application.css
@@ -404,7 +404,7 @@ a:link, a:visited {
.container:after {
clear: both; }
-.faded-hr-divider, .horizontal-divider, .modal .inner-wrapper header hr::after, .modal .inner-wrapper form .honor-code-summary hr::after, .course-info .container nav::after, .course-info .details .inner-wrapper > section::after, .course-info .details .course-staff .teacher::after {
+.faded-hr-divider, .horizontal-divider, .modal .inner-wrapper header hr::after, .modal .inner-wrapper form .honor-code-summary hr::after, .course-info .container nav::after, .course-info .details .inner-wrapper > section::after, .course-info .details .course-staff .teacher::after, .about > nav::after {
background-image: -webkit-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0));
background-image: -moz-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0));
background-image: -ms-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0));
@@ -1767,7 +1767,7 @@ header.app {
clear: both; }
.highlighted-courses .courses .course, .find-courses .courses .course {
background: #fafafa;
- border: 1px solid #dcdcdc;
+ border: 1px solid #b4b4b4;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
-ms-border-radius: 2px;
@@ -1776,13 +1776,14 @@ header.app {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
- -webkit-box-shadow: 0 1px 8px 0 rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
- -moz-box-shadow: 0 1px 8px 0 rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
- box-shadow: 0 1px 8px 0 rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
+ -webkit-box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.15), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
+ -moz-box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.15), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
+ box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.15), inset 0 0 0 1px rgba(255, 255, 255, 0.9);
float: left;
font-size: 0em;
margin-right: 2.024%;
- margin-bottom: 25px;
+ margin-bottom: 30px;
+ position: relative;
width: 31.984%;
-webkit-transition-property: all;
-moz-transition-property: all;
@@ -1819,11 +1820,11 @@ header.app {
width: 100%;
z-index: 3; }
.highlighted-courses .courses .course header.course-preview > a, .find-courses .courses .course header.course-preview > a {
- background-image: -webkit-linear-gradient(-90deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.75));
- background-image: -moz-linear-gradient(-90deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.75));
- background-image: -ms-linear-gradient(-90deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.75));
- background-image: -o-linear-gradient(-90deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.75));
- background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.75));
+ background-image: -webkit-linear-gradient(-90deg, white, rgba(255, 255, 255, 0.85));
+ background-image: -moz-linear-gradient(-90deg, white, rgba(255, 255, 255, 0.85));
+ background-image: -ms-linear-gradient(-90deg, white, rgba(255, 255, 255, 0.85));
+ background-image: -o-linear-gradient(-90deg, white, rgba(255, 255, 255, 0.85));
+ background-image: linear-gradient(-90deg, white, rgba(255, 255, 255, 0.85));
-webkit-box-shadow: inset 0 -1px 0 0 rgba(255, 255, 255, 0.2);
-moz-box-shadow: inset 0 -1px 0 0 rgba(255, 255, 255, 0.2);
box-shadow: inset 0 -1px 0 0 rgba(255, 255, 255, 0.2);
@@ -1869,6 +1870,8 @@ header.app {
.highlighted-courses .courses .course header.course-preview > a:hover h2, .highlighted-courses .courses .course header.course-preview > a:hover p, .highlighted-courses .courses .course header.course-preview > a:hover .info-link, .find-courses .courses .course header.course-preview > a:hover h2, .find-courses .courses .course header.course-preview > a:hover p, .find-courses .courses .course header.course-preview > a:hover .info-link {
color: #1d9dd9;
opacity: 1; }
+ .highlighted-courses .courses .course header.course-preview > a:hover h2, .find-courses .courses .course header.course-preview > a:hover h2 {
+ text-decoration: underline; }
.highlighted-courses .courses .course .info, .find-courses .courses .course .info {
height: 310px;
left: 0px;
@@ -1942,7 +1945,8 @@ header.app {
width: 100%; }
.highlighted-courses .courses .course .info .cover-image img, .find-courses .courses .course .info .cover-image img {
display: block;
- min-width: 100%; }
+ min-height: 100%;
+ width: 100%; }
.highlighted-courses .courses .course .info .desc, .find-courses .courses .course .info .desc {
background: white;
-webkit-box-sizing: border-box;
@@ -1954,10 +1958,10 @@ header.app {
width: 100%; }
.highlighted-courses .courses .course:hover, .find-courses .courses .course:hover {
background: #f5f5f5;
- border-color: #bebebe;
- -webkit-box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.35);
- -moz-box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.35);
- box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.35); }
+ border-color: #aaaaaa;
+ -webkit-box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.4);
+ -moz-box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.4);
+ box-shadow: 0 1px 16px 0 rgba(29, 157, 217, 0.4); }
.highlighted-courses .courses .course:hover .info, .find-courses .courses .course:hover .info {
top: -130px; }
.highlighted-courses .courses .course:hover .info .meta-info, .find-courses .courses .course:hover .info .meta-info {
@@ -2545,7 +2549,7 @@ header.app {
.home .university-partners .partners {
font-size: 0em;
margin: 0 auto;
- padding: 15px 0px;
+ padding: 20px 0px;
text-align: center; }
.home .university-partners .partners li.partner {
display: -moz-inline-box;
@@ -2555,37 +2559,30 @@ header.app {
zoom: 1;
*display: inline;
*vertical-align: auto;
- margin-right: 20px;
- padding-right: 20px;
+ padding: 0px 30px;
position: relative;
vertical-align: middle; }
.home .university-partners .partners li.partner::before {
content: "";
display: block;
- height: 100px;
+ height: 80px;
right: 0px;
position: absolute;
- top: 0px;
+ top: -5px;
width: 1px; }
.home .university-partners .partners li.partner::after {
content: "";
display: block;
- height: 100px;
+ height: 80px;
right: 1px;
position: absolute;
- top: 0px;
+ top: -5px;
width: 1px; }
- .home .university-partners .partners li.partner.mit {
- padding: 0 35px 0 20px; }
- .home .university-partners .partners li.partner:last-child {
- margin-right: 0px;
- padding-right: 0px; }
- .home .university-partners .partners li.partner:last-child::before {
- display: none; }
- .home .university-partners .partners li.partner:last-child::after {
- display: none; }
+ .home .university-partners .partners li.partner:last-child::before {
+ display: none; }
+ .home .university-partners .partners li.partner:last-child::after {
+ display: none; }
.home .university-partners .partners a {
- opacity: 0.7;
-webkit-transition-property: all;
-moz-transition-property: all;
-ms-transition-property: all;
@@ -2644,12 +2641,9 @@ header.app {
top: 50%;
z-index: 1; }
.home .university-partners .partners a .name {
- color: #3c3c3c;
- font: 800 italic 2rem/2.2rem "Open Sans", Verdana, Geneva, sans-serif;
left: 0px;
position: absolute;
text-align: center;
- text-shadow: 0 1px rgba(255, 255, 255, 0.6);
bottom: -60px;
-webkit-transition-property: all;
-moz-transition-property: all;
@@ -2671,11 +2665,36 @@ header.app {
-ms-transition-delay: 0;
-o-transition-delay: 0;
transition-delay: 0;
- vertical-align: middle;
width: 100%;
z-index: 2; }
+ .home .university-partners .partners a .name span {
+ color: #3c3c3c;
+ font: 800 italic 2rem/2.2rem "Open Sans", Verdana, Geneva, sans-serif;
+ text-shadow: 0 1px rgba(255, 255, 255, 0.6);
+ -webkit-transition-property: all;
+ -moz-transition-property: all;
+ -ms-transition-property: all;
+ -o-transition-property: all;
+ transition-property: all;
+ -webkit-transition-duration: 0.15s;
+ -moz-transition-duration: 0.15s;
+ -ms-transition-duration: 0.15s;
+ -o-transition-duration: 0.15s;
+ transition-duration: 0.15s;
+ -webkit-transition-timing-function: ease-in-out;
+ -moz-transition-timing-function: ease-in-out;
+ -ms-transition-timing-function: ease-in-out;
+ -o-transition-timing-function: ease-in-out;
+ transition-timing-function: ease-in-out;
+ -webkit-transition-delay: 0;
+ -moz-transition-delay: 0;
+ -ms-transition-delay: 0;
+ -o-transition-delay: 0;
+ transition-delay: 0; }
+ .home .university-partners .partners a .name span:hover {
+ color: #a0a0a0; }
.home .university-partners .partners a img {
- max-width: 140px;
+ max-width: 160px;
position: relative;
-webkit-transition-property: all;
-moz-transition-property: all;
@@ -2699,14 +2718,12 @@ header.app {
transition-delay: 0;
vertical-align: middle;
z-index: 2; }
- .home .university-partners .partners a:hover {
- opacity: 0.9; }
- .home .university-partners .partners a:hover::before {
- opacity: 1; }
- .home .university-partners .partners a:hover .name {
- bottom: 30px; }
- .home .university-partners .partners a:hover img {
- top: -120px; }
+ .home .university-partners .partners a:hover::before {
+ opacity: 1; }
+ .home .university-partners .partners a:hover .name {
+ bottom: 20px; }
+ .home .university-partners .partners a:hover img {
+ top: -100px; }
.home .highlighted-courses {
border-bottom: 1px solid #d2d2d2;
-webkit-box-sizing: border-box;
@@ -3737,7 +3754,6 @@ nav.course-material {
display: none; }
.course-info .container nav a {
border-bottom: 3px solid transparent;
- color: #a0a0a0;
display: -moz-inline-box;
-moz-box-orient: vertical;
display: inline-block;
@@ -3746,6 +3762,7 @@ nav.course-material {
*display: inline;
*vertical-align: auto;
font: normal 1.2rem/1.6rem "Open Sans", Verdana, Geneva, sans-serif;
+ letter-spacing: 1px;
margin: 0 15px;
padding: 0px 5px 15px;
text-align: center;
@@ -3753,7 +3770,7 @@ nav.course-material {
.course-info .container nav a:first-child {
margin-left: 0px; }
.course-info .container nav a:hover, .course-info .container nav a.active, .course-info .container nav.sequence-nav ol li a.seq_video_active, .course-info .container nav.sequence-nav ol li a.seq_other_active, .course-info .container nav.sequence-nav ol li a.seq_vertical_active, .course-info .container nav.sequence-nav ol li a.seq_problem_active {
- border-color: #b62568;
+ border-color: #c8c8c8;
color: #3c3c3c; }
.course-info .container h2 {
color: #a0a0a0;
@@ -3907,7 +3924,7 @@ nav.course-material {
.jobs .message.left .photo {
float: left;
margin-right: 2.024%; }
- .jobs .message.right h2, .jobs .message.right p {
+ .jobs .message.right h2 {
text-align: right; }
.jobs .message.right .photo {
float: right;
@@ -3954,7 +3971,7 @@ nav.course-material {
.jobs .jobs-wrapper .jobs-sidebar nav ol li a {
display: block;
margin-left: -20px;
- padding: 10px 0px 10px 20px;
+ padding: 10px 0 10px 20px;
position: relative;
text-transform: uppercase; }
.jobs .jobs-wrapper .jobs-sidebar nav ol li a::after {
@@ -3990,6 +4007,191 @@ nav.course-material {
font-weight: bold;
margin-bottom: 15px; }
+.about {
+ margin: 40px auto 120px; }
+ .about > nav {
+ margin-bottom: 80px;
+ text-align: center;
+ width: 100%; }
+ .about > nav::after {
+ content: "";
+ display: block; }
+ .about > nav a {
+ border-bottom: 3px solid transparent;
+ display: -moz-inline-box;
+ -moz-box-orient: vertical;
+ display: inline-block;
+ vertical-align: baseline;
+ zoom: 1;
+ *display: inline;
+ *vertical-align: auto;
+ letter-spacing: 1px;
+ margin: 0px 5px;
+ padding: 20px 10px;
+ -webkit-transition-property: all;
+ -moz-transition-property: all;
+ -ms-transition-property: all;
+ -o-transition-property: all;
+ transition-property: all;
+ -webkit-transition-duration: 0.15s;
+ -moz-transition-duration: 0.15s;
+ -ms-transition-duration: 0.15s;
+ -o-transition-duration: 0.15s;
+ transition-duration: 0.15s;
+ -webkit-transition-timing-function: linear;
+ -moz-transition-timing-function: linear;
+ -ms-transition-timing-function: linear;
+ -o-transition-timing-function: linear;
+ transition-timing-function: linear;
+ -webkit-transition-delay: 0;
+ -moz-transition-delay: 0;
+ -ms-transition-delay: 0;
+ -o-transition-delay: 0;
+ transition-delay: 0;
+ text-transform: uppercase; }
+ .about > nav a:hover, .about > nav a.active, .about > nav nav.sequence-nav ol li a.seq_video_active, nav.sequence-nav ol li .about > nav a.seq_video_active, .about > nav nav.sequence-nav ol li a.seq_other_active, nav.sequence-nav ol li .about > nav a.seq_other_active, .about > nav nav.sequence-nav ol li a.seq_vertical_active, nav.sequence-nav ol li .about > nav a.seq_vertical_active, .about > nav nav.sequence-nav ol li a.seq_problem_active, nav.sequence-nav ol li .about > nav a.seq_problem_active {
+ border-color: #c8c8c8;
+ color: #3c3c3c; }
+ .about .vision {
+ display: none; }
+ .about .vision h1 + hr {
+ margin-bottom: 80px; }
+ .about .vision .message {
+ zoom: 1;
+ margin-bottom: 60px;
+ padding-bottom: 60px;
+ position: relative; }
+ .about .vision .message:before, .about .vision .message:after {
+ content: "";
+ display: table; }
+ .about .vision .message:after {
+ clear: both; }
+ .about .vision .message hr {
+ bottom: 0px;
+ margin: 0px;
+ position: absolute;
+ width: 100%; }
+ .about .vision .message .photo {
+ background: white;
+ border: 1px solid #d2d2d2;
+ padding: 1px;
+ width: 31.984%; }
+ .about .vision .message .photo img {
+ background: #f5f5f5;
+ display: block;
+ height: 200px;
+ width: 100%; }
+ .about .vision .message.left .photo {
+ float: left;
+ margin-right: 2.024%; }
+ .about .vision .message.right h2 {
+ text-align: right; }
+ .about .vision .message.right .photo {
+ float: right;
+ margin-left: 2.024%; }
+ .about .vision .message:last-child {
+ margin-bottom: 0px; }
+ .about .faq {
+ zoom: 1; }
+ .about .faq:before, .about .faq:after {
+ content: "";
+ display: table; }
+ .about .faq:after {
+ clear: both; }
+ .about .faq nav.categories {
+ border-right: 1px solid #dcdcdc;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ float: left;
+ margin-right: 2.024%;
+ padding-right: 20px;
+ width: 23.482%; }
+ .about .faq nav.categories a {
+ display: block;
+ letter-spacing: 1px;
+ margin-right: -20px;
+ padding: 10px 20px 10px 0;
+ text-align: right;
+ text-transform: uppercase; }
+ .about .faq nav.categories a:hover {
+ background: #f5f5f5; }
+ .about .faq .responses {
+ float: left;
+ width: 74.494%; }
+ .about .faq .responses .category {
+ padding-top: 40px; }
+ .about .faq .responses .category:first-child {
+ padding-top: 0px; }
+ .about .faq .responses .category > h2 {
+ border-bottom: 1px solid #dcdcdc;
+ margin-bottom: 40px;
+ padding-bottom: 20px; }
+ .about .faq .responses .response {
+ margin-bottom: 40px; }
+ .about .faq .responses .response h3 {
+ font-family: "Open Sans", Verdana, Geneva, sans-serif;
+ font-weight: bold;
+ margin-bottom: 15px; }
+ .about .press {
+ display: none; }
+ .about .press .press-story {
+ border-bottom: 1px solid #dcdcdc;
+ zoom: 1;
+ margin-bottom: 40px;
+ padding-bottom: 40px; }
+ .about .press .press-story:before, .about .press .press-story:after {
+ content: "";
+ display: table; }
+ .about .press .press-story:after {
+ clear: both; }
+ .about .press .press-story:last-child {
+ border: none;
+ margin: 0px;
+ padding: 0px; }
+ .about .press .press-story .article-cover {
+ background: white;
+ border: 1px solid #787878;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ float: left;
+ height: 120px;
+ margin-right: 2.024%;
+ overflow: hidden;
+ width: 14.98%; }
+ .about .press .press-story .article-cover img {
+ display: block;
+ min-height: 100%;
+ width: 100%; }
+ .about .press .press-story .press-info {
+ float: left;
+ width: 82.996%; }
+ .about .press .press-story .press-info header {
+ margin-bottom: 15px; }
+ .about .press .press-story .press-info header h3 {
+ font-family: "Open Sans", Verdana, Geneva, sans-serif;
+ font-weight: bold; }
+ .about .contact {
+ display: none;
+ zoom: 1;
+ margin: 0 auto;
+ width: 82.996%; }
+ .about .contact:before, .about .contact:after {
+ content: "";
+ display: table; }
+ .about .contact:after {
+ clear: both; }
+ .about .contact .map {
+ background: #f5f5f5;
+ float: left;
+ height: 180px;
+ margin-right: 2.024%;
+ width: 48.988%; }
+ .about .contact .address {
+ float: left;
+ width: 48.988%; }
+
html {
height: 100%;
max-height: 100%; }
diff --git a/lms/templates/about.html b/lms/templates/about.html
index 498f2da40c..2f8689fe1c 100644
--- a/lms/templates/about.html
+++ b/lms/templates/about.html
@@ -1,3 +1,239 @@
+<%namespace name='static' file='static_content.html'/>
+
<%inherit file="main.html" />
-
About Us
+
+
+ Vision
+ Faq
+ Press
+ Contact
+
+
+
+
+
+
+
+
+
Mission: Educate 1 billion people around the world
+
“EdX represents a unique opportunity to improve education on our own campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide,” MIT President Susan Hockfield said.
+
Harvard President Drew Faust said, “edX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.”
+
+
+
+
+
+
+
+
+ What it's like to work here
+ “Harvard and MIT will use these new technologies and the research they will make possible to lead the direction of online learning in a way that benefits our students, our peers, and people across the nation and the globe,” Faust continued.
+ [fast-moving not-for-profit startup][institutional backing, funding, benefits, and stability][industry salaries]
+
+
+
+
+
+
+
+ Mission: Educate 1 billion people around the world
+ “EdX represents a unique opportunity to improve education on our own campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide,” MIT President Susan Hockfield said.
+ Harvard President Drew Faust said, “edX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.”
+
+
+
+
+
+ The orginization
+ Technology Platform
+ Learning Objectives
+ The Students
+
+
+
+
+ The Orginization
+
+
+ What is edX?
+ An organization established by MIT and Harvard that will develop an open-source technology platform to deliver online courses. EdX will support Harvard and MIT faculty in conducting research on teaching and learning on campus through tools that enrich classroom and laboratory experiences. At the same time, edX also will reach learners around the world through online course materials. The edX website will begin by hosting MITx and Harvardx content, with the goal of aping content from other universities interested in joining the platform.
+
+
+
+ What are MITx and Harvardx?
+ Portfolios of MIT and Harvard online courses offered to learners around the world through edX.
+
+
+
+ What technology will edX use?
+ An open-source online learning platform that will feature teaching designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved.
+
+
+
+ Is there anything innovative about the online technology?
+ Yes. It will move beyond the standard model of online education that relies on watching video content and will offer an interactive experience for students. And the technology will be open source; other universities will be able to leverage the innovative technology to create their own online offerings.
+
+
+
+ Why are MIT and Harvard doing this?
+ To improve education on campus and around the world:
+
+
+ On campus, edX research will enhance our understanding of how students learn and how technologies can best be used as part of our larger efforts to improve teaching and learning.
+
+
+ Beyond our campuses, edX will expand access to education, allow for certificates of mastery to be earned by able learners, and make the open source platform available to other institutions.
+
+
+
+
+
+
+
+
+ Learning Objectives
+
+
+ Who can take edX courses? Will there be an admissions process?
+ EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process. For a modest fee, and as determined by the edX board, MIT and Harvard, credentials will be granted only to students who earn them by demonstrating mastery of the material of a subject.
+
+
+
+ Will the certificates be awarded by Harvard and/or MIT?
+ As determined by the edX board, MIT and Harvard, online learners who demonstrate mastery of subjects could earn a certificate of completion, but such certificates would not be issued under the name Harvard or MIT.
+
+
+
+ What will the scope of the online courses be? How many? Which faculty?
+ Our goal is to offer a wide variety of courses across disciplines.
+
+
+
+ Will Harvard and MIT students be able to take these courses for credit?
+ No. MITx and Harvardx courses will not be offered for credit at either university. The online content will be used to extend and enrich on campus courses.
+
+
+
+
+ The Students
+
+
+ How will success be measured?
+ Progress in student learning research and the demand for online courses will both be measured as indications of success. However, a plan for measuring the full success of edX will be developed in consultation with faculty from MIT and Harvard.
+
+
+
+ Who is the learner? Domestic or international? Age range?
+ Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don’t have a target group of potential learners, as the goal is to make these courses available to anyone in the world – from any demographic – who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection.
+
+
+
+ Many institutions are partnering in this space. Is the MIT/Harvard partnership exclusive? Will other institutions be able to collaborate with edX?
+ It is our intention that over time other universities will join MIT and Harvard in offering courses on the edX platform. The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.
+
+
+
+ Will MIT and Harvard standards apply here?
+ The reach changes exponentially, but the rigor remains the same.
+
+
+
+ How do you intend to test whether this approach is improving learning?
+ Both institutions have assembled faculty who will look at data collection and analytical tools for assessing the results.
+
+
+
+
+
+
+
+
+
+
+
+
+
"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."
+
+
+
+
+
+
+
+
+
+
"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."
+
+
+
+
+
+
+
+
+
+
"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."
+
+
+
+
+
+
+
+
+
+
"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."
+
+
+
+
+
+
+
diff --git a/lms/templates/course.html b/lms/templates/course.html
index 91e4dced27..35f9e46acf 100644
--- a/lms/templates/course.html
+++ b/lms/templates/course.html
@@ -20,7 +20,7 @@
7/23/12 → 12/15/12
-
+
An advanced introduction to analog circuits.
@@ -30,29 +30,152 @@
%endfor
-
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
An advanced introduction to analog circuits.
+
+
+
+
diff --git a/lms/templates/index.html b/lms/templates/index.html
index 35e7e34831..4518eacef8 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -29,22 +29,28 @@