Skip to content

E
edx-platform
Commit b08ea47b by John Jarvis
Options

Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates

parents 0642af01 61fa1184
Showing with 86 additions and 152 deletions
lms/askbot/skins/mitx/templates/base.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #} {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
{# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #} {# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #}
<section class="main-content"> <section class="container">
{% block body %} {% block body %}
{% endblock %} {% endblock %}
</section> </section>
......
lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html
{% load extra_filters_jinja %} {% load extra_filters_jinja %}
<!--<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />--> <!--<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />-->
{{ 'application' | compressed_css }} {{ 'application' | compressed_css }}
{{ 'course' | compressed_css }}
lms/askbot/skins/mitx/templates/navigation.jinja.html
<header class="app" aria-label="Global Navigation"> <header class="global" aria-label="Global Navigation">
<nav> <nav>
<a href="{{ MITX_ROOT_URL }}" class="logo"> <h1 class="logo"><a href="${reverse('root')}"></a></h1>
<img src="/static/images/logo.png" /> <ol class="left">
</a> <li class="primary">
<a href="${reverse('courses')}">Find Courses</a>
{%if request.user.is_authenticated(): %}
<h1>Circuits and Electronics</h1>
<ol class="user">
<li>
<a href="/dashboard" class="user-dashboard">
<span class="avatar"><img src="/static/images/profile.jpg" /></span>
{{ request.user.username }}
</a>
</li>
<li>
<a href="#" class="options">&#9662</a>
<ol class="user-options">
<li><a href="#">Account Settings</a></li>
<li><a href="/logout">Log Out</a></li>
</ol>
</li> </li>
</ol> </ol>
{%else:%}
<ol>
<li><a href="/courses">Courses</a></li>
<li><a href="#">How It Works</a></li>
</ol>
<ol class="user"> <ol class="user">
<li><a href="/dashboard">Log In</a></li> <li class="primary">
<li><a href="#">Sign Up</a></li> <a href="${reverse('dashboard')}" class="user-link">
</ol> <span class="avatar"></span>
<ol class="secondary"> ${user.username}
<li> </a>
<a href="#">About</a>
</li>
<li>
<a href="#">Jobs</a>
</li> </li>
<li> <li class="primary">
<a href="#">faq</a> <a href="#" class="dropdown">&#9662</a>
<ul class="dropdown-menu">
## <li><a href="#">Account Settings</a></li>
<li><a href="${reverse('help_edx')}">Help</a></li>
<li><a href="${reverse('logout')}">Log Out</a></li>
</ul>
</li> </li>
</ol> </ol>
{%endif %}
</nav> </nav>
</header> </header>
lms/askbot/skins/mitx/templates/widgets/footer.html
<!-- template footer.html --> <!-- template footer.html -->
<footer> <footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
</p>
<nav> <nav>
<ul class="social"> <section class="top">
<li class="linkedin"> <section class="primary">
<a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a> <a href="${reverse('root')}" class="logo"></a>
</li> <a href="${reverse('courses')}">Find Courses</a>
<li class="twitter"> <a href="${reverse('about_edx')}">About</a>
<a href="https://twitter.com/#!/MyMITx">Twitter</a> <a href="http://edxonline.tumblr.com/">Blog</a>
</li> <a href="${reverse('jobs')}">Jobs</a>
<li class="facebook"> <a href="${reverse('contact')}">Contact</a>
<a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a> </section>
</li>
</ul> <section class="social">
<ul> <a href="http://youtube.com/user/edxonline"><img src="${static.url('images/social/youtube-sharing.png')}" /></a>
<a href="https://plus.google.com/108235383044095082735"><img src="${static.url('images/social/google-plus-sharing.png')}" /></a>
<a href="http://www.facebook.com/EdxOnline"><img src="${static.url('images/social/facebook-sharing.png')}" /></a>
<a href="https://twitter.com/edXOnline"><img src="${static.url('images/social/twitter-sharing.png')}" /></a>
</section>
</section>
<section class="bottom">
<section class="copyright">
<p style="float:left;">&copy; 2012 edX, some rights reserved.</p>
</section>
<section class="secondary">
<a href="${reverse('tos')}">Terms of Service</a>
<a href="${reverse('privacy_edx')}">Privacy Policy</a>
<a href="${reverse('honor')}">Honor Code</a>
<a href="${reverse('help_edx')}">Help</a>
</section>
</section>
<li><a href="/s/help.html">Help</a></li>
<li><a href="/logout">Log out</a></li>
</ul>
</nav> </nav>
</footer> </footer>
<!-- end template footer.html --> <!-- end template footer.html -->
lms/envs/common.py
...@@ -304,7 +304,7 @@ PIPELINE_CSS = { ...@@ -304,7 +304,7 @@ PIPELINE_CSS = {
'output_filename': 'css/lms-application.css', 'output_filename': 'css/lms-application.css',
}, },
'course': { 'course': {
'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css'], 'source_filenames': ['js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css', 'sass/course.scss'],
'output_filename': 'css/lms-course.css', 'output_filename': 'css/lms-course.css',
}, },
'ie-fixes': { 'ie-fixes': {
......
lms/static/sass/course/_help.scss deleted 100644 → 0
section.help.main-content {
padding: lh();
h1 {
border-bottom: 1px solid #ddd;
margin-bottom: lh();
margin-top: 0;
padding-bottom: lh();
}
p {
max-width: 700px;
}
h2 {
margin-top: 0;
}
section.self-help {
float: left;
margin-bottom: lh();
margin-right: flex-gutter();
width: flex-grid(6);
ul {
margin-left: flex-gutter(6);
li {
margin-bottom: lh(.5);
}
}
}
section.help-email {
float: left;
width: flex-grid(6);
dl {
display: block;
margin-bottom: lh();
dd {
margin-bottom: lh();
}
dt {
clear: left;
float: left;
font-weight: bold;
width: flex-grid(2, 6);
}
}
}
}
lms/static/sass/course/base/_base.scss
...@@ -5,3 +5,11 @@ body { ...@@ -5,3 +5,11 @@ body {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: $sans-serif; font-family: $sans-serif;
} }
table {
table-layout: fixed;
}
.container {
padding: lh(2);
}
lms/static/sass/course/base/_extends.scss
...@@ -84,7 +84,8 @@ h1.top-header { ...@@ -84,7 +84,8 @@ h1.top-header {
} }
.sidebar { .sidebar {
border-right: 1px solid #d3d3d3; border-right: 1px solid #C8C8C8;
@include box-shadow(inset -1px 0 0 #e6e6e6);
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
font-family: $sans-serif; font-family: $sans-serif;
...@@ -181,7 +182,6 @@ h1.top-header { ...@@ -181,7 +182,6 @@ h1.top-header {
.topbar { .topbar {
@extend .clearfix; @extend .clearfix;
background: $cream;
border-bottom: 1px solid darken($cream, 10%); border-bottom: 1px solid darken($cream, 10%);
border-top: 1px solid #fff; border-top: 1px solid #fff;
font-size: 12px; font-size: 12px;
......
lms/static/sass/course/courseware/_courseware.scss
...@@ -3,22 +3,6 @@ html { ...@@ -3,22 +3,6 @@ html {
max-height: 100%; max-height: 100%;
} }
body.courseware {
height: 100%;
max-height: 100%;
.container {
padding-bottom: 40px;
margin-top: 20px;
}
footer {
&.fixed-bottom {
Position: static;
}
}
}
div.course-wrapper { div.course-wrapper {
@extend .table-wrapper; @extend .table-wrapper;
......
lms/static/sass/course/courseware/_sidebar.scss
...@@ -13,44 +13,50 @@ section.course-index { ...@@ -13,44 +13,50 @@ section.course-index {
div#accordion { div#accordion {
h3 { h3 {
@include box-shadow(inset 0 1px 0 0 #eee); @include border-radius(0);
border-top: 1px solid #d3d3d3; border-top: 1px solid #e3e3e3;
overflow: hidden;
margin: 0; margin: 0;
overflow: hidden;
&:first-child { &:first-child {
border: none; border: none;
} }
&:hover { &:hover {
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225))); background: #eee;
} }
&.ui-accordion-header { &.ui-accordion-header {
color: #000; color: #000;
a { a {
font-size: $body-font-size; @include border-radius(0);
@include box-shadow(none);
color: lighten($text-color, 10%); color: lighten($text-color, 10%);
font-size: $body-font-size;
} }
&.ui-state-active { &.ui-state-active {
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
@extend .active; @extend .active;
border-bottom: 1px solid #d3d3d3; border-bottom: none;
&:hover {
background: none;
}
} }
} }
} }
ul.ui-accordion-content { ul.ui-accordion-content {
@include border-radius(0); @include border-radius(0);
@include box-shadow(inset -1px 0 0 #e6e6e6); background: #FFF;
border: none; border: none;
font-size: 12px; font-size: 12px;
margin: 0; margin: 0;
padding: 1em 1.5em; padding: 1em 1.5em;
li { li {
@include border-radius(0);
margin-bottom: lh(.5); margin-bottom: lh(.5);
a { a {
...@@ -120,8 +126,6 @@ section.course-index { ...@@ -120,8 +126,6 @@ section.course-index {
font-weight: bold; font-weight: bold;
> a { > a {
background: rgb(240,240,240);
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(230,230,230)));
border-color: rgb(200,200,200); border-color: rgb(200,200,200);
&:after { &:after {
......
lms/static/sass/course/discussion/_discussion.scss
// Generic layout styles for the discussion forums // Generic layout styles for the discussion forums
body.askbot { body.askbot {
section.container {
section.main-content {
div.discussion-wrapper { div.discussion-wrapper {
@extend .table-wrapper; @extend .table-wrapper;
......
lms/static/sass/course/layout/_courseware_subnav.scss
nav.course-material { nav.course-material {
background: rgb(210,210,210);
@include clearfix; @include clearfix;
@include box-sizing(border-box); @include box-sizing(border-box);
@include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.05)); background: #f6f6f6;
border-bottom: 1px solid rgb(190,190,190); border-bottom: 1px solid rgb(200,200,200);
margin: 0px auto 0px; margin: 0px auto 0px;
padding: 0px; padding: 0px;
width: 100%; width: 100%;
...@@ -24,12 +23,14 @@ nav.course-material { ...@@ -24,12 +23,14 @@ nav.course-material {
list-style: none; list-style: none;
a { a {
color: $lighter-base-font-color; color: darken($lighter-base-font-color, 20%);
display: block; display: block;
text-align: center; text-align: center;
padding: 5px 13px; padding: 8px 13px 12px;
font-size: 14px;
font-weight: 400;
text-decoration: none; text-decoration: none;
text-shadow: 0 1px rgba(255,255,255, 0.4); text-shadow: 0 1px rgb(255,255,255);
&:hover { &:hover {
color: $base-font-color; color: $base-font-color;
...@@ -41,7 +42,7 @@ nav.course-material { ...@@ -41,7 +42,7 @@ nav.course-material {
border-bottom: 0px; border-bottom: 0px;
@include border-top-radius(4px); @include border-top-radius(4px);
@include box-shadow(0 2px 0 0 rgba(255,255,255, 1)); @include box-shadow(0 2px 0 0 rgba(255,255,255, 1));
color: $base-font-color; color: $blue;
} }
} }
} }
......
lms/templates/courseware.html
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
<div class="course-wrapper"> <div class="course-wrapper">
<section aria-label="Course Navigation" class="course-index"> <section aria-label="Course Navigation" class="course-index">
<header id="open_close_accordion"> <header id="open_close_accordion">
<h2>Courseware Index</h2>
<a href="#">close</a> <a href="#">close</a>
</header> </header>
......
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