Skip to content
Snippets Groups Projects
Commit 5033ec65 authored by Galen Frechette's avatar Galen Frechette
Browse files

changes home page header design to accomodate new tagline, adds copy to about page and 1 blog post

parent f889c9a0
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 7176 additions and 114 deletions
lms/static/images/mongolia_post.jpeg 0 → 100644
+ 0
− 0
View file @ 5033ec65
lms/static/images/mongolia_post.jpeg

282 KiB

lms/static/sass/_about_pages.scss
+ 6
− 0
View file @ 5033ec65
......@@ -51,6 +51,7 @@
}
.photo {
@include box-sizing(border-box);
background: rgb(255,255,255);
border: 1px solid rgb(210,210,210);
padding: 1px;
......@@ -64,6 +65,11 @@
}
}
> article {
float: left;
width: flex-grid(8);
}
&.left {
.photo {
float: left;
......
lms/static/sass/_home.scss
+ 124
− 49
View file @ 5033ec65
......@@ -40,15 +40,15 @@
.title {
@include inline-block;
margin-right: 50px;
padding-right: 50px;
//margin-right: 50px;
//padding-right: 50px;
position: relative;
text-align: left;
vertical-align: middle;
&::before {
@extend .faded-vertical-divider;
content: "";
//content: "";
display: block;
height: 170px;
position: absolute;
......@@ -99,66 +99,138 @@
}
}
.social-sharing {
.secondary-actions {
@include box-sizing(border-box);
@include clearfix;
float: left;
height: 44px;
position: relative;
text-align: center;
height: 47px;
width: flex-grid(6);
&:hover {
.sharing-message {
opacity: 1;
top: 56px;
}
}
.sharing-message {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5);
@include border-radius(4px);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
a.intro-video {
background: rgb(245,245,245);
@include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(235,235,235)));
border: 1px solid rgb(200,200,200);
@include border-radius(30px);
@include box-sizing(border-box);
color: rgb(255,255,255);
float: right;
font-family: $serif;
font-size: 0.9em;
font-style: italic;
left: 50%;
margin-left: -110px;
opacity: 0;
padding: 6px 10px;
position: absolute;
text-align: center;
@include transition(all, 0.15s, ease-out);
top: 65px;
width: 220px;
@include box-shadow(inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
@include clearfix;
display: block;
float: left;
height: 100%;
overflow: hidden;
text-align: middle;
width: flex-grid(6);
&:hover {
opacity: 0;
text-decoration: none;
p {
color: $base-font-color;
}
.video {
opacity: 1;
}
}
}
.share {
.video {
@include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
border-right: 1px solid rgb(200,200,200);
@include border-left-radius(30px);
@include box-shadow(1px 0 0 0 rgba(255,255,255, 0.6), inset 1px 0 0 0 rgba(255,255,255, 0.8), inset 0 0 0 1px rgba(255,255,255, 0.7));
float: left;
height: 100%;
opacity: 0.8;
position: relative;
@include transition(all, 0.15s, linear);
width: 60px;
vertical-align: middle;
.play {
background: rgba(255,255,255, 0.6);
height: 31px;
margin-left: -13px;
margin-top: -15px;
left: 50%;
position: absolute;
top: 50%;
width: 31px;
}
}
p {
color: $lighter-base-font-color;
font-style: italic;
padding-top: 10px;
text-align: center;
text-shadow: 0 1px rgba(255,255,255, 0.6);
@include transition(all, 0.15s, linear);
vertical-align: middle;
}
}
.social-sharing {
@include box-sizing(border-box);
float: left;
height: 44px;
@include inline-block;
margin-right: 10px;
opacity: 0.5;
@include transition(all, 0.15s, linear);
width: 44px;
margin-right: flex-gutter();
position: relative;
text-align: center;
width: flex-grid(6);
&:hover {
opacity: 1;
.sharing-message {
opacity: 1;
top: 56px;
}
}
img {
width: 100%;
.sharing-message {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5);
@include border-radius(4px);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
color: rgb(255,255,255);
float: right;
font-family: $serif;
font-size: 0.9em;
font-style: italic;
left: 50%;
margin-left: -110px;
opacity: 0;
padding: 6px 10px;
position: absolute;
text-align: center;
@include transition(all, 0.15s, ease-out);
top: 65px;
width: 220px;
&:hover {
opacity: 0;
}
}
&:last-child {
margin-right: 0px;
.share {
height: 44px;
@include inline-block;
margin-right: 10px;
opacity: 0.5;
@include transition(all, 0.15s, linear);
width: 44px;
&:hover {
opacity: 1;
}
img {
width: 100%;
}
&:last-child {
margin-right: 0px;
}
}
}
}
......@@ -168,15 +240,18 @@
background: #fff;
border: 1px solid rgb(200,200,200);
@include box-sizing(border-box);
float: left;
@include inline-block;
padding: 1px;
position: relative;
vertical-align: middle;
width: 210px;
//width: 210px;
width: flex-grid(3);
z-index: 2;
.hero {
height: 125px;
//height: 125px;
height: 100%;
overflow: hidden;
position: relative;
......
lms/static/sass/application.css 0 → 100644
+ 6963
− 0
View file @ 5033ec65
This diff is collapsed.
lms/static/sass/base_styles/_base.scss
+ 1
− 1
View file @ 5033ec65
......@@ -17,10 +17,10 @@ $yellow: rgb(255, 252, 221);
html, body {
background: rgb(250,250,250);
//background: rgb(77, 82, 99);
font-family: $sans-serif;
font-size: 1em;
line-height: 1em;
-webkit-font-smoothing: antialiased;
}
h1, h2, h3, h4, h5, h6 {
......
lms/static/sass/shared_styles/_shared_forms.scss
+ 1
− 0
View file @ 5033ec65
......@@ -42,5 +42,6 @@ form {
letter-spacing: 1px;
text-transform: uppercase;
vertical-align: top;
-webkit-font-smoothing: antialiased;
}
}
lms/templates/about.html
+ 20
− 13
View file @ 5033ec65
......@@ -12,14 +12,16 @@
<section class="vision">
<section class="company-mission message left">
<div class="inner-wrapper">
<div class="photo">
<img src="">
</div>
<h2>Mission: Educate 1 billion people around the world</h2>
<p>“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.</p>
<p>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.”
<div class="photo">
<img src="">
</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>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>
</article>
<hr class="fade-right-hr-divider">
</section>
......@@ -27,9 +29,11 @@
<div class="photo">
<img src="">
</div>
<h2>Mission: Educate 1 billion people around the world</h2>
<p>“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.</p>
<p>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.”
<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>
</article>
<hr class="fade-left-hr-divider">
</section>
......@@ -37,9 +41,12 @@
<div class="photo">
<img src="">
</div>
<h2>Mission: Educate 1 billion people around the world</h2>
<p>“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.</p>
<p>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.”
<article>
<h2>Massachusetts Institute of Technology</h2>
<p>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.</p>
<p>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.</p>
<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>
</section>
......
lms/templates/courses.html
+ 1
− 1
View file @ 5033ec65
......@@ -16,7 +16,7 @@
<section class="container">
## I'm removing this for now since we aren't using it for the fall.
<%include file="course_filter.html" />
## <%include file="course_filter.html" />
<section class="courses">
%for course in courses:
<%include file="course.html" args="course=course" />
......
lms/templates/footer.html
+ 1
− 0
View file @ 5033ec65
......@@ -10,6 +10,7 @@
<a href="/t/about.html">About</a>
<a href="#">Blog</a>
<a href="/t/jobs.html">Jobs</a>
<a href="/t/contact.html">Contact</a>
</section>
<section class="social">
......
lms/templates/index.html
+ 27
− 21
View file @ 5033ec65
......@@ -7,31 +7,37 @@
<div class="outer-wrapper">
<div class="inner-wrapper">
<div class="title">
<h1>The Future of Online Education</h1>
<h1>Online education for anyone, anywhere, at anytime</h1>
<div class="main-cta">
<a href="${reverse('courses')}" class="find-courses">Find Courses</a>
<a href="#signup-modal" class="find-courses" rel="leanModal">Sign Up</a>
</div>
<div class="social-sharing">
<div class="sharing-message">Share with friends and family!</div>
<a href="#" class="share">
<img src="${static.url('images/twitter-sharing.png')}">
</a>
<a href="#" class="share">
<img src="${static.url('images/facebook-sharing.png')}">
</a>
<a href="#" class="share">
<img src="${static.url('images/email-sharing.png')}">
<div class="secondary-actions">
<div class="social-sharing">
<div class="sharing-message">Share with friends and family!</div>
<a href="#" class="share">
<img src="${static.url('images/twitter-sharing.png')}">
</a>
<a href="#" class="share">
<img src="${static.url('images/facebook-sharing.png')}">
</a>
<a href="#" class="share">
<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>
<a href="#video-modal" class="media" rel="leanModal">
<div class="hero">
<img src="${static.url('images/courses/space1.jpg')}" />
<div class="play-intro"></div>
</div>
</a>
</div>
</div>
</header>
......@@ -87,10 +93,10 @@
<section class="blog-posts">
<article>
<a href="#" class="post-graphics">
<img src="${static.url('images/courses/space1.jpg')}" />
<img src="${static.url('images/mongolia_post.jpeg')}" />
</a>
<div class="post-name">
<a href="">Online Classes Cut Costs, But Do They Dilute Brands?</a>
<a href="">Opening Doors For Exceptional Students: 6.002x in Mongolia.</a>
<p class="post-date">7/12/2012</p>
</div>
</article>
......
lms/templates/jobs.html
+ 12
− 11
View file @ 5033ec65
......@@ -22,6 +22,14 @@
<h2>We are currently looking for</h2>
<section class="jobs-listing">
<article id="technology-team" class="job">
<div class="inner-wrapper">
<h3>Technology Team</h3>
<p>[Looking for both back-end and front-end developers. Strong backgrounds in machine learning, education, user interaction design, big data, or social network analysis are desirable, but team members do wear many hats. Best candidate would be a masterful hacker who went and did startups after finishing their Ph.D. We should find a way to make some positions that parallel fellows, and can leverage MIT/Harvard prestige]</p>
<p>If you're interested in this position, send an e-mail to <a href="">content-engineer@edxonline.org</a></p>
</div>
</article>
<article id="edx-fellow" class="job">
<div class="inner-wrapper">
<h3>edX Fellow</h3>
......@@ -49,27 +57,20 @@
<p>If you're interested in this position, send an e-mail to <a href="">content-engineer@edxonline.org</a></p>
</div>
</article>
<article id="technology-team" class="job">
<div class="inner-wrapper">
<h3>Technology Team</h3>
<p>[Looking for both back-end and front-end developers. Strong backgrounds in machine learning, education, user interaction design, big data, or social network analysis are desirable, but team members do wear many hats. Best candidate would be a masterful hacker who went and did startups after finishing their Ph.D. We should find a way to make some positions that parallel fellows, and can leverage MIT/Harvard prestige]</p>
<p>If you're interested in this position, send an e-mail to <a href="">content-engineer@edxonline.org</a></p>
</div>
</article>
</section>
<section class="jobs-sidebar">
<h2>Positions</h2>
<nav>
<a href="#technology-team">Technology Team</a>
<a href="#edx-fellow">edX Fellow</a>
<a href="#content-engineer">Content Engineer</a>
<a href="#technology-team">Technology Team</a>
</nav>
<h2>How to Apply</h2>
<p>E-mail your resume, coverletter and any other materials to <a href="#">careers@edxonline.org</a></p>
<p>E-mail your resume, coverletter and any other materials to <a href="#">careers@edx.org</a></p>
<h2>Our Location</h2>
<p>11 Cambridge Center, Cambridge MA USA</p>
<p>11 Cambridge Center <br/>
Cambridge, MA 02142</p>
</section>
</section>
......
lms/templates/navigation.html
+ 1
− 0
View file @ 5033ec65
......@@ -37,6 +37,7 @@
<a href="/t/about.html">About</a>
<a href="#">Blog</a>
<a href="${reverse('jobs')}">Jobs</a>
<a href="/t/contact.html">Contact</a>
<a href="#login-modal" id="login" rel="leanModal">Log In</a>
</li>
<li class="primary">
......
lms/templates/signup_modal.html
+ 19
− 18
View file @ 5033ec65
......@@ -32,26 +32,27 @@
<input name="honor_code" type="checkbox" value="true">
I agree to the
<a href="/t/honor.html" target="blank">Honor Code</a>
, sumarized below as:
</label>
<div class="honor-code-summary">
<ul>
<li>
<p>Complete all mid-terms and final exams with only my own work.</p>
</li>
<li>
<p>Maintain only one account, and not share the username or password.</p>
</li>
<li>
<p>Not engage in any activity that would dishonestly improve my results, or improve or hurt those of others.</p>
</li>
<li>
<p>Not post answers to problems that are being used to assess student performance.</p>
</li>
</ul>
<hr>
</div>
<!--
-<div class="honor-code-summary">
- <ul>
- <li>
- <p>Complete all mid-terms and final exams with only my own work.</p>
- </li>
- <li>
- <p>Maintain only one account, and not share the username or password.</p>
- </li>
- <li>
- <p>Not engage in any activity that would dishonestly improve my results, or improve or hurt those of others.</p>
- </li>
- <li>
- <p>Not post answers to problems that are being used to assess student performance.</p>
- </li>
- </ul>
- <hr>
-</div>
-->
<div class="submit">
<input name="submit" type="submit" value="Create My Account">
......
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