Skip to content

E
edx-platform
Commit ea7e006a by Kyle Fiedler
Options

merged default 

--HG--
branch : kf-titles
parents aac7cb09 3a84bafa
Showing with 200 additions and 92 deletions
404.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<section class="activation"> <section class="outside-app">
<h1>Page not found</h1> <h1>Page not found</h1>
<p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>.</p> <p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>.</p>
</section> </section>
courseware.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
${init} ${init}
$(".sequence-nav li a").hover(function(){ $(".sequence-nav li a").hover(function(){
$(this).siblings().toggle(); $(this).siblings().toggleClass("shown");
}); });
}); });
</script> </script>
......
gradebook.html
<table> <%inherit file="main.html" />
% for s in students: <%include file="navigation.html" args="active_page=''" />
<h1><a href=/profile/${s['id']}>${s['username']}</a></h1> <section class="main-content">
% for c in s['grade_info']['grade_summary']: <div class="gradebook-wrapper">
<h2>${c['category']} </h2> <section class="gradebook-content">
<p> <h1>Gradebook</h1>
% if 'subscores' in c: % for s in students:
<h2><a href=/profile/${s['id']}>${s['username']}</a></h2>
% for c in s['grade_info']['grade_summary']:
<h3>${c['category']} </h3>
<p>
% if 'subscores' in c:
% for ss in c['subscores']: % for ss in c['subscores']:
<br>${ss['summary']} <br>${ss['summary']}
% endfor % endfor
% endif % endif
</p> </p>
% endfor % endfor
% endfor % endfor
</table> </section>
</div>
</section>
login.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<h1>Log in to MITx</h1> <h1>Log in to MITx</h1>
<p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p> <p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
</header> </header>
<!--[if lte IE 8]> <!--[if lte IE 9]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</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> <p class="ie-warning">You are using a browser that is not supported by <em>MITx</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]--> <![endif]-->
......
main.html
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body class="<%block name="bodyclass"/>"> <body class="<%block name="bodyclass"/>">
<!--[if lte IE 8]> <!--[if lte IE 9]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</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> <p class="ie-warning">You are using a browser that is not supported by <em>MITx</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]--> <![endif]-->
......
registration/password_reset_confirm.html
<!DOCTYPE html>
<html>
<head>
<title>Reset password - MITx 6.002x</title>
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
{% block content %} {% block content %}
<section class="outside-app">
{% if validlink %} {% if validlink %}
...@@ -22,4 +38,8 @@ ...@@ -22,4 +38,8 @@
{% endif %} {% endif %}
</section>
{% endblock %} {% endblock %}
</body>
</html>
sass/_gradebook.scss 0 → 100644
div.gradebook-wrapper {
@extend .table-wrapper;
section.gradebook-content {
@extend .content;
h1 {
@extend .top-header;
}
}
}
sass/_info.scss
...@@ -12,15 +12,22 @@ div.info-wrapper { ...@@ -12,15 +12,22 @@ div.info-wrapper {
margin-bottom: lh(); margin-bottom: lh();
} }
ol { > ol {
list-style: none; list-style: none;
li { > li {
padding-bottom: lh(.5); padding-bottom: lh(.5);
margin-bottom: lh(.5); margin-bottom: lh(.5);
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
&:first-child {
padding: lh(.5);
margin-left: (-(lh(.5)));
background: $cream;
border-bottom: 1px solid darken($cream, 10%);
}
h2 { h2 {
float: left; float: left;
width: flex-grid(2, 9); width: flex-grid(2, 9);
......
sass/application.scss
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
@import "textbook"; @import "textbook";
@import "info"; @import "info";
@import "profile"; @import "profile";
@import "gradebook";
@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table";
@import "help"; @import "help";
......
sass/base/_base.scss
...@@ -61,8 +61,13 @@ a { ...@@ -61,8 +61,13 @@ a {
text-decoration:none; text-decoration:none;
} }
p &, li > &, span > &, .inline {
border-bottom: 1px solid #bbb;
font-style: italic;
}
&:hover, &:focus { &:hover, &:focus {
text-decoration:underline; color: #000;
} }
} }
......
sass/base/_extends.scss
...@@ -74,11 +74,16 @@ h1.top-header { ...@@ -74,11 +74,16 @@ h1.top-header {
h1, h2 { h1, h2 {
font-size: 18px; font-size: 18px;
font-weight: 800; font-weight: bold;
letter-spacing: 0; letter-spacing: 0;
text-transform: none; text-transform: none;
} }
a {
font-style: normal;
border: none;
}
.bottom-border { .bottom-border {
@include box-shadow(0 1px 0 #eee); @include box-shadow(0 1px 0 #eee);
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid #d3d3d3;
...@@ -166,8 +171,8 @@ h1.top-header { ...@@ -166,8 +171,8 @@ h1.top-header {
.topbar { .topbar {
@extend .clearfix; @extend .clearfix;
background: #F6EFD4; background: $cream;
border-bottom: 1px solid darken(#F6EFD4, 10%); border-bottom: 1px solid darken($cream, 10%);
@include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff);
font-size: 12px; font-size: 12px;
margin: (-$body-line-height) (-$body-line-height) $body-line-height; margin: (-$body-line-height) (-$body-line-height) $body-line-height;
...@@ -180,17 +185,18 @@ h1.top-header { ...@@ -180,17 +185,18 @@ h1.top-header {
} }
a { a {
color: darken(#F6EFD4, 80%); border-bottom: 0;
color: darken($cream, 80%);
&:hover { &:hover {
color: darken(#F6EFD4, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
} }
&.block-link { &.block-link {
background: darken(#F6EFD4, 5%); background: darken($cream, 5%);
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken($cream, 20%);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten($cream, 5%));
display: block; display: block;
text-transform: uppercase; text-transform: uppercase;
......
sass/base/_variables.scss
...@@ -26,6 +26,7 @@ $fg-min-width: 810px; ...@@ -26,6 +26,7 @@ $fg-min-width: 810px;
$light-gray: #ddd; $light-gray: #ddd;
$dark-gray: #333; $dark-gray: #333;
$mit-red: #993333; $mit-red: #993333;
$cream: #F6EFD4;
$text-color: $dark-gray; $text-color: $dark-gray;
$border-color: $light-gray; $border-color: $light-gray;
sass/courseware/_sequence-nav.scss
...@@ -19,7 +19,7 @@ nav.sequence-nav { ...@@ -19,7 +19,7 @@ nav.sequence-nav {
background-repeat: no-repeat; background-repeat: no-repeat;
&:hover { &:hover {
background-color: lighten(#F6EFD4, 3%); background-color: lighten($cream, 3%);
} }
} }
...@@ -29,13 +29,12 @@ nav.sequence-nav { ...@@ -29,13 +29,12 @@ nav.sequence-nav {
@include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); @include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
&:hover { &:hover {
background-color: #F6EFD4; background-color: $cream;
background-position: center center; background-position: center center;
} }
} }
.active { .active {
// @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
background-color: #fff; background-color: #fff;
background-repeat: no-repeat; background-repeat: no-repeat;
...@@ -50,11 +49,12 @@ nav.sequence-nav { ...@@ -50,11 +49,12 @@ nav.sequence-nav {
@include box-shadow(1px 0 0 #fff); @include box-shadow(1px 0 0 #fff);
background-position: center center; background-position: center center;
border: none; border: none;
border-right: 1px solid darken(#F6EFD4, 10%); border-right: 1px solid darken($cream, 10%);
cursor: pointer; cursor: pointer;
padding: 15px 4px 14px; padding: 15px 4px 14px;
width: 28px; width: 28px;
height: 17px; height: 17px;
@include transition(all, .4s, $ease-in-out-quad);
// @media screen and (max-width: 800px) { // @media screen and (max-width: 800px) {
// padding: 12px 8px; // padding: 12px 8px;
...@@ -119,16 +119,24 @@ nav.sequence-nav { ...@@ -119,16 +119,24 @@ nav.sequence-nav {
} }
p { p {
position: absolute; // display: none;
display: none; // visibility: hidden;
background: #333; background: #333;
color: #fff;
line-height: lh();
margin: 0px 0 0 -5px;
opacity: 0;
padding: 6px; padding: 6px;
position: absolute;
text-shadow: 0 -1px 0 #000;
@include transition(all, .6s, $ease-in-out-quart);
white-space: pre-wrap; white-space: pre-wrap;
z-index: 99; z-index: 99;
margin: 4px 0 0 -5px;
text-shadow: 0 -1px 0 #000; &.shown {
color: #fff; opacity: 1;
line-height: lh(); margin-top: 4px;
}
&:empty { &:empty {
background: none; background: none;
...@@ -147,7 +155,6 @@ nav.sequence-nav { ...@@ -147,7 +155,6 @@ nav.sequence-nav {
top: -5px; top: -5px;
left: 18px; left: 18px;
@include transform(rotate(45deg)); @include transform(rotate(45deg));
@include transition();
width: 10px; width: 10px;
} }
} }
...@@ -166,11 +173,8 @@ nav.sequence-nav { ...@@ -166,11 +173,8 @@ nav.sequence-nav {
&.prev, &.next { &.prev, &.next {
a { a {
// color: darken(#F6EFD4, 80%);
// letter-spacing: 1px;
// text-transform: uppercase;
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
...@@ -182,7 +186,7 @@ nav.sequence-nav { ...@@ -182,7 +186,7 @@ nav.sequence-nav {
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: darken(#F6EFD4, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
background-color: none; background-color: none;
} }
...@@ -219,18 +223,27 @@ nav.sequence-nav { ...@@ -219,18 +223,27 @@ nav.sequence-nav {
section.course-content { section.course-content {
position: relative;
div#seq_content {
margin-bottom: 60px;
}
nav.sequence-bottom { nav.sequence-bottom {
margin-bottom: -(lh()); position: absolute;
bottom: 0;
right: 50%;
margin-right: -53px;
ul { ul {
@extend .clearfix; @extend .clearfix;
background-color: darken(#F6EFD4, 5%);
border: 1px solid darken(#f6efd4, 20%); border: 1px solid darken(#f6efd4, 20%);
border-bottom: 0; border-bottom: 0;
@include border-radius(3px 3px 0 0); @include border-radius(3px 3px 0 0);
margin: lh() auto 0;
overflow: hidden; overflow: hidden;
width: 106px; width: 106px;
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
li { li {
...@@ -242,22 +255,25 @@ section.course-content { ...@@ -242,22 +255,25 @@ section.course-content {
a { a {
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
border-bottom: none;
display: block;
padding: lh(.75) 4px; padding: lh(.75) 4px;
text-indent: -9999px; text-indent: -9999px;
width: 45px; width: 45px;
display: block; display: block;
@include transition(all, .4s, $ease-in-out-quad);
&:hover { &:hover {
text-decoration: none; background-color: darken($cream, 10%);
color: darken(#F6EFD4, 60%); color: darken(#F6EFD4, 60%);
text-decoration: none; color: darken($cream, 60%);
opacity: .5; opacity: .5;
background-color: darken(#F6EFD4, 10%); text-decoration: none;
} }
&.disabled { &.disabled {
background-color: lighten($cream, 10%);
opacity: .4; opacity: .4;
background-color: lighten(#F6EFD4, 10%);
} }
} }
} }
......
sass/courseware/_sidebar.scss
...@@ -34,16 +34,37 @@ section.course-index { ...@@ -34,16 +34,37 @@ section.course-index {
ul.ui-accordion-content { ul.ui-accordion-content {
@include border-radius(0); @include border-radius(0);
@include box-shadow( inset -1px 0 0 #e6e6e6); @include box-shadow( inset -1px 0 0 #e6e6e6);
background: #d6d6d6; background: #dadada;
border: none; border: none;
border-bottom: 1px solid #c3c3c3; border-bottom: 1px solid #c3c3c3;
font-size: 12px; font-size: 12px;
margin: 0; margin: 0;
overflow: hidden; // overflow: visible;
li { li {
position: relative;
&.active { &.active {
font-weight: bold; font-weight: bold;
p.subtitle {
font-weight: normal;
}
// &:after {
// content: " ";
// width: 16px;
// height: 16px;
// position: absolute;
// right: -35px;
// top: 7px;
// display: block;
// background-color: #dadada;
// border-top: 1px solid #c3c3c3;
// border-right: 1px solid #c3c3c3;
// z-index: 99;
// @include transform(rotate(45deg));
// }
} }
a { a {
......
sass/courseware/_video.scss
...@@ -95,6 +95,7 @@ section.course-content { ...@@ -95,6 +95,7 @@ section.course-content {
a { a {
@include box-shadow(1px 0 0 #555); @include box-shadow(1px 0 0 #555);
border-bottom: none;
border-right: 1px solid #000; border-right: 1px solid #000;
display: block; display: block;
cursor: pointer; cursor: pointer;
...@@ -141,20 +142,13 @@ section.course-content { ...@@ -141,20 +142,13 @@ section.course-content {
line-height: 46px; //height of play pause buttons line-height: 46px; //height of play pause buttons
margin-right: 0; margin-right: 0;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
opacity: .7;
@include transition();
h3 { h3 {
@include inline-block(); @include inline-block();
padding: 0 lh(.5);
a { font-weight: normal;
color: #fff;
padding: 0 lh(.5);
@include inline-block();
&:hover {
text-decoration: none;
// background-color: #444;
}
}
} }
// fix for now // fix for now
...@@ -164,13 +158,23 @@ section.course-content { ...@@ -164,13 +158,23 @@ section.course-content {
li { li {
cursor: pointer; cursor: pointer;
color: #fff;
@include inline-block(); @include inline-block();
&.active { &.active {
font-weight: bold; font-weight: bold;
} }
&:hover {
color: #aaa;
}
} }
} }
&:hover {
opacity: 1;
background-color: #444;
}
} }
a.hide-subtitles { a.hide-subtitles {
...@@ -184,6 +188,7 @@ section.course-content { ...@@ -184,6 +188,7 @@ section.course-content {
font-weight: 800; font-weight: 800;
background: url('/static/images/cc.png') 16px center no-repeat; background: url('/static/images/cc.png') 16px center no-repeat;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
@include transition();
&:hover { &:hover {
color: #fff; color: #fff;
......
sass/discussion/_answers.scss
...@@ -125,6 +125,7 @@ div.paginator { ...@@ -125,6 +125,7 @@ div.paginator {
a { a {
color: #555; color: #555;
text-decoration: none; text-decoration: none;
border-bottom: none;
} }
} }
} }
...@@ -153,12 +154,6 @@ div.answer-actions { ...@@ -153,12 +154,6 @@ div.answer-actions {
&.question-delete { &.question-delete {
// color: $mit-red; // color: $mit-red;
} }
&.question-edit, &.permant-link {
// color: darken(#F6EFD4, 45%);;
}
} }
} }
sass/discussion/_profile.scss
...@@ -70,7 +70,7 @@ body.user-profile-page { ...@@ -70,7 +70,7 @@ body.user-profile-page {
margin-bottom: 30px; margin-bottom: 30px;
li { li {
background-color: lighten(#F6EFD4, 3%); background-color: lighten($cream, 3%);
background-position: 10px center; background-position: 10px center;
background-repeat: no-repeat; background-repeat: no-repeat;
@include border-radius(4px); @include border-radius(4px);
......
sass/discussion/_question-view.scss
...@@ -19,8 +19,8 @@ div.question-header { ...@@ -19,8 +19,8 @@ div.question-header {
&.post-vote { &.post-vote {
@include border-radius(4px); @include border-radius(4px);
background-color: lighten(#F6EFD4, 5%); background-color: lighten($cream, 5%);
border: 1px solid darken( #F6EFD4,10% ); border: 1px solid darken( $cream, 10% );
@include box-shadow(inset 0 1px 0px #fff); @include box-shadow(inset 0 1px 0px #fff);
} }
...@@ -64,7 +64,6 @@ div.question-header { ...@@ -64,7 +64,6 @@ div.question-header {
overflow: hidden; overflow: hidden;
padding: 5px 0 10px; padding: 5px 0 10px;
div.tag-list { div.tag-list {
display: inline-block; display: inline-block;
float:left; float:left;
...@@ -79,8 +78,6 @@ div.question-header { ...@@ -79,8 +78,6 @@ div.question-header {
width: flex-grid(4,8); width: flex-grid(4,8);
a { a {
// color: darken(#F6EFD4, 50%);
&.question-delete { &.question-delete {
color: $mit-red; color: $mit-red;
text-decoration: none; text-decoration: none;
...@@ -123,6 +120,11 @@ div.question-header { ...@@ -123,6 +120,11 @@ div.question-header {
width: 20%; width: 20%;
border-left: 1px dashed #ddd; border-left: 1px dashed #ddd;
a {
border-bottom: none;
font-style: normal;
}
div.post-update-info { div.post-update-info {
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 10px; padding: 10px;
...@@ -134,17 +136,13 @@ div.question-header { ...@@ -134,17 +136,13 @@ div.question-header {
&.revision { &.revision {
text-align: center; text-align: center;
background:lighten(#F6EFD4, 7%); background:lighten($cream, 7%);
a { a {
color: black; color: black;
} }
} }
a {
color:$mit-red ;
}
div.change-date { div.change-date {
font-size: 12px; font-size: 12px;
margin-bottom: 2px; margin-bottom: 2px;
...@@ -328,6 +326,7 @@ div.question-header { ...@@ -328,6 +326,7 @@ div.question-header {
div.controls { div.controls {
border-top: 1px solid #efefef; border-top: 1px solid #efefef;
text-align: right; text-align: right;
a { a {
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
......
sass/discussion/_tags.scss
...@@ -51,6 +51,8 @@ ul.tags { ...@@ -51,6 +51,8 @@ ul.tags {
a { a {
color: #555; color: #555;
text-decoration: none; text-decoration: none;
border-bottom: none;
font-style: normal;
} }
} }
} }
......
sass/layout/_footer.scss
...@@ -72,6 +72,7 @@ footer { ...@@ -72,6 +72,7 @@ footer {
height: 29px; height: 29px;
width: 28px; width: 28px;
text-indent: -9999px; text-indent: -9999px;
border-bottom: 0;
&:hover { &:hover {
opacity: .8; opacity: .8;
......
sass/layout/_header.scss
...@@ -52,7 +52,7 @@ div.header-wrapper { ...@@ -52,7 +52,7 @@ div.header-wrapper {
a { a {
color: #fff; color: #fff;
text-decoration: none; border: none;
&:hover { &:hover {
color: rgba(#fff, .7); color: rgba(#fff, .7);
...@@ -104,7 +104,8 @@ div.header-wrapper { ...@@ -104,7 +104,8 @@ div.header-wrapper {
display: block; display: block;
font-weight: bold; font-weight: bold;
padding: 10px lh() 8px; padding: 10px lh() 8px;
text-decoration: none; border: none;
font-style: normal;
@media screen and (max-width: 1020px) { @media screen and (max-width: 1020px) {
padding: 10px lh(.7) 8px; padding: 10px lh(.7) 8px;
......
sass/layout/_layout.scss
...@@ -29,5 +29,15 @@ html { ...@@ -29,5 +29,15 @@ html {
margin-top: lh(.5); margin-top: lh(.5);
} }
} }
section.outside-app {
@extend .main-content;
max-width: 600px;
padding: lh();
#{$all-text-inputs} {
display: block;
}
}
} }
} }
sass/wiki/_wiki.scss
...@@ -25,7 +25,7 @@ div.wiki-wrapper { ...@@ -25,7 +25,7 @@ div.wiki-wrapper {
p { p {
float: left; float: left;
margin-bottom: 0; margin-bottom: 0;
color: darken(#F6EFD4, 55%); color: darken($cream, 55%);
line-height: 46px; line-height: 46px;
padding-left: lh(); padding-left: lh();
} }
...@@ -39,14 +39,14 @@ div.wiki-wrapper { ...@@ -39,14 +39,14 @@ div.wiki-wrapper {
input[type="button"] { input[type="button"] {
@extend .block-link; @extend .block-link;
background-color: darken(#F6EFD4, 5%); background-color: darken($cream, 5%);
background-position: 12px center; background-position: 12px center;
background-repeat: no-repeat; background-repeat: no-repeat;
border: 0; border: 0;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
@include border-radius(0); @include border-radius(0);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
color: darken(#F6EFD4, 80%); color: darken($cream, 80%);
display: block; display: block;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
......
server-down.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<section class="activation"> <section class="outside-app">
<h1>Currently the <em>MITx</em> servers are down</h1> <h1>Currently the <em>MITx</em> servers are down</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p> <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section> </section>
server-error.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<section class="activation"> <section class="outside-app">
<h1>There has been an error on the <em>MITx</em> servers</h1> <h1>There has been an error on the <em>MITx</em> servers</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p> <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section> </section>
server-overloaded.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<section class="activation"> <section class="outside-app">
<h1>Currently the <em>MITx</em> servers are overloaded</h1> <h1>Currently the <em>MITx</em> servers are overloaded</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p> <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section> </section>
video.html
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<h3><a href="#">Speed</a></h3> <h3>Speed</h3>
<ol id="video_speeds"></ol> <ol id="video_speeds"></ol>
</div> </div>
<a href="#" class="hide-subtitles">on</a> <a href="#" class="hide-subtitles">turn off</a>
</div> </div>
</section> </section>
</section> </section>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
$('div.video-subtitles').toggleClass('closed'); $('div.video-subtitles').toggleClass('closed');
var link_text = $('.hide-subtitles').text(); var link_text = $('.hide-subtitles').text();
$(this).text((link_text == 'on') ? 'off' : 'on'); $(this).text((link_text == 'turn off') ? 'turn on' : 'turn off');
return false; return false;
}); });
}); });
......
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