diff --git a/404.html b/404.html index 644f802a13..65b4061b30 100644 --- a/404.html +++ b/404.html @@ -1,7 +1,7 @@ <%inherit file="main.html" /> -
+

Page not found

The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@mitx.mit.edu.

diff --git a/gradebook.html b/gradebook.html index 7dc9c3181e..e4fe98152f 100644 --- a/gradebook.html +++ b/gradebook.html @@ -1,38 +1,27 @@ +<<<<<<< local +<%inherit file="main.html" /> <%namespace name="profile_graphs" file="profile_graphs.js"/> - - - - - - - - +<%block name="headextra"> + + + - % for s in students: - - %endfor - - - % for s in students: -

${s['username']}

+ + %endfor + -
- - - % endfor - - +
+ + \ No newline at end of file diff --git a/login.html b/login.html index 0372532284..f371aa2e4c 100644 --- a/login.html +++ b/login.html @@ -4,7 +4,7 @@

Log in to MITx

If you don’t have an account yet, please enroll here

- diff --git a/main.html b/main.html index 89ee65876f..119e861036 100644 --- a/main.html +++ b/main.html @@ -27,7 +27,7 @@ "> - @@ -87,7 +87,7 @@
Functions:
sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
Constants
-
e
+
e, pi
+ + + + + {% block content %} +
{% if validlink %} @@ -22,4 +38,8 @@ {% endif %} +
{% endblock %} + + + diff --git a/sass/_gradebook.scss b/sass/_gradebook.scss new file mode 100644 index 0000000000..3282d4141b --- /dev/null +++ b/sass/_gradebook.scss @@ -0,0 +1,11 @@ +div.gradebook-wrapper { + @extend .table-wrapper; + + section.gradebook-content { + @extend .content; + + h1 { + @extend .top-header; + } + } +} diff --git a/sass/_info.scss b/sass/_info.scss index 418cc1a00a..910036b093 100644 --- a/sass/_info.scss +++ b/sass/_info.scss @@ -12,15 +12,22 @@ div.info-wrapper { margin-bottom: lh(); } - ol { + > ol { list-style: none; - li { + > li { padding-bottom: lh(.5); margin-bottom: lh(.5); @extend .clearfix; border-bottom: 1px solid #e3e3e3; + &:first-child { + padding: lh(.5); + margin-left: (-(lh(.5))); + background: $cream; + border-bottom: 1px solid darken($cream, 10%); + } + h2 { float: left; width: flex-grid(2, 9); diff --git a/sass/application.scss b/sass/application.scss index d4b2d01a84..b949b2fac7 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -11,6 +11,7 @@ @import "textbook"; @import "info"; @import "profile"; +@import "gradebook"; @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "help"; diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index d55fe62f96..5aa3aa1816 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -166,8 +166,8 @@ h1.top-header { .topbar { @extend .clearfix; - background: #F6EFD4; - border-bottom: 1px solid darken(#F6EFD4, 10%); + background: $cream; + border-bottom: 1px solid darken($cream, 10%); @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; @@ -180,17 +180,17 @@ h1.top-header { } a { - color: darken(#F6EFD4, 80%); + color: darken($cream, 80%); &:hover { - color: darken(#F6EFD4, 60%); + color: darken($cream, 60%); text-decoration: none; } &.block-link { - background: darken(#F6EFD4, 5%); - border-left: 1px solid darken(#f6efd4, 20%); - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); + background: darken($cream, 5%); + border-left: 1px solid darken($cream, 20%); + @include box-shadow(inset 1px 0 0 lighten($cream, 5%)); display: block; text-transform: uppercase; diff --git a/sass/base/_variables.scss b/sass/base/_variables.scss index 249f92dc96..60dd764872 100644 --- a/sass/base/_variables.scss +++ b/sass/base/_variables.scss @@ -26,6 +26,7 @@ $fg-min-width: 810px; $light-gray: #ddd; $dark-gray: #333; $mit-red: #993333; +$cream: #F6EFD4; $text-color: $dark-gray; $border-color: $light-gray; diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 155c3962b0..a1c086bc55 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -19,7 +19,7 @@ nav.sequence-nav { background-repeat: no-repeat; &:hover { - background-color: lighten(#F6EFD4, 3%); + background-color: lighten($cream, 3%); } } @@ -29,13 +29,12 @@ nav.sequence-nav { @include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); &:hover { - background-color: #F6EFD4; + background-color: $cream; background-position: center center; } } .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); background-color: #fff; background-repeat: no-repeat; @@ -50,7 +49,7 @@ nav.sequence-nav { @include box-shadow(1px 0 0 #fff); background-position: center center; border: none; - border-right: 1px solid darken(#F6EFD4, 10%); + border-right: 1px solid darken($cream, 10%); cursor: pointer; padding: 15px 4px 14px; width: 28px; @@ -166,11 +165,8 @@ nav.sequence-nav { &.prev, &.next { a { - // color: darken(#F6EFD4, 80%); - // letter-spacing: 1px; - // text-transform: uppercase; @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-repeat: no-repeat; border-left: 1px solid darken(#f6efd4, 20%); @@ -182,7 +178,7 @@ nav.sequence-nav { &:hover { text-decoration: none; - color: darken(#F6EFD4, 60%); + color: darken($cream, 60%); text-decoration: none; background-color: none; } @@ -230,7 +226,7 @@ section.course-content { margin: lh() auto 0; overflow: hidden; width: 106px; - background-color: darken(#F6EFD4, 5%); + background-color: darken($cream, 5%); @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); li { @@ -249,15 +245,15 @@ section.course-content { &:hover { text-decoration: none; - color: darken(#F6EFD4, 60%); + color: darken($cream, 60%); text-decoration: none; opacity: .5; - background-color: darken(#F6EFD4, 10%); + background-color: darken($cream, 10%); } &.disabled { opacity: .4; - background-color: lighten(#F6EFD4, 10%); + background-color: lighten($cream, 10%); } } } diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index e677f90b3e..e311c17406 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -153,12 +153,6 @@ div.answer-actions { &.question-delete { // color: $mit-red; } - - &.question-edit, &.permant-link { - // color: darken(#F6EFD4, 45%);; - } - } - } diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index 8f642706e0..ab14bc1137 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -128,9 +128,8 @@ form.question-form { input[type="checkbox"] { margin-top: 10px; } -} -div#question-list { + div#question-list { background-color: rgba(255,255,255,0.95); @include box-sizing(border-box); margin-top: -15px; @@ -157,3 +156,6 @@ div#question-list { } } } +} + + diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index dcf765aaf0..4654addb7a 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -70,7 +70,7 @@ body.user-profile-page { margin-bottom: 30px; li { - background-color: lighten(#F6EFD4, 3%); + background-color: lighten($cream, 3%); background-position: 10px center; background-repeat: no-repeat; @include border-radius(4px); diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index c644132d92..fb1d2d618f 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -19,8 +19,8 @@ div.question-header { &.post-vote { @include border-radius(4px); - background-color: lighten(#F6EFD4, 5%); - border: 1px solid darken( #F6EFD4,10% ); + background-color: lighten($cream, 5%); + border: 1px solid darken( $cream, 10% ); @include box-shadow(inset 0 1px 0px #fff); } @@ -79,7 +79,6 @@ div.question-header { width: flex-grid(4,8); a { - // color: darken(#F6EFD4, 50%); &.question-delete { color: $mit-red; @@ -134,7 +133,7 @@ div.question-header { &.revision { text-align: center; - background:lighten(#F6EFD4, 7%); + background:lighten($cream, 7%); a { color: black; diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index 74efa3598f..a2e7a355c2 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -29,5 +29,15 @@ html { margin-top: lh(.5); } } + + section.outside-app { + @extend .main-content; + max-width: 600px; + padding: lh(); + + #{$all-text-inputs} { + display: block; + } + } } } diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 9a8788bdd4..043d9c84b5 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -25,7 +25,7 @@ div.wiki-wrapper { p { float: left; margin-bottom: 0; - color: darken(#F6EFD4, 55%); + color: darken($cream, 55%); line-height: 46px; padding-left: lh(); } @@ -39,14 +39,14 @@ div.wiki-wrapper { input[type="button"] { @extend .block-link; - background-color: darken(#F6EFD4, 5%); + background-color: darken($cream, 5%); background-position: 12px center; background-repeat: no-repeat; border: 0; border-left: 1px solid darken(#f6efd4, 20%); @include border-radius(0); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - color: darken(#F6EFD4, 80%); + color: darken($cream, 80%); display: block; font-weight: normal; font-size: 12px; diff --git a/server-down.html b/server-down.html index 40786ed3ba..0faed814db 100644 --- a/server-down.html +++ b/server-down.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

Currently the MITx servers are down

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.

diff --git a/server-error.html b/server-error.html index c88afb95dd..d41fdde47b 100644 --- a/server-error.html +++ b/server-error.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

There has been an error on the MITx servers

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.

diff --git a/server-overloaded.html b/server-overloaded.html index 5f770c1abf..f5859d0e70 100644 --- a/server-overloaded.html +++ b/server-overloaded.html @@ -1,6 +1,6 @@ <%inherit file="main.html" /> -
+

Currently the MITx servers are overloaded

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@mitx.mit.edu to report any problems or downtime.