Skip to content

E
edx-platform
Commit 597c1db5 by Galen Frechette
Options

updates basic html structure and base color

parent d8d3eb14
Showing with 110 additions and 113 deletions
lms/static/sass/_base.scss
......@@ -15,7 +15,7 @@ $blue: rgb(29,157,217);
$pink: rgb(182,37,104);
html, body {
background: rgb(253,253,253);
background: rgb(250,250,250);
font-size: 75%;
}
......@@ -23,7 +23,6 @@ h1, h2, h3, h4, h5, h6 {
color: $base-font-color;
font: normal 1.4rem/2rem $serif;
margin: 0px;
-webkit-font-smoothing: antialiased;
}
h1 {
......@@ -41,13 +40,13 @@ h2 {
letter-spacing: 1px;
margin-bottom: 15px;
text-transform: uppercase;
-webkit-font-smoothing: antialiased;
}
p {
color: $base-font-color;
font: normal 1.3rem/2rem $serif;
margin: 0px;
//-webkit-font-smoothing: antialiased;
}
p + p {
......@@ -73,7 +72,6 @@ a:link, a:visited {
font: normal 1.2rem/2rem $sans-serif;
text-decoration: none;
@include transition(all, 0.1s, linear);
//-webkit-font-smoothing: antialiased;
&:hover {
color: $base-font-color;
......@@ -81,6 +79,7 @@ a:link, a:visited {
}
.content-wrapper {
background: rgb(255,255,255);
margin: 0 auto 0;
width: flex-grid(12);
}
......
lms/static/sass/_shared_footer.scss
footer {
background: rgb(250,250,250);
background: transparent;
border-top: 1px solid rgb(200,200,200);
@include box-shadow(inset 0 1px 3px 0 rgba(0,0,0, 0.1));
margin: 0 auto;
......@@ -67,7 +67,6 @@ footer {
color: $lighter-base-font-color;
font: italic 1.2rem/1.6rem $serif;
margin-left: 5px;
//text-decoration: underline;
}
}
}
......
lms/static/sass/application.css
......@@ -364,14 +364,13 @@ td {
font-style: italic; }
html, body {
background: #fdfdfd;
background: #fafafa;
font-size: 75%; }
h1, h2, h3, h4, h5, h6 {
color: #3c3c3c;
font: normal 1.4rem/2rem Georgia, Cambria, "Times New Roman", Times, serif;
margin: 0px;
-webkit-font-smoothing: antialiased; }
margin: 0px; }
h1 {
color: #a0a0a0;
......@@ -386,7 +385,8 @@ h2 {
font: normal 1.4rem/2rem Georgia, Cambria, "Times New Roman", Times, serif;
letter-spacing: 1px;
margin-bottom: 15px;
text-transform: uppercase; }
text-transform: uppercase;
-webkit-font-smoothing: antialiased; }
p {
color: #3c3c3c;
......@@ -452,6 +452,7 @@ a:link, a:visited {
color: #3c3c3c; }
.content-wrapper {
background: white;
margin: 0 auto 0;
width: 100%; }
......@@ -1391,7 +1392,7 @@ form {
box-shadow: inset 0 0 20px 0 #00295f, 0 1px 0 white; }
footer {
background: #fafafa;
background: transparent;
border-top: 1px solid #c8c8c8;
-webkit-box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.1);
......
lms/templates/courses.html
......@@ -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/dashboard.html
......@@ -3,110 +3,108 @@
<%namespace name='static' file='static_content.html'/>
<section class="container">
<section class="dashboard">
<section class="container dashboard">
<section class="sidebar">
<header class="profile">
<section class="user-info">
<div class="avatar">
<img src="${static.url('images/profile.jpg')}" />
</div>
<section class="info">
<h2>${ user.username }</h2>
<ul>
<li>
<h3>Email: <span>${ user.email }</span></h3>
</li>
<li>
<h3>Location: <span>${ user.profile.location }</span></h3>
</li>
<li>
<h3>Language: <span>${ user.profile.language }</span></h3>
</li>
</ul>
</section>
</section>
<section class="meta-info">
<section class="sidebar">
<header class="profile">
<section class="user-info">
<div class="avatar">
<img src="${static.url('images/profile.jpg')}" />
</div>
<section class="info">
<h2>${ user.username }</h2>
<ul>
<li>
<h3>Email: <span>${ user.email }</span></h3>
</li>
<li>
<h3>Location: <span>${ user.profile.location }</span></h3>
</li>
<li>
<h3>Language: <span>${ user.profile.language }</span></h3>
</li>
</ul>
</section>
</header>
</section>
</section>
<section class="meta-info">
</section>
</header>
</section>
<section class="my-courses">
<header>
<h2>My Current Courses</h2>
</header>
<section class="my-courses">
<header>
<h2>My Current Courses</h2>
</header>
% if len(courses) > 0:
% for course in courses:
<article class="my-course">
<a href="${reverse('info', args=[course.id])}">
<div class="cover">
<div class="shade"></div>
<div class="arrow"></div>
<img src="${static.url('images/circuits.jpeg')}" />
</div>
<section class="info">
<hgroup>
<h2>${course.get_about_section("title")}</h2>
% for instructor in course.instructors:
<h3>${course.get_about_section('university')}</h3>
% endfor
</hgroup>
<div class="edit">options</div>
<section class="meta">
<div class="complete">
<p>60% complete</p>
</div>
<div class="progress">
<div class="meter">
<div class="meter-fill"></div>
</div>
</div>
<div class="end-date">
<p>End date: <time>6/10/12</time></p>
% if len(courses) > 0:
% for course in courses:
<article class="my-course">
<a href="${reverse('info', args=[course.id])}">
<div class="cover">
<div class="shade"></div>
<div class="arrow"></div>
<img src="${static.url('images/circuits.jpeg')}" />
</div>
<section class="info">
<hgroup>
<h2>${course.get_about_section("title")}</h2>
% for instructor in course.instructors:
<h3>${course.get_about_section('university')}</h3>
% endfor
</hgroup>
<div class="edit">options</div>
<section class="meta">
<div class="complete">
<p>60% complete</p>
</div>
<div class="progress">
<div class="meter">
<div class="meter-fill"></div>
</div>
</section>
</div>
<div class="end-date">
<p>End date: <time>6/10/12</time></p>
</div>
</section>
</a>
</article>
% endfor
% else:
<section class="empty-dashboard-message">
<p>Looks like you aren't registered for any courses. You should take a minute and <a href="${reverse('courses')}" class="find-courses">Find some courses!</a></p>
</section>
% endif
</section>
</a>
</article>
% endfor
% else:
<section class="empty-dashboard-message">
<p>Looks like you aren't registered for any courses. You should take a minute and <a href="${reverse('courses')}" class="find-courses">Find some courses!</a></p>
</section>
% endif
<article class="my-course">
<a href="/info">
<div class="cover">
<div class="shade"></div>
<div class="arrow"></div>
<img src="${static.url('images/python.png')}" />
</div>
<section class="info">
<hgroup>
<h2>CS 102 Python</h2>
<p>Adam Smith, Harvard University</p>
</hgroup>
<div class="edit">options</div>
<section class="meta">
<div class="complete">
<p>60% complete</p>
</div>
<div class="progress">
<div class="meter">
<div class="meter-fill"></div>
</div>
</div>
<div class="end-date">
<p>End date: <time>6/10/12</time></p>
<article class="my-course">
<a href="/info">
<div class="cover">
<div class="shade"></div>
<div class="arrow"></div>
<img src="${static.url('images/python.png')}" />
</div>
<section class="info">
<hgroup>
<h2>CS 102 Python</h2>
<p>Adam Smith, Harvard University</p>
</hgroup>
<div class="edit">options</div>
<section class="meta">
<div class="complete">
<p>60% complete</p>
</div>
<div class="progress">
<div class="meter">
<div class="meter-fill"></div>
</div>
</section>
</div>
<div class="end-date">
<p>End date: <time>6/10/12</time></p>
</div>
</section>
</a>
</article>
</section>
</section>
</a>
</article>
</section>
</section>
lms/templates/index.html
......@@ -2,7 +2,7 @@
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<section class="content-wrapper home">
<section class="home">
<header>
<div class="inner-wrapper">
<h1>The Future of Online Education</h1>
......
lms/templates/main.html
......@@ -67,14 +67,14 @@
<p class="ie-warning">You are using a browser that is not supported by <em>edX</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
<![endif]-->
${self.body()}
<section class="content-wrapper">
${self.body()}
</section>
<%block name="bodyextra"/>
<%include file="footer.html" />
<%block name="js_extra"/>
<script src="${static.url('js/my_courses_dropdown.js')}"></script>
<!--
-<script src="${static.url('js/sticky_footer.js')}"></script>
-->
<script src="${static.url('js/toggle_login_modal.js')}"></script>
<script src="${static.url('js/sticky_filter.js')}"></script>
......
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