diff --git a/lms/static/images/brazilstory_blog_arthur.jpg b/lms/static/images/brazilstory_blog_arthur.jpg new file mode 100644 index 0000000000..f207bbbf7e Binary files /dev/null and b/lms/static/images/brazilstory_blog_arthur.jpg differ diff --git a/lms/static/images/laffont_temp.jpg b/lms/static/images/laffont_temp.jpg new file mode 100644 index 0000000000..caaedc844f Binary files /dev/null and b/lms/static/images/laffont_temp.jpg differ diff --git a/lms/static/sass/_about_pages.scss b/lms/static/sass/_about_pages.scss index e4fad0c1d1..e5d8b3363b 100644 --- a/lms/static/sass/_about_pages.scss +++ b/lms/static/sass/_about_pages.scss @@ -37,6 +37,13 @@ margin-bottom: 80px; } + h2.mission-quote { + margin: 0 auto; + text-align: center; + text-transform: none; + width: flex-grid(10); + } + .message { @include clearfix; margin-bottom: 60px; @@ -88,6 +95,19 @@ margin-bottom: 0px; } } + + .partners { + @include clearfix; + + > article { + float: left; + width: flex-grid(6); + + &:first-child { + margin-right: flex-gutter(); + } + } + } } .faq { diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/_course_about.scss index 188856a0cd..02b7f9c43b 100644 --- a/lms/static/sass/_course_about.scss +++ b/lms/static/sass/_course_about.scss @@ -34,6 +34,7 @@ @include box-sizing(border-box); @include clearfix; float: left; + height: 180px; padding: 20px 20px; position: relative; width: flex-grid(8) + flex-gutter(); @@ -42,8 +43,8 @@ > hgroup { border-bottom: 1px solid rgb(210,210,210); @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); - margin-bottom: 30px; - padding-bottom: 15px; + margin-bottom: 27px; + padding-bottom: 20px; width: 100%; h1 { @@ -100,18 +101,20 @@ } .media { - background: #fff; + background: transparent; border-left: 1px solid rgb(100,100,100); @include box-sizing(border-box); display: block; float: right; - padding: 1px; + height: 180px; + padding: 20px; position: relative; width: flex-grid(4); z-index: 2; .hero { - height: 180px; + border: 1px solid rgb(100,100,100); + height: 100%; overflow: hidden; position: relative; diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 39d40d4de7..b4e20efd46 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -15,7 +15,7 @@ height: 120px; margin: 0 auto; max-width: 1200px; - padding-top: 150px; + padding-top: 200px; position: relative; text-align: center; width: flex-grid(12); diff --git a/lms/static/sass/_home.scss b/lms/static/sass/_home.scss index 1deeb9389e..1de6a7918f 100644 --- a/lms/static/sass/_home.scss +++ b/lms/static/sass/_home.scss @@ -28,16 +28,12 @@ @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @include box-sizing(border-box); height: 120px; - //@include clearfix; @include inline-block; margin-left: grid-width(1) + $gw-gutter; margin-right: $gw-gutter; - //overflow: hidden; - //padding: 20px 30px 20px; position: relative; text-align: center; @include transition(all, 0.2s, linear); - //width: grid-width(6); vertical-align: top; &:hover { @@ -59,38 +55,18 @@ } > hgroup { - //background: rgba(255,255,255, 0.93); - //border: 1px solid rgb(100,100,100); - //@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @include box-sizing(border-box); height: 120px; @include inline-block; left: 0px; - //margin-left: grid-width(1) + $gw-gutter; - //margin-right: $gw-gutter; opacity: 1; padding: 20px 30px; - //position: absolute; top: 0px; @include transition(all, 0.2s, linear); text-align: left; - //vertical-align: middle; - - &::after { - @extend .faded-vertical-divider-light; - content: ""; - display: block; - height: 170px; - position: absolute; - right: -1px; - top: -20px; - } h1 { - //border-bottom: 1px solid rgb(200,200,200); - //margin-bottom: 25px; margin-bottom: 0px; - //padding-bottom: 15px; text-align: left; text-shadow: 0 1px rgba(255,255,255, 0.6); text-transform: none; @@ -115,7 +91,6 @@ width: flex-grid(12); .main-cta { - //display: none; float: left; margin-right: flex-gutter(); width: flex-grid(6); @@ -139,11 +114,9 @@ } .secondary-actions { - //display: none; @include box-sizing(border-box); @include clearfix; float: left; - //height: 47px; width: flex-grid(6); .social-sharing { @@ -221,10 +194,10 @@ @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); height: 120px; @include inline-block; - padding: 3px; + padding: 4px; position: relative; vertical-align: top; - width: flex-grid(2); + width: 210px; z-index: 2; &:hover { diff --git a/lms/templates/contact.html b/lms/templates/contact.html new file mode 100644 index 0000000000..01c83876c0 --- /dev/null +++ b/lms/templates/contact.html @@ -0,0 +1,36 @@ +<%namespace name='static' file='static_content.html'/> + +<%inherit file="main.html" /> + +
+ + +
+
+ +
+
+

Class Feedback

+

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

+ +

General Inqueries and Feedback

+

If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

+ +

Technical Inqueries and Feedback

+

If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at technical@edx.org. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: bugs@edx.org.

+ +

Media

+

Please visit our media/press page for more information. 
For any media or press enquiries, please email press@edx.org.

+ +

Universities

+

If you are a university wishing to Collaborate or with questions about edX, please email university@edx.org.

+ +
+
+
+ diff --git a/lms/templates/index.html b/lms/templates/index.html index 42a34358d6..5a6d3646f4 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -33,12 +33,13 @@ - -
- -
-
- + +
+ +
+
+ + @@ -104,30 +105,27 @@
- +
- Online Classes Cut Costs, But Do They Dilute Brands? + MIT Alumn. Philippe P. Laffont founder of Coatue Capital Management makes $1 million inaugural gift for edX

7/12/2012

- +
- Online Classes Cut Costs, But Do They Dilute Brands? + 6.002x – Way beyond a learning experience

7/12/2012

Press Links:

- The edX Press Release, - Online Classes Cut Costs, But Do They Dilute Brands?, - The Harvard Press Release, - The MIT Press Release + The edX Press Release
diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index 8158b39ee9..0e3737b5a6 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -11,9 +11,9 @@ Contact -

“The mission of edX is to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners.”

-
+

“The mission of edX is to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners.”

+
@@ -52,6 +52,21 @@ Massachusetts Institute of Technology

Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.

+ +
+
+

Harvard University

+

Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge. For students who are excited to investigate the biggest issues of the 21st century, Harvard offers an unparalleled student experience and a generous financial aid program, with over $160 million awarded to more than 60% of our undergraduate students. The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study, offering a truly global education.

+

Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world. +Massachusetts Institute of Technology

+
+
+

Massachusetts Institute of Technology

+

The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.

+

MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Seventy-eight MIT alumni, faculty, researchers and staff have won Nobel Prizes.

+

Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.

+
+