Skip to content

E
edx-platform
Commit 6ed9f716 by Bridger Maxwell
Options

Merge remote-tracking branch 'origin/master' into release/1.0 

Conflicts:
	lms/templates/index.html
parents 30d0a9bd ba6346cb
Showing with 124 additions and 84 deletions
lms/static/sass/_about_pages.scss
......@@ -37,6 +37,14 @@
margin-bottom: 80px;
}
h2.mission-quote {
font-style: italic;
margin: 0 auto 120px;;
text-align: center;
text-transform: none;
width: flex-grid(10);
}
.message {
@include clearfix;
margin-bottom: 60px;
......@@ -60,7 +68,7 @@
img {
background: rgb(245,245,245);
display: block;
height: 200px;
//height: 200px;
width: 100%;
}
}
......@@ -88,6 +96,19 @@
margin-bottom: 0px;
}
}
.partners {
@include clearfix;
> article {
float: left;
width: flex-grid(6);
&:first-child {
margin-right: flex-gutter();
}
}
}
}
.faq {
......@@ -146,27 +167,6 @@
}
.press {
.press-resources {
@include clearfix;
margin-bottom: 60px;
.pressreleases, .identity-assets {
background: rgb(245,245,245);
border: 1px solid rgb(200,200,200);
@include box-sizing(border-box);
@include border-radius(4px);
float: left;
padding: 20px 30px;
text-align: center;
width: flex-grid(6);
}
.pressreleases {
margin-right: flex-gutter();
}
}
.press-story {
border-bottom: 1px solid rgb(220,220,220);
@include clearfix;
......
lms/static/sass/_course_about.scss
......@@ -10,21 +10,21 @@
@include box-shadow(0 1px 80px 0 rgba(0,0,0, 0.5));
border-bottom: 1px solid rgb(100,100,100);
@include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.1));
height: 280px;
margin-top: -69px;
padding-top: 150px;
overflow: hidden;
padding: 134px 0px 60px;
position: relative;
width: 100%;
.intro-inner-wrapper {
background: rgba(255,255,255, 0.9);
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);
@include clearfix;
margin: 0 auto;
max-width: 1200px;
padding: 0px 10px;
position: relative;
width: grid-width(12);
z-index: 2;
......@@ -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;
......
lms/static/sass/_courses.scss
......@@ -4,10 +4,10 @@
header.search {
background: rgb(240,240,240);
//@include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
border-bottom: 1px solid rgb(100,100,100);
@include box-shadow(inset 0 -1px 8px 0 rgba(0,0,0, 0.2), inset 0 1px 12px 0 rgba(0,0,0, 0.3));
height: 430px;
margin-top: -69px;
width: 100%;
......@@ -15,26 +15,13 @@
height: 120px;
margin: 0 auto;
max-width: 1200px;
overflow: hidden;
padding: 154px 0px 80px;
padding-top: 200px;
position: relative;
text-align: center;
width: flex-grid(12);
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 1) 0%, rgba(255,255,255, 0) 100%));
bottom: -300px;
content: "";
display: none;
height: 600px;
margin: 0 auto;
position: absolute;
width: 100%;
z-index: 1;
}
> hgroup {
background: rgba(255,255,255, 0.9);
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));
padding: 20px 30px;
......
lms/static/sass/base/_base.scss
......@@ -18,7 +18,7 @@ h1 {
letter-spacing: 1px;
margin-bottom: 30px;
text-align: center;
text-transform: uppercase;
//text-transform: uppercase;
}
h2 {
......
lms/templates/contact.html 0 → 100644
<%namespace name='static' file='static_content.html'/>
<%inherit file="main.html" />
<section class="container about">
<nav>
<a href="/t/about.html">Vision</a>
<a href="/t/faq.html">Faq</a>
<a href="/t/press.html">Press</a>
<a href="/t/contact.html" class="active">Contact</a>
</nav>
<section class="contact">
<div class="map">
<img src="${static.url('images/edx-location.png')}">
</div>
<div class="contacts">
<h2>Class Feedback</h2>
<p>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.</p>
<h2>General Inqueries and Feedback</h2>
<p>If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
<h2>Technical Inqueries and Feedback</h2>
<p>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 <a href="mailto:technical@edx.org">technical@edx.org</a>. 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: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>
<h2>Media</h2>
<p>Please visit our <a href="${reverse('faq_edx')}">media/press page</a> for more information. 
For any media or press enquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p>
<h2>Universities</h2>
<p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
</div>
</section>
</section>
lms/templates/course.html
......@@ -19,7 +19,7 @@
<img src="${static.url('images/courses/history.png')}">
</div>
<div class="desc">
${course.get_about_section('short_description')}
<p>${course.get_about_section('short_description')}</p>
</div>
<div class="bottom">
<a href="#" class="university">${course.get_about_section('university')}</a>
......
lms/templates/index.html
......@@ -6,10 +6,13 @@
<section class="home">
<header>
<div class="outer-wrapper">
<div class="inner-wrapper">
<div class="title">
<h1>Online education for anyone, anywhere, at anytime</h1>
<div class="title">
<hgroup>
<h1>The Future of Online Education</h1>
<h2>For anyone, anywhere, anytime.</h2>
</hgroup>
<section class="actions">
<div class="main-cta">
<a href="#signup-modal" class="find-courses" rel="leanModal">Sign Up</a>
</div>
......@@ -27,19 +30,18 @@
<img src="${static.url('images/email-sharing.png')}">
</a>
</div>
<a href="#video-modal" class="intro-video" rel="leanModal">
<!--
-<img src="${static.url('images/courses/space1.jpg')}" />
-->
<div class="video">
<div class="play"></div>
</div>
<p>Play intro video</p>
</a>
</div>
</div>
</section>
</div>
<a href="#video-modal" class="media" rel="leanModal">
<div class="hero">
<img src="${static.url('images/courses/space3.jpg')}" />
<div class="play-intro"></div>
</div>
</a>
</div>
</header>
......@@ -106,6 +108,10 @@
</article>
%endfor
</section>
<section class="press-links">
<h3>Press Links:</h3>
<a href="${reverse('pressrelease')}">The edX Press Release</a>
</section>
</section>
</section>
</section>
......
lms/templates/static_templates/about.html
......@@ -12,35 +12,38 @@
</nav>
<section class="vision">
<section class="company-mission message left">
<h2 class="mission-quote">“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.”</h2>
<section class="message left">
<div class="photo">
<img src="">
<img src="${static.url('images/about_1.jpg')}">
</div>
<article>
<h2>About edX</h2>
<p>EdX is a joint partnership between The Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to millions of people around the world. EdX offer Harvard and MIT classes online for free. Through this partnership, with other partners to follow, the institutions aim to extend their collective reach to build a global community of online students.</p>
<p>EdX is a joint partnership between The Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to millions of people around the world. EdX offers Harvard and MIT classes online for free. Through this partnership, with other partners to follow, the institutions aim to extend their collective reach to build a global community of online students</p>
<p>MIT’s Director of the Computer Science and Artificial Intelligence Laboratory Anant Agarwal serves as the first president of edX, and Harvard’s Faculty of Arts and Sciences Dean Michael D. Smith leads faculty in developing courses. Along with offering online courses, the institutions will use edX to research how students learn and how technology can facilitate teaching—both on-campus and online.</p>
<p>EdX is based on an open-source technological platform that provides interactive educational materials designed specifically for the web, and is available to anyone in the world with an internet connection.</p>
<p>Harvard and MIT have created edX open-source software and invite interested institutions to join edX with their own educational content. EdX is a Cambridge-based not-for-profit, equally owned and funded by Harvard and MIT</p>
<p>EdX is a Cambridge-based not-for-profit, equally owned and funded by Harvard and MIT.</p>
</article>
<hr class="fade-right-hr-divider">
</section>
<section class="our-culture message right">
<section class="message right">
<div class="photo">
<img src="">
<img src="${static.url('images/about-harvard.jpg')}">
</div>
<article>
<h2>Harvard University</h2>
<p>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.</p>
<p>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.</p>
<p>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</p>
</article>
<hr class="fade-left-hr-divider">
</section>
<section class="benefits message left">
<section class="message left">
<div class="photo">
<img src="">
<img src="${static.url('images/about-mit.jpg')}">
</div>
<article>
<h2>Massachusetts Institute of Technology</h2>
......@@ -49,6 +52,9 @@
<p>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.</p>
</article>
</section>
<section class="partners">
</section>
</section>
</section>
lms/templates/static_templates/contact.html
......@@ -24,11 +24,21 @@
<li><p>Suggestions: <a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></p></li>
</ul>
<h2>Physical Address</h2>
<ul>
<li><p>11 Cambridge Center</p></li>
<li><p>Cambridge, MA 02142</p></li>
</ul>
<h2>Class Feedback</h2>
<p>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.</p>
<h2>General Inqueries and Feedback</h2>
<p>If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
<h2>Technical Inqueries and Feedback</h2>
<p>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 <a href="mailto:technical@edx.org">technical@edx.org</a>. 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: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>
<h2>Media</h2>
<p>Please visit our <a href="${reverse('faq_edx')}">media/press page</a> for more information. 
For any media or press enquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p>
<h2>Universities</h2>
<p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
</div>
</section>
</section>
......
lms/templates/static_templates/press.html
......@@ -12,14 +12,6 @@
</nav>
<section class="press">
<section class="press-resources">
<section class="pressreleases">
<p>View our <a href="${reverse('pressrelease')}">Press Release</a></p>
</section>
<section class="identity-assets">
<p>Download our <a href="${reverse('pressrelease')}">Logos</a></p>
</section>
</section>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment