Log in to MITx
-MITx
-An MIT Education Anywhere. For free.
+MITx
+MIT’s new online learning initiative
MITx is MIT’s online learning initiative.
This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community of learners around the world.
-The first course offered by MITx in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.
+MITx will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.
+The first MITx course, 6.002x (Circuits and Electronics), will be launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.
+
Watch intro video
+ It will offer a portfolio of MIT courses for free on an online learning platform that:
+MITx courses will be offered on an online learning platform that:
-
-
- organizes and presents course material to enable students to learn at their own pace -
- features interactivity, online laboratories and student-to-student communication -
- allows for the individual assessment of any student’s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by MITx -
- operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions. +
- organizes and presents course material to enable students to learn worldwide +
- features interactive instruction, online laboratories and student-to-student and student-to-professor communication +
- allows for the individual assessment of any student’s work and allows students who demonstrate their mastery of subjects to earn certificates awarded by MITx +
- operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions, such as universities and K-12 school systems.
Press & links: Boston Globe, New York Times, MIT Press Release, MITx FAQ
Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from MITx.
+Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT’s first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from MITx.
Course Progress
+ + + + +-
+ % for hw in homeworks:
+
-
+
${ hw['chapter'] }
+ +++${ hw['section'] }
+ +-
+ % for score in hw['scores']:
+
- ${ score[0] }/${ score[1] } + % endfor +
+ % endfor
+
${name}
-
-
- Forum name: ${username} -
- E-mail: ${email} +
- Forum name: ${username} +
- E-mail: ${email}
-
Location: ${location}Change
@@ -96,37 +125,16 @@
Password reset
-We'll e-mail you a password reset link at ${email}. Follow the link in the email to reset your password.
+Password change
+We'll e-mail you a password reset link at ${email}. Follow + the link in the confirmation email to change your + password.
Course Progress
- - - - - - --
- % for hw in homeworks:
-
-
-
${ hw['chapter'] }
-${hw['format']} - ${ hw['section'] } ${"({0}/{1})".format( hw['section_total'][0], hw['section_total'][1] )}
- --
- % for score in hw['scores']:
-
- ${ score[0] }/${ score[1] } - % endfor -
- % endfor
-
Password reset successful
We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.
- -{% endblock %} diff --git a/registration/password_reset_email.html b/registration/password_reset_email.html old mode 100755 new mode 100644 diff --git a/registration/password_reset_form.html b/registration/password_reset_form.html deleted file mode 100755 index 4d73ff8c3a..0000000000 --- a/registration/password_reset_form.html +++ /dev/null @@ -1,8 +0,0 @@ -Password reset
- -Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.
- - diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index 6fb2f026d6..02d50862b3 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -972,30 +972,30 @@ ul { .main-page h1 { margin-right: 5px; } -.delete-icon { - margin-top: -1px; - float: left; - height: 21px; - width: 18px; - display: block; - line-height: 20px; - text-align: center; - background: #bbcdcd; - cursor: default; - color: #fff; - border-top: #cfdbdb 1px solid; - font-family: Arial; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - text-shadow: 0px 1px 0px #7ea0a0; - -moz-text-shadow: 0px 1px 0px #7ea0a0; - -webkit-text-shadow: 0px 1px 0px #7ea0a0; - &:hover { - background: #b32f2f; } } +// .delete-icon { +// margin-top: -1px; +// float: left; +// height: 21px; +// width: 18px; +// display: block; +// line-height: 20px; +// text-align: center; +// background: #bbcdcd; +// cursor: default; +// color: #fff; +// border-top: #cfdbdb 1px solid; +// font-family: Arial; +// border-top-right-radius: 4px; +// border-bottom-right-radius: 4px; +// -moz-border-radius-topright: 4px; +// -moz-border-radius-bottomright: 4px; +// -webkit-border-bottom-right-radius: 4px; +// -webkit-border-top-right-radius: 4px; +// text-shadow: 0px 1px 0px #7ea0a0; +// -moz-text-shadow: 0px 1px 0px #7ea0a0; +// -webkit-text-shadow: 0px 1px 0px #7ea0a0; +// &:hover { +// background: #b32f2f; } } .tag-number { font-weight: normal; @@ -1205,448 +1205,451 @@ ul { .edit-question-page .title-desc, #fmedit .title-desc, .wmd-preview .title-desc { margin-bottom: 10px; } -.question-page { - h1 { - padding-top: 0px; - font-family: 'Yanone Kaffeesatz',sans-serif; - a { - color: #464646; - font-size: 30px; - font-weight: normal; - line-height: 1; } } - p.rss { - float: none; - clear: both; - padding: 3px 0 0 23px; - font-size: 15px; - width: 110px; - background-position: center left; - margin-left: 0px !important; - a { - font-family: 'Yanone Kaffeesatz',sans-serif; - vertical-align: top; } } - .question-content { - float: right; - width: 682px; - margin-bottom: 10px; } - #question-table { - float: left; - border-top: #f0f0f0 1px solid; - margin: 6px 0 6px 0; - border-spacing: 0px; - width: 670px; - padding-right: 10px; } - .answer-table { - margin: 6px 0 6px 0; - border-spacing: 0px; - width: 670px; - padding-right: 10px; - margin-top: 0px; - border-bottom: 1px solid #D4D4D4; - float: right; - td { - width: 20px; - vertical-align: top; } } - #question-table td { - width: 20px; - vertical-align: top; } - .question-body, .answer-body { - overflow: auto; - margin-top: 10px; - font-family: Arial; - color: #4b4b4b; } - .question-body p, .answer-body p { - margin-bottom: 14px; - line-height: 1.4; - font-size: 14px; - padding: 0px 5px 5px 0px; } - .question-body a, .answer-body a { - color: #1b79bd; } - .question-body li, .answer-body li { - margin-bottom: 7px; } - .question-body IMG, .answer-body IMG { - max-width: 600px; } - .post-update-info-container { - float: right; - width: 175px; } - .post-update-info { - background: white url(../images/background-user-info.png) repeat-x bottom; - float: right; - font-size: 9px; - font-family: Arial; - width: 158px; - padding: 4px; - margin: 0px 0px 5px 5px; - line-height: 14px; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; - -webkit-box-shadow: 0px 2px 1px #bfbfbf; - -moz-box-shadow: 0px 2px 1px #bfbfbf; - box-shadow: 0px 2px 1px #bfbfbf; - p { - line-height: 13px; - font-size: 11px; - margin: 0 0 2px 1px; - padding: 0; } - a { - color: #444; } - .gravatar { - float: left; - margin-right: 4px; } - p.tip { - color: #444; - line-height: 13px; - font-size: 10px; } } - .post-controls { - font-size: 11px; - line-height: 12px; - min-width: 200px; - padding-left: 5px; - text-align: right; - clear: left; - float: right; - margin-top: 10px; - margin-bottom: 8px; - a { - color: #777; - padding: 0px 3px 3px 22px; - cursor: pointer; - border: none; - font-size: 12px; - font-family: Arial; - text-decoration: none; - height: 18px; - display: block; - float: right; - line-height: 18px; - margin-top: -2px; - margin-left: 4px; - &:hover { - background-color: #f5f0c9; - border-radius: 3px; - -ms-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; } } - .sep { - color: #ccc; - float: right; - height: 18px; - font-size: 18px; } - .question-delete { - background: url(../images/delete.png) no-repeat center left; - padding-left: 16px; } } - .answer-controls .question-delete { - background: url(../images/delete.png) no-repeat center left; - padding-left: 16px; } - .post-controls .question-flag, .answer-controls .question-flag { - background: url(../images/flag.png) no-repeat center left; } - .post-controls .question-edit, .answer-controls .question-edit { - background: url(../images/edit2.png) no-repeat center left; } - .post-controls .question-retag, .answer-controls .question-retag { - background: url(../images/retag.png) no-repeat center left; } - .post-controls .question-close, .answer-controls .question-close { - background: url(../images/close.png) no-repeat center left; } - .post-controls .permant-link, .answer-controls .permant-link { - background: url(../images/link.png) no-repeat center left; } - .tabBar { - width: 100%; } - #questionCount { - float: left; - font-family: 'Yanone Kaffeesatz',sans-serif; - line-height: 15px; } - .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote { - width: 25px; - height: 20px; - cursor: pointer; } - .question-img-upvote, .answer-img-upvote { - background: url(../images/vote-arrow-up-new.png) no-repeat; } - .question-img-downvote, .answer-img-downvote { - background: url(../images/vote-arrow-down-new.png) no-repeat; } - .question-img-upvote { - &:hover, &.on { - background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } - .answer-img-upvote { - &:hover, &.on { - background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } - .question-img-downvote { - &:hover, &.on { - background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } - .answer-img-downvote { - &:hover, &.on { - background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } - #fmanswer_button { - margin: 8px 0px; } - .question-img-favorite:hover { - background: url(../images/vote-favorite-on.png); } - div.comments { - padding: 0; } - #comment-title { - font-weight: bold; - font-size: 23px; - color: #7ea9b3; - width: 200px; - float: left; - font-family: 'Yanone Kaffeesatz',sans-serif; } - .comments { - font-size: 12px; - clear: both; - div.controls { - clear: both; - float: left; - width: 100%; - margin: 3px 0 20px 5px; } - .controls a { - color: #988e4c; - padding: 0 3px 2px 22px; - font-family: Arial; - font-size: 13px; - background: url(../images/comment.png) no-repeat center left; - &:hover { - background-color: #f5f0c9; - text-decoration: none; } } - .button { - color: #988e4c; - font-size: 11px; - padding: 3px; - cursor: pointer; } - a { - background-color: inherit; - color: #1b79bd; - padding: 0; } - form.post-comments { - margin: 3px 26px 0 42px; - textarea { - font-size: 13px; - line-height: 1.3; } } - textarea { - height: 42px; - width: 100%; - margin: 7px 0 5px 1px; - font-family: Arial; - outline: none; - overflow: auto; - font-size: 12px; - line-height: 140%; - padding-left: 2px; - padding-top: 3px; - border: #cce6ec 3px solid; } - input { - margin-left: 10px; - margin-top: 1px; - vertical-align: top; - width: 100px; } - button { - background: url(../images/small-button-blue.png) repeat-x top; - border: 0; - color: #4a757f; - font-family: Arial; - font-size: 13px; - width: 100px; - font-weight: bold; - height: 27px; - line-height: 25px; - margin-bottom: 5px; - cursor: pointer; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; - text-shadow: 0px 1px 0px #e6f6fa; - -moz-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-text-shadow: 0px 1px 0px #e6f6fa; - -webkit-box-shadow: 1px 1px 2px #808080; - -moz-box-shadow: 1px 1px 2px #808080; - box-shadow: 1px 1px 2px #808080; - &:hover { - background: url(../images/small-button-blue.png) bottom repeat-x; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; } } - .counter { - display: inline-block; - width: 245px; - float: right; - color: #b6a475 !important; - vertical-align: top; - font-family: Arial; - float: right; - text-align: right; } - .comment { - border-bottom: 1px solid #edeeeb; - clear: both; - margin: 0; - margin-top: 8px; - padding-bottom: 4px; - overflow: auto; - font-family: Arial; - font-size: 11px; - min-height: 25px; - background: white url(../images/comment-background.png) bottom repeat-x; - border-radius: 5px; - -ms-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; } - div.comment:hover { - background-color: #efefef; } - a.author { - background-color: inherit; - color: #1b79bd; - padding: 0; - &:hover { - text-decoration: underline; } } - span.delete-icon { - background: url(../images/close-small.png) no-repeat; - border: 0; - width: 14px; - height: 14px; - &:hover { - border: #BC564B 2px solid; - border-radius: 10px; - -ms-border-radius: 10px; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - -khtml-border-radius: 10px; - margin: -3px 0px 0px -2px; } } - .content { - margin-bottom: 7px; } - .comment-votes { - float: left; - width: 37px; - line-height: 130%; - padding: 6px 5px 6px 3px; } - .comment-body { - line-height: 1.3; - margin: 3px 26px 0 46px; - padding: 5px 3px; - color: #666; - font-size: 13px; - .edit { - padding-left: 6px; } - p { - font-size: 13px; - line-height: 1.3; - margin-bottom: 3px; - padding: 0; } } - .comment-delete { - float: right; - width: 14px; - line-height: 130%; - padding: 8px 6px; } - .upvote { - margin: 0px; - padding-right: 17px; - padding-top: 2px; - text-align: right; - height: 20px; - font-size: 13px; - font-weight: bold; - color: #777; - &.upvoted { - color: #d64000; } - &.hover { - background: url(../images/go-up-grey.png) no-repeat; - background-position: right 1px; } - &:hover { - background: url(../images/go-up-orange.png) no-repeat; - background-position: right 1px; } } - .help-text { - float: right; - text-align: right; - color: gray; - margin-bottom: 0px; - margin-top: 0px; - line-height: 50%; } } - #questionTools { - font-size: 22px; - margin-top: 11px; - text-align: left; } - .question-status { - margin-top: 10px; - margin-bottom: 15px; - padding: 20px; - background-color: #fef7cc; - text-align: center; - border: #e1c04a 1px solid; - h3 { - font-size: 20px; - color: #707070; - font-weight: normal; } } - .vote-buttons { - float: left; - text-align: center; - padding-top: 2px; - margin: 10px 10px 0px 3px; - IMG { - cursor: pointer; } } - .vote-number { - font-family: 'Yanone Kaffeesatz',sans-serif; - padding: 0px 0 5px 0; - font-size: 25px; - font-weight: bold; - color: #777; } - .vote-buttons .notify-sidebar { - text-align: left; - width: 120px; - label { - vertical-align: top; } } - .tabBar-answer { - margin-bottom: 15px; - padding-left: 7px; - width: 723px; - margin-top: 10px; } - .answer .vote-buttons { - float: left; } - .accepted-answer { - background-color: #f7fecc; - border-bottom-color: #9BD59B; - .vote-buttons { - width: 27px; - margin-right: 10px; - margin-top: 10px; } } - .answer .post-update-info a { - color: #444444; } - .answered { - background: #CCC; - color: #999; } - .answered-accepted { - background: #DCDCDC; - color: #763333; - strong { - color: #E1E818; } } - .answered-by-owner { - background: #F1F1FF; - .comments { - .button { - background-color: #E6ECFF; } - background-color: #E6ECFF; } - .vote-buttons { - margin-right: 10px; } } - .answer-img-accept:hover { - background: url(../images/vote-accepted-on.png); } - .answer-body { - a { - color: #1b79bd; } - li { - margin-bottom: 0.7em; } } - #fmanswer { - color: #707070; - line-height: 1.2; - margin-top: 10px; - h2 { - font-family: 'Yanone Kaffeesatz',sans-serif; - color: #7ea9b3; - font-size: 24px; } - label { - font-size: 13px; } } - .message { - padding: 5px; - margin: 0px 0 10px 0; } } +// .question-page { +// h1 { +// padding-top: 0px; +// font-family: 'Yanone Kaffeesatz',sans-serif; +// a { +// color: #464646; +// font-size: 30px; +// font-weight: normal; +// line-height: 1; } } +// p.rss { +// float: none; +// clear: both; +// padding: 3px 0 0 23px; +// font-size: 15px; +// width: 110px; +// background-position: center left; +// margin-left: 0px !important; +// a { +// font-family: 'Yanone Kaffeesatz',sans-serif; +// vertical-align: top; } } +// .question-content { +// float: right; +// width: 682px; +// margin-bottom: 10px; } +// #question-table { +// float: left; +// border-top: #f0f0f0 1px solid; +// margin: 6px 0 6px 0; +// border-spacing: 0px; +// width: 670px; +// padding-right: 10px; } +// .answer-table { +// margin: 6px 0 6px 0; +// border-spacing: 0px; +// width: 670px; +// padding-right: 10px; +// margin-top: 0px; +// border-bottom: 1px solid #D4D4D4; +// float: right; +// td { +// width: 20px; +// vertical-align: top; } } +// #question-table td { +// width: 20px; +// vertical-align: top; } +// .question-body, .answer-body { +// overflow: auto; +// margin-top: 10px; +// font-family: Arial; +// color: #4b4b4b; } +// .question-body p, .answer-body p { +// margin-bottom: 14px; +// line-height: 1.4; +// font-size: 14px; +// padding: 0px 5px 5px 0px; } +// .question-body a, .answer-body a { +// color: #1b79bd; } +// .question-body li, .answer-body li { +// margin-bottom: 7px; } +// .question-body IMG, .answer-body IMG { +// max-width: 600px; } +// .post-update-info-container { +// float: right; +// width: 175px; } +// .post-update-info { +// background: white url(../images/background-user-info.png) repeat-x bottom; +// float: right; +// font-size: 9px; +// font-family: Arial; +// width: 158px; +// padding: 4px; +// margin: 0px 0px 5px 5px; +// line-height: 14px; +// border-radius: 4px; +// -ms-border-radius: 4px; +// -moz-border-radius: 4px; +// -webkit-border-radius: 4px; +// -khtml-border-radius: 4px; +// -webkit-box-shadow: 0px 2px 1px #bfbfbf; +// -moz-box-shadow: 0px 2px 1px #bfbfbf; +// box-shadow: 0px 2px 1px #bfbfbf; +// p { +// line-height: 13px; +// font-size: 11px; +// margin: 0 0 2px 1px; +// padding: 0; } +// a { +// color: #444; } +// .gravatar { +// float: left; +// margin-right: 4px; } +// p.tip { +// color: #444; +// line-height: 13px; +// font-size: 10px; } } +// .post-controls { +// font-size: 11px; +// line-height: 12px; +// min-width: 200px; +// padding-left: 5px; +// text-align: right; +// clear: left; +// float: right; +// margin-top: 10px; +// margin-bottom: 8px; +// a { +// color: #777; +// padding: 0px 3px 3px 22px; +// cursor: pointer; +// border: none; +// font-size: 12px; +// font-family: Arial; +// text-decoration: none; +// height: 18px; +// display: block; +// float: right; +// line-height: 18px; +// margin-top: -2px; +// margin-left: 4px; +// &:hover { +// background-color: #f5f0c9; +// border-radius: 3px; +// -ms-border-radius: 3px; +// -moz-border-radius: 3px; +// -webkit-border-radius: 3px; +// -khtml-border-radius: 3px; } } +// .sep { +// color: #ccc; +// float: right; +// height: 18px; +// font-size: 18px; } +// .question-delete { +// background: url(../images/delete.png) no-repeat center left; +// padding-left: 16px; } } +// .answer-controls .question-delete { +// background: url(../images/delete.png) no-repeat center left; +// padding-left: 16px; } +// .post-controls .question-flag, .answer-controls .question-flag { +// background: url(../images/flag.png) no-repeat center left; } +// .post-controls .question-edit, .answer-controls .question-edit { +// background: url(../images/edit2.png) no-repeat center left; } +// .post-controls .question-retag, .answer-controls .question-retag { +// background: url(../images/retag.png) no-repeat center left; } +// .post-controls .question-close, .answer-controls .question-close { +// background: url(../images/close.png) no-repeat center left; } +// .post-controls .permant-link, .answer-controls .permant-link { +// background: url(../images/link.png) no-repeat center left; } +// .tabBar { +// width: 100%; } +// #questionCount { +// float: left; +// font-family: 'Yanone Kaffeesatz',sans-serif; +// line-height: 15px; } +// .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote { +// width: 25px; +// height: 20px; +// cursor: pointer; } +// .question-img-upvote, .answer-img-upvote { +// background: url(../images/vote-arrow-up-new.png) no-repeat; } +// .question-img-downvote, .answer-img-downvote { +// background: url(../images/vote-arrow-down-new.png) no-repeat; } +// .question-img-upvote { +// &:hover, &.on { +// background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } +// .answer-img-upvote { +// &:hover, &.on { +// background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } +// .question-img-downvote { +// &:hover, &.on { +// background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } +// .answer-img-downvote { +// &:hover, &.on { +// background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } +// #fmanswer_button { +// margin: 8px 0px; } +// .question-img-favorite:hover { +// background: url(../images/vote-favorite-on.png); } +// div.comments { +// padding: 0; } +// #comment-title { +// font-weight: bold; +// font-size: 23px; +// color: #7ea9b3; +// width: 200px; +// float: left; +// font-family: 'Yanone Kaffeesatz',sans-serif; } +// .comments { +// font-size: 12px; +// clear: both; +// div.controls { +// clear: both; +// float: left; +// width: 100%; +// margin: 3px 0 20px 5px; } +// .controls a { +// color: #988e4c; +// padding: 0 3px 2px 22px; +// font-family: Arial; +// font-size: 13px; +// background: url(../images/comment.png) no-repeat center left; +// &:hover { +// background-color: #f5f0c9; +// text-decoration: none; } } +// .button { +// color: #988e4c; +// font-size: 11px; +// padding: 3px; +// cursor: pointer; } +// a { +// background-color: inherit; +// color: #1b79bd; +// padding: 0; } +// form.post-comments { +// margin: 3px 26px 0 42px; +// textarea { +// font-size: 13px; +// line-height: 1.3; } } +// textarea { +// height: 42px; +// width: 100%; +// margin: 7px 0 5px 1px; +// font-family: Arial; +// outline: none; +// overflow: auto; +// font-size: 12px; +// line-height: 140%; +// padding-left: 2px; +// padding-top: 3px; +// border: #cce6ec 3px solid; } +// input { +// margin-left: 10px; +// margin-top: 1px; +// vertical-align: top; +// width: 100px; } +// button { +// background: url(../images/small-button-blue.png) repeat-x top; +// border: 0; +// color: #4a757f; +// font-family: Arial; +// font-size: 13px; +// width: 100px; +// font-weight: bold; +// height: 27px; +// line-height: 25px; +// margin-bottom: 5px; +// cursor: pointer; +// border-radius: 4px; +// -ms-border-radius: 4px; +// -moz-border-radius: 4px; +// -webkit-border-radius: 4px; +// -khtml-border-radius: 4px; +// text-shadow: 0px 1px 0px #e6f6fa; +// -moz-text-shadow: 0px 1px 0px #e6f6fa; +// -webkit-text-shadow: 0px 1px 0px #e6f6fa; +// -webkit-box-shadow: 1px 1px 2px #808080; +// -moz-box-shadow: 1px 1px 2px #808080; +// box-shadow: 1px 1px 2px #808080; +// &:hover { +// background: url(../images/small-button-blue.png) bottom repeat-x; +// text-shadow: 0px 1px 0px #c6d9dd; +// -moz-text-shadow: 0px 1px 0px #c6d9dd; +// -webkit-text-shadow: 0px 1px 0px #c6d9dd; } } +// .counter { +// display: inline-block; +// width: 245px; +// float: right; +// color: #b6a475 !important; +// vertical-align: top; +// font-family: Arial; +// float: right; +// text-align: right; } +// .comment { +// border-bottom: 1px solid #edeeeb; +// clear: both; +// margin: 0; +// margin-top: 8px; +// padding-bottom: 4px; +// overflow: auto; +// font-family: Arial; +// font-size: 11px; +// min-height: 25px; +// background: white url(../images/comment-background.png) bottom repeat-x; +// border-radius: 5px; +// -ms-border-radius: 5px; +// -moz-border-radius: 5px; +// -webkit-border-radius: 5px; +// -khtml-border-radius: 5px; } +// div.comment:hover { +// background-color: #efefef; } +// a.author { +// background-color: inherit; +// color: #1b79bd; +// padding: 0; +// &:hover { +// text-decoration: underline; } } +// span.delete-icon { +// background: url(../images/close-small.png) no-repeat; +// border: 0; +// width: 14px; +// height: 14px; +// &:hover { +// border: #BC564B 2px solid; +// border-radius: 10px; +// -ms-border-radius: 10px; +// -moz-border-radius: 10px; +// -webkit-border-radius: 10px; +// -khtml-border-radius: 10px; +// margin: -3px 0px 0px -2px; } } +// .content { +// margin-bottom: 7px; } +// .comment-votes { +// float: left; +// width: 37px; +// line-height: 130%; +// padding: 6px 5px 6px 3px; } +// .comment-body { +// line-height: 1.3; +// margin: 3px 26px 0 46px; +// padding: 5px 3px; +// color: #666; +// font-size: 13px; +// .edit { +// padding-left: 6px; } +// p { +// font-size: 13px; +// line-height: 1.3; +// margin-bottom: 3px; +// padding: 0; } } +// .comment-delete { +// float: right; +// width: 14px; +// line-height: 130%; +// padding: 8px 6px; } +// .upvote { +// margin: 0px; +// padding-right: 17px; +// padding-top: 2px; +// text-align: right; +// height: 20px; +// font-size: 13px; +// font-weight: bold; +// color: #777; +// &.upvoted { +// color: #d64000; } +// &.hover { +// background: url(../images/go-up-grey.png) no-repeat; +// background-position: right 1px; } +// &:hover { +// background: url(../images/go-up-orange.png) no-repeat; +// background-position: right 1px; } } +// .help-text { +// float: right; +// text-align: right; +// color: gray; +// margin-bottom: 0px; +// margin-top: 0px; +// line-height: 50%; } } +// #questionTools { +// font-size: 22px; +// margin-top: 11px; +// text-align: left; } +// .question-status { +// margin-top: 10px; +// margin-bottom: 15px; +// padding: 20px; +// background-color: #fef7cc; +// text-align: center; +// border: #e1c04a 1px solid; +// h3 { +// font-size: 20px; +// color: #707070; +// font-weight: normal; } } +// .vote-buttons { +// // float: left; +// // text-align: center; +// // padding-top: 2px; +// // margin: 10px 10px 0px 3px; +// IMG { +// cursor: pointer; } } +// .vote-number { +// font-family: 'Yanone Kaffeesatz',sans-serif; +// padding: 0px 0 5px 0; +// font-size: 25px; +// font-weight: bold; +// color: #777; } +// .vote-buttons .notify-sidebar { +// // text-align: left; +// // width: 120px; +// label { +// vertical-align: top; } } +// .tabBar-answer { +// margin-bottom: 15px; +// padding-left: 7px; +// width: 723px; +// margin-top: 10px; } +// .answer .vote-buttons { +// // float: left; +// } +// .accepted-answer { +// background-color: #f7fecc; +// border-bottom-color: #9BD59B; +// // .vote-buttons { +// // width: 27px; +// // margin-right: 10px; +// // margin-top: 10px; } +// } +// .answer .post-update-info a { +// color: #444444; } +// .answered { +// background: #CCC; +// color: #999; } +// .answered-accepted { +// background: #DCDCDC; +// color: #763333; +// strong { +// color: #E1E818; } } +// .answered-by-owner { +// background: #F1F1FF; +// .comments { +// .button { +// background-color: #E6ECFF; } +// background-color: #E6ECFF; } +// // .vote-buttons { +// // margin-right: 10px; } +// } +// .answer-img-accept:hover { +// background: url(../images/vote-accepted-on.png); } +// .answer-body { +// a { +// color: #1b79bd; } +// li { +// margin-bottom: 0.7em; } } +// #fmanswer { +// color: #707070; +// line-height: 1.2; +// margin-top: 10px; +// h2 { +// font-family: 'Yanone Kaffeesatz',sans-serif; +// color: #7ea9b3; +// font-size: 24px; } +// label { +// font-size: 13px; } } +// .message { +// padding: 5px; +// margin: 0px 0 10px 0; } } @media screen and (-webkit-min-device-pixel-ratio:0) { textarea { @@ -2704,4 +2707,3 @@ pre.prettyprint { // color: #404; } // .atv { // color: #060; } } - diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss index de1f917fca..c8c5e4b687 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -39,6 +39,7 @@ .content { @include box-sizing(border-box); + @include box-shadow(inset 0 0 2px 3px #f3f3f3); display: table-cell; padding: lh(); vertical-align: top; @@ -46,8 +47,9 @@ } .sidebar { - @include box-shadow( inset -1px 0 0 #f6f6f6); + @include box-shadow( inset 0 0 0 1px #f6f6f6); @include box-sizing(border-box); + @include border-radius(4px 0 0 4px); background: #e3e3e3; border-right: 1px solid #d3d3d3; display: table-cell; @@ -106,6 +108,7 @@ margin: (-$body-line-height) (-$body-line-height) $body-line-height; font-size: 12px; text-shadow: 0 1px 0 #fff; + @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @extend .clearfix; a { diff --git a/sass/_base.scss b/sass/_base.scss index 4df1d6de88..8ea0957ac3 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -2,6 +2,12 @@ outline-color: #ccc; } +h1, h2, h3, h4, h5, h6 { + a { + color: #000; + } +} + h1 { font-size:1.6em; margin:20px 0 10px 0; @@ -35,6 +41,26 @@ em { } } +a { + color: $mit-red; + + &:link { + color: $mit-red; + } + + &:visited { + color: darken($mit-red, 10%); + } + + &:link, &:visited { + text-decoration:none; + } + + &:hover, &:focus { + text-decoration:underline; + } +} + input[type="submit"], input[type="button"], button { @extend .button; } diff --git a/sass/_courseware-sequence-nav.scss b/sass/_courseware-sequence-nav.scss new file mode 100644 index 0000000000..5a7b971fe2 --- /dev/null +++ b/sass/_courseware-sequence-nav.scss @@ -0,0 +1,142 @@ +nav.sequence-nav { + @extend .topbar; + margin-bottom: $body-line-height; + + ol { + a { + @extend .block-link; + } + + .inactive { + background-repeat: no-repeat; + + &:hover { + background-color: lighten(#F6EFD4, 3%); + } + } + + .visited { + background-color: shade(#F6EFD4, 10%); + background-repeat: no-repeat; + border-color: shade(#F6EFD4, 10%); + + &:hover { + background-color: #F6EFD4; + } + } + + .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; + + &:hover { + background-color: #fff; + } + } + + li { + border: none; + border-right: 1px solid darken(#F6EFD4, 10%); + @include box-shadow(1px 0 0 #fff); + cursor: pointer; + display: table-cell; + padding: lh(.75); + float: left; + width: 18px; + + //problem + // &.seq_problem_inactive { + // width: 14px; + // background: url('/static/images/problem-icon.png') 13px 13px no-repeat; + // @extend .inactive; + // } + + // &.seq_problem_visited { + // width: 14px; + // background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat; + // &:hover { + // background-color: #F6EFD4; + // } + // } + + // &.seq_problem_active { + // width: 14px; + // background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat; + // @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); + + // &:hover { + // background-color: #F6EFD4; + // } + // } + + //video + &.seq_video_inactive { + @extend .inactive; + background-image: url('/static/images/video-icon.png'); + background-position: 13px 15px; + } + + &.seq_video_visited { + @extend .visited; + background-image: url('/static/images/video-icon.png'); + background-position: -81px 15px; + } + + &.seq_video_active { + @extend .active; + background-image: url('/static/images/video-icon.png'); + background-position: -32px 15px; + } + + //vertical + &.seq_vertical_inactive, &.seq_problem_inactive { + background-image: url('/static/images/vertical-icon.png'); + background-position: -82px 15px; + @extend .inactive; + } + + &.seq_vertical_visited, &.seq_problem_visited { + background-image: url('/static/images/vertical-icon.png'); + background-position: 13px 15px; + @extend .visited; + } + + &.seq_vertical_active, &.seq_problem_active { + background-image: url('/static/images/vertical-icon.png'); + background-position: -35px 15px; + @extend .active; + } + + } + } + + ul { + float: right; + margin-right: 1px; + + li { + float: left; + + &.prev, &.next { + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); + background: darken(#F6EFD4, 5%); + border-left: 1px solid darken(#f6efd4, 20%); + color: darken(#F6EFD4, 80%); + float: right; + letter-spacing: 1px; + padding: lh(.75); + text-transform: uppercase; + cursor: pointer; + + &:hover { + text-decoration: none; + color: darken(#F6EFD4, 60%); + text-decoration: none; + background: none; + } + } + } + } +} diff --git a/sass/_courseware-video.scss b/sass/_courseware-video.scss index 10504ff39c..f8067e703c 100644 --- a/sass/_courseware-video.scss +++ b/sass/_courseware-video.scss @@ -3,7 +3,6 @@ section.course-content { div.video-wrapper { float: left; width: flex-grid(6, 9); - margin-right: flex-gutter(9); div.video-player { @@ -32,40 +31,114 @@ section.course-content { } } - section { - ul { - display: inline-block; + // ul { + // float: left; + + // li { + // margin-top: 5px; + // display: inline-block; + // cursor: pointer; + // border: 0; + // padding: 0; + + // div { + // &:empty { + // display: none; + // } + // } + // } + // } + + section.video-controls { + @extend .clearfix; + background: #333; + border: 1px solid #000; + color: #ccc; + + div#slider { + @extend .clearfix; + @include border-radius(0); + @include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555); + background: #c2c2c2; + border: none; + border-bottom: 1px solid #000; + height: 20px; + + a.ui-slider-handle { + @include border-radius(0); + background: $mit-red url(/static/images/slider-handle.png) center center no-repeat; + border: 0; + border-right: 1px solid darken($mit-red, 20%); + border-left: 1px solid darken($mit-red, 20%); + cursor: pointer; + height: 20px; + margin: 0; + top: 0; + width: 20px; + } + } + + ul.vcr { + float: left; + margin-right: lh(); li { - margin-top: 5px; - display: inline-block; - cursor: pointer; - border: 0; - padding: 0; + float: left; - div { - &:empty { - display: none; + a { + @include box-shadow(1px 0 0 #555); + border-right: 1px solid #000; + display: block; + cursor: pointer; + height: 14px; + padding: lh(.75) lh(); + text-indent: -9999px; + width: 14px; + + &.play { + background: url('/static/images/play-icon.png') center center no-repeat; + + &:hover { + background-color: #444; + } + } + + &.pause { + background: url('/static/images/pause-icon.png') center center no-repeat; + + &:hover { + background-color: #444; + } } } } } - div#slider { - margin: -14px 0 10px 60px; - } - div#vidtime { float: left; + font-weight: bold; + line-height: 46px; //height of play pause buttons + -webkit-font-smoothing: antialiased; } - div#video_speeds { + div.speeds { float: right; - cursor: pointer; + line-height: 46px; //height of play pause buttons + margin-right: lh(); + -webkit-font-smoothing: antialiased; - span { - &:hover { - color: $mit-red; + div#video_speeds { + @include inline-block(); + font-weight: bold; + + span { + @include inline-block(); + cursor: pointer; + margin-bottom: 0; + + &:hover { + color: $mit-red; + } } } } @@ -75,6 +148,8 @@ section.course-content { ol.subtitles { float: left; width: flex-grid(3, 9); + height: 530px; + overflow: hidden; li { margin-bottom: 0px; diff --git a/sass/_courseware.scss b/sass/_courseware.scss index 3c59e6e0c8..aae17b46fd 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -86,146 +86,115 @@ div.course-wrapper { section.course-content { @extend .content; - ol.vert-mod { - > li { - @extend .clearfix; - border-bottom: 1px solid #eee; - padding: 15px 0; + p { + margin-bottom: lh(); - &:last-child { - border-bottom: none; - } - - h2 { - margin-top: 0; - margin-bottom: 15px; - } - - input[type="text"] { - display: inline-block; - margin: 8px 4px 4px 10px; - } + &:empty { + display: none; + margin-bottom: 0; } } - ol.sequence-nav { - margin-bottom: $body-line-height; - @extend .topbar; + .problem-set { + position: relative; + @extend .clearfix; - a { - @extend .block-link; + h2 { + margin-top: 0; + margin-bottom: 15px; + width: flex-grid(2, 9); + padding-right: flex-gutter(9); + border-right: 1px dotted #ccc; + @include box-sizing(border-box); + display: table-cell; + vertical-align: top; + + @media screen and (max-width:910px) { + display: block; + width: auto; + } } - li { - border: none; - cursor: pointer; + section.problem { display: table-cell; - padding: lh(.75); - float: left; + width: flex-grid(7, 9); + padding-left: flex-gutter(9); - //problem - &.seq_problem_inactive { - width: 14px; - background: url('/static/images/problem-icon.png') 13px 13px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%)); - - &:hover { - background-color: lighten(#F6EFD4, 3%); - } + @media screen and (max-width:910px) { + display: block; + width: auto; } - &.seq_problem_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat; - &:hover { - background-color: #F6EFD4; + span { + &.unanswered { + @include inline-block(); + background: url('/static/images/unanswered-icon.png') center center no-repeat; + height: 14px; + position: relative; + top: 4px; + width: 14px; + } + + &.correct { + @include inline-block(); + background: url('/static/images/correct-icon.png') center center no-repeat; + height: 20px; + position: relative; + top: 6px; + width: 25px; + } + + &.incorrect { + @include inline-block(); + background: url('/static/images/incorrect-icon.png') center center no-repeat; + height: 20px; + width: 20px; + position: relative; + top: 6px; } } + } - &.seq_problem_active { - width: 14px; - background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); - - &:hover { - background-color: #F6EFD4; - } + div { + > span { + display: block; + margin-bottom: lh(.5); } + } - //video - &.seq_video_inactive { - width: 14px; - background: url('/static/images/video-icon.png') 13px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%)); + input[type="text"] { + display: inline-block; + } - &:hover { - background-color: lighten(#F6EFD4, 3%); - } - } + center { + display: block; + margin: lh() 0; + border: 1px solid #ccc; + padding: lh(); + } - &.seq_video_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -81px 15px no-repeat; - &:hover { - background-color: #F6EFD4; - } - } - - &.seq_video_active { - width: 14px; - background: #FFFBEB url('/static/images/video-icon.png') -32px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%),inset 1px 0 0 darken(#F6EFD4, 20%)); - &:hover { - background-color: #F6EFD4; - } - } + section.action { + margin-top: lh(); + } + } - //vertical - &.seq_vertical_inactive { - width: 14px; - background: url('/static/images/vertical-icon.png') -82px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%)); + section.problems-wrapper, div#seq_content { + @extend .problem-set; + } - &:hover { - background-color: lighten(#F6EFD4, 3%); - } - } + ol.vert-mod { + > li { + @extend .clearfix; + @extend .problem-set; + border-bottom: 1px solid #ddd; + margin-bottom: 15px; + padding: 0 0 15px; - &.seq_vertical_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') 13px 15px no-repeat; - &:hover { - background-color: #F6EFD4; - } - } - - &.seq_vertical_active { - width: 14px; - background: #FFFBEB url('/static/images/vertical-icon.png') -35px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); - - &:hover { - background-color: #F6EFD4; - } - } - - &.prev, &.next { - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - background: darken(#F6EFD4, 5%); - border-left: 1px solid darken(#f6efd4, 20%); - color: darken(#F6EFD4, 80%); - float: right; - letter-spacing: 1px; - padding: lh(.75); - text-transform: uppercase; - - &:hover { - text-decoration: none; - color: darken(#F6EFD4, 60%); - text-decoration: none; - background: none; - } + &:last-child { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } } } diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss new file mode 100644 index 0000000000..12d6500c48 --- /dev/null +++ b/sass/_discussion-answers.scss @@ -0,0 +1,45 @@ +div.answer-controls { + @extend div.question-controls; + display: inline-block; + margin-top: 20px; + margin-bottom: 0; + + div.answer-sort { + @extend div.question-sort; + } + + div.answer-count { + @extend div.question-count; + } +} + +div.answer-block { + @extend div.question-header; + border-top: #ddd 1px solid; + display: inline-block; + float: left; + margin: 20px 0; + padding-top: 20px; + width: 100%; + + img.answer-img-accept { + margin: 10px 0px 10px 16px; + } + div.answer-container { + @extend div.question-container; + + div.answer-content { + @extend div.question-content; + + div.answer-body { + @extend div.question-body; + } + } + } + + div.meta-bar { + div.answer-actions { + @extend div.question-actions; + } + } +} diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss index 73b39f738f..4a8704c477 100644 --- a/sass/_discussion-questions.scss +++ b/sass/_discussion-questions.scss @@ -10,7 +10,7 @@ div.question-controls { div.question-count { margin-right: flex-gutter(); - width: flex-grid(5.5,9); + width: flex-grid(5,9); h1 { margin-top: 0; @@ -19,7 +19,7 @@ div.question-controls { div.question-sort { vertical-align: bottom; - width: flex-grid(3.5,9); + width: flex-grid(4,9); nav { @include border-radius(35px); @@ -28,10 +28,14 @@ div.question-controls { float: right; font-size: 16px; margin: 3px 0; - padding: 0 20px; + padding:0px 20px 5px; a { - color: darken(#F6EFD4, 50%); + color: darken(#F6EFD4, 50%); + + &.on span{ + font-weight: bold; + } &:before { content: '|'; @@ -74,10 +78,6 @@ ul.question-list { font-weight: normal; margin: 0px 0 15px 0; text-transform: none; - - a { - color: #000; - } } div.user-info { @@ -157,4 +157,3 @@ div.search-tips { .search-result-summary { } - diff --git a/sass/_discussion-tags.scss b/sass/_discussion-tags.scss index af4fc11f4a..8dcbb2446e 100644 --- a/sass/_discussion-tags.scss +++ b/sass/_discussion-tags.scss @@ -10,13 +10,13 @@ ul.tags { display: inline; font-size: 12px; margin-left: 15px; - padding: 5px 10px 5px 5px; + padding: 3px 10px 5px 5px; &:before { content:""; position:absolute; top:0; - left:-12px; + left:-11px; width:0; height:0; border-color:transparent #eee transparent transparent; diff --git a/sass/_index.scss b/sass/_index.scss index 3718b41ec1..44c138d530 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -237,6 +237,40 @@ section.index-content { } } + &.intro { + section { + margin-bottom: 0; + + &.intro-text { + margin-right: flex-gutter(8); + width: flex-grid(4, 8); + + p { + margin-right: 0; + width: auto; + float: none; + } + } + + &.intro-video { + width: flex-grid(4, 8); + + a { + display: block; + width: 100%; + + img { + width: 100%; + } + + span { + display: none; + } + } + } + } + } + &.features { border-top: 1px solid #E5E5E5; padding-top: lh(); @@ -247,6 +281,10 @@ section.index-content { letter-spacing: 1px; color: #666; margin-bottom: lh(); + + span { + text-transform: none; + } } p { @@ -354,7 +392,7 @@ section.index-content { &.requirements { clear: both; - width: auto; + width: 100%; border-top: 1px solid #E5E5E5; padding-top: lh(); margin-bottom: 0; diff --git a/sass/_info.scss b/sass/_info.scss new file mode 100644 index 0000000000..4f7a0b8d1a --- /dev/null +++ b/sass/_info.scss @@ -0,0 +1,39 @@ +div.info-wrapper { + @extend .table-wrapper; + + section.updates { + @extend .content; + } + + section.handouts { + @extend .sidebar; + @include border-radius(0px 4px 0px 4px); + border-right: 0; + border-left: 1px solid #d3d3d3; + + h1 { + padding: 0 lh(); + } + + ol { + list-style: none; + + li { + a { + @include transition(); + color: lighten($text-color, 10%); + display: block; + text-decoration: none; + @include box-shadow(0 1px 0 #eee); + padding: 7px lh(); + border-bottom: 1px solid #d3d3d3; + + &:hover { + @include box-shadow(0 1px 0 #fff); + background: #efefef; + } + } + } + } + } +} diff --git a/sass/_layout.scss b/sass/_layout.scss index 2614e3b56c..89c216e26d 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -6,7 +6,7 @@ html { font: $body-font-size $body-font-family; text-align: center; margin: 0; - background: #f6f6f6; + background: #f4f4f4; //#f3f1e5 div.header-wrapper { // @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); @@ -28,7 +28,7 @@ html { font-size: 20px; font-weight: 800; margin: 0 lh() 0 0; - padding: 17px lh() 17px 0; + padding: 17px lh() 14px 0; text-shadow: 0 1px 0 lighten($mit-red, 10%); line-height: lh(); } @@ -44,16 +44,16 @@ html { h2 { float: left; margin: 0 lh() 0 0; - padding: 19px lh() 12px 0; + padding: 19px lh() 9px 0; line-height: lh(); border-right: 1px solid darken($mit-red, 5%); a { color: #fff; + text-decoration: none; &:hover { color: rgba(#fff, .7); - text-decoration: none; } } } @@ -61,7 +61,7 @@ html { ul { @extend .clearfix; display: inline-block; - padding: 19px 0 12px; + padding: 19px 0 9px; margin: 0; li { @@ -72,6 +72,7 @@ html { a { color: #fff; + text-decoration: none; &:hover { color: rgba(#fff, .7); @@ -88,15 +89,17 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-shadow(0 0 4px #ddd); @include box-sizing(border-box); + @include border-radius(4px); + overflow: hidden; background: #fff; border-bottom: 1px solid #bbb; @media screen and (min-width: 1400px) { - margin-top: lh(.5); - @include border-radius(3px); - border: 1px solid #bbb; + // @include border-radius(3px); + @include box-shadow(0 0 4px #dfdfdf); + border: 1px solid #bbb; + margin-top: lh(.5); } } @@ -119,6 +122,14 @@ html { a { color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } } } @@ -131,6 +142,14 @@ html { a { color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } } } } diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index 04d4f09701..8c14db22d4 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -15,7 +15,6 @@ div.leanModal_box { @include box-sizing(border-box); display: none; border: none; - max-width: 600px; background: #fff; padding: lh(2); @@ -27,6 +26,10 @@ div.leanModal_box { margin-bottom: lh(); } + enroll { + max-width: 600px; + } + form { text-align: left; @@ -93,7 +96,7 @@ div.leanModal_box { } } - input[type="button"] { + input[type="button"], input[type="submit"] { @include button($mit-red); font-size: 18px; padding: lh(.5); diff --git a/sass/_profile.scss b/sass/_profile.scss index 9cab2dbce6..b383c61a85 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -1,28 +1,92 @@ div.profile-wrapper { @extend .table-wrapper; + color: #000; section.user-info { - @include box-sizing(border-box); - margin-right: flex-gutter(); - padding: $body-line-height; - width: flex-grid(6); - background: #e3e3e3; - border-right: 1px solid #d3d3d3; - text-shadow: 0 1px 0 #f6f6f6; - display: table-cell; + @extend .sidebar; + @include border-radius(0px 4px 0px 4px); + border-left: 1px solid #d3d3d3; + border-right: 0; + + h1 { + padding: lh(); + } + + ul { + list-style: none; + + li { + @include transition(); + color: lighten($text-color, 10%); + display: block; + text-decoration: none; + @include box-shadow(0 1px 0 #eee); + padding: 7px lh(); + border-bottom: 1px solid #d3d3d3; + + div#location_sub, div#language_sub { + font-weight: bold; + @include inline-block(); + + input { + margin: lh(.5) 0; + } + + &:empty { + padding: 0; + } + } + + div#description { + font-size: 12px; + } + } + } + + div#change_password_pop { + padding: 7px lh(); + color: #4D4D4D; + } } section.course-info { - @include box-sizing(border-box); - display: table-cell; - padding: $body-line-height; - width: flex-grid(6); + @extend .content; - ul { - li { - display: inline-block; - padding-right: 1em; + ol { + list-style: none; + + > li { + border-bottom: 1px solid #e3e3e3; + padding: lh() 0; + @extend .clearfix; + + h2 { + float: left; + padding: 0; + margin: 0; + width: flex-grid(2, 9); + margin-right: flex-gutter(9); + } + + div.scores { + float: left; + width: flex-grid(7, 9); + + h3 { + color: #666; + } + + ul { + list-style: none; + + li { + display: inline-block; + padding-right: 1em; + } + } + } } } + } } diff --git a/sass/_question-view.scss b/sass/_question-view.scss new file mode 100644 index 0000000000..4fca12d2e4 --- /dev/null +++ b/sass/_question-view.scss @@ -0,0 +1,277 @@ +div.question-header { + div.vote-buttons { + display: inline-block; + float: left; + margin-right: flex-gutter(9); + width: flex-grid(0.7,9); + + ul { + li { + background-position: center; + background-repeat: no-repeat; + cursor: pointer; + font-weight: bold; + height: 20px; + list-style: none; + padding: 10px; + text-align: center; + width: 70%; + + &.post-vote { + @include border-radius(4px); + background-color: lighten(#F6EFD4, 3%); + } + + &.question-img-upvote, &.answer-img-upvote { + background-image: url(/static/images/askbot/vote-arrow-up.png); + + &:hover, &.on { + background-color:#d1e3a8; + } + } + + &.question-img-downvote, &.answer-img-downvote { + background-image: url(/static/images/askbot/vote-arrow-down.png); + + &:hover, &.on { + background-color:#eac6ad; + } + } + } + } + } + + div.question-container { + display: inline-block; + float: left; + width: flex-grid(8.3,9); + + h1 { + margin-top: 0; + } + + div.meta-bar { + border-bottom: 1px solid #eee; + display: block; + margin: 10px 0; + overflow: hidden; + padding: 5px 0 10px; + + + div.tag-list { + display: inline-block; + float:left; + width: flex-grid(4,8); + margin-right: flex-gutter(8); + } + + div.question-actions { + display: inline-block; + float:left; + text-align: right; + width: flex-grid(4,8); + + a { + color: darken(#F6EFD4, 50%); + + &.question-delete { + color: $mit-red; + } + } + + span.sep { + color: darken(#F6EFD4, 10%); + } + } + } + + div.question-content { + overflow: hidden; + + div.question-body { + display: inline-block; + float: left; + margin-right: flex-gutter(8); + width: flex-grid(6.2,8); + } + + div.post-update-container { + display: inline-block; + float: left; + width: flex-grid(1.8,8); + + div.post-update-info { + @include box-sizing(border-box); + @include border-radius(5px); + background:lighten(#F6EFD4, 5%); + padding: 10px; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 0; + } + + &.revision { + text-align: center; + background:lighten(#F6EFD4, 7%); + + a { + color: black; + } + } + + a { + color:$mit-red ; + } + + div.change-date { + font-size: 12px; + margin-bottom: 10px; + } + + div.avatar { + display: inline-block; + float: left; + margin-right: 3px; + + img.gravatar { + background: white; + border: 1px solid darken(#F6EFD4, 10%); + margin-right: 5px; + padding: 3px ; + vertical-align: bottom; + } + } + + div.user-meta { + display: inline-block; + width: 60%; + + span.user-badges { + display: block; + } + } + } + } + } + + div.comments-container { + @include box-sizing(border-box); + background: lighten(#efefef, 3%); + padding: 3%; + display: inline-block; + margin: 15px 0 0; + padding: 3%; + width: 100%; + + div.comments-content { + font-size: 13px; + + .block { + border-bottom: 1px solid #ddd; + border-top: 1px solid #fff; + padding: 15px 0; + display: block; + + &:first-child { + border-top: 0; + } + // &:only-of-type { + // border: 0; + // } + } + + form.post-comments { + } + + div.comment { + &:first-child { + border-top: 0; + } + + &:last-child { + margin-bottom: 20px; + } + + aside.comment-controls { + background: none; + border: none; + display: inline-block; + margin-top: -8px; + padding:0 2% 0 0; + text-align: center; + width: 5%; + + div { + background: none; + opacity: 0.6; + + &:hover { + opacity: 1; + } + } + + div.comment-votes { + @include transform(rotate(-90deg)); + width: 16px; + + a.upvote { + cursor: pointer; + font-size: 25px; + text-decoration: none; + } + } + + div.comment-delete { + // display: inline; + color: $mit-red; + cursor: pointer; + font-size: 15px; + } + } + + div.comment-body { + display: inline-block; + width: 95%; + + div.comment-meta { + text-align: right; + + a.author { + font-weight: bold; + } + + a.edit { + @extend .button; + font-size: 12px; + padding: 2px 10px; + // @include border-radius(2px); + // background: #eee; + // color: #555; + // cursor: pointer; + // padding: 1px 10px; + // text-decoration: none; + } + } + } + } + } + + #edit-comment-form { + margin: 10px 0; + min-height: 100px; + width: 99%; + resize: vertical; + } + .counter { + color: #888; + display: block; + float: right; + margin-top: 5px; + text-align: right; + } + } + } +} + + diff --git a/sass/_theme.scss b/sass/_theme.scss index 276bb6a694..31e45ae734 100644 --- a/sass/_theme.scss +++ b/sass/_theme.scss @@ -37,14 +37,6 @@ h3 { clear:both; } -a:link, a:visited { - text-decoration:none; -} - -a:hover { - text-decoration:underline; -} - #wrapper { background: transparent url( images/css/page-vbg.jpg ) repeat-y scroll 50% 0px; margin:0 auto ; diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss index 0c26f96c83..e4aad2d4ba 100644 --- a/sass/_wiki-create.scss +++ b/sass/_wiki-create.scss @@ -21,7 +21,13 @@ form#wiki_revision { } #submit_delete { + @include box-shadow(none); + background: none; + border: none; + color: #999; float: right; + text-decoration: underline; + font-weight: normal; } input[type="submit"] { @@ -32,18 +38,25 @@ form#wiki_revision { #wiki_edit_instructions { float: left; width: flex-grid(3, 9); + margin-top: lh(); + color: #666; + + &:hover { + color: #333; + } .markdown-example { - background-color: $light-gray; - padding-top: 5px; - padding-right: 2px; - padding-bottom: 5px; - padding-left: 5px; - - margin-top: 5px; - margin-bottom: 7px; - margin-left: 5px; - + background-color: #e3e3e3; + text-shadow: 0 1px 0 #fff; + + padding: { + top: 5px; + right: 2px; + bottom: 5px; + left: 5px; + } + + margin: 5px 0 7px; line-height: 1.0; } } diff --git a/sass/application.scss b/sass/application.scss index cf57b00093..7e1bbf3ce5 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -8,14 +8,15 @@ @import "leanmodal"; // pages -@import "courseware", "courseware-video"; +@import "courseware", "courseware-video", "courseware-sequence-nav"; @import "textbook"; +@import "info"; @import "profile"; @import "wiki-basic-html", "wiki-create", "wiki"; @import "activation"; @import "help"; -@import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ; +@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" , "discussion-answers"; // left over -@import "theme"; -@import "local"; +// @import "theme"; +// @import "local"; diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss new file mode 100644 index 0000000000..0d1562a88a --- /dev/null +++ b/sass/marketing-ie.scss @@ -0,0 +1,9 @@ +body { + margin: 0; + padding: 0; +} + +.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { + margin: 0; + overflow: hidden; +} diff --git a/schematic_tutorial.html b/schematic_tutorial.html new file mode 120000 index 0000000000..da681ac006 --- /dev/null +++ b/schematic_tutorial.html @@ -0,0 +1 @@ +../data/problems/schematic_tutorial.html \ No newline at end of file diff --git a/schematicinput.html b/schematicinput.html index 8c7f7e0c83..3290de3b44 100644 --- a/schematicinput.html +++ b/schematicinput.html @@ -1,19 +1,23 @@ - --
+
-
+
- Next +
- Previous +
MITx Terms of Service
-Welcome to MITx. You must read and agree to these Terms of Service ("TOS") prior to using any portion of this site (”Site“), including accessing any chat room, mailing list, or other electronic service. These TOS, MITx’s Privacy Policy [link] and Honor Code [link] are an agreement between you and the Massachusetts Institute of Technology ("MIT"). By registering for, accessing, browsing, or using any portion of the Site, you acknowledge that you have read, understood and agree to be bound by these TOS, the Privacy Policy and Honor Code.
-MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site’s homepage for a reasonable period of time following such modifications, and by changing the effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them.
-Description of MITx
-MITx offers online courses, professor-to-student and student-to-student interactivity, individual assessment of a student&rsqyo;s work, and the opportunity for students who demonstrate their mastery of subjects to earn a certificate or credential awarded by MITx.
-MITx Terms of Service
+ +Welcome to MITx. You must read and agree to these Terms of Service +("TOS"), MITx’s Privacy +Policy, and Honor Code prior to +registering for this Site or using any portion of this site +(“Site”) , including accessing any course materials, chat +room, mailing list, or other electronic service. These TOS, the +Privacy Policy and the Honor Code are agreements (the +“Agreements”) between you and the Massachusetts Institute +of Technology (“MIT”). If you do not understand or do not +agree to be bound by the terms of the Agreements, please immediately +exit this site.
+ +MITx reserves the right to modify these TOS at any time and will +publish notice of any such modifications online on the +Site Terms of Service page for a reasonable +period of time following such modifications, and by changing the +effective date of these TOS. By continuing to access the Site +after notice of such modifications has been published, you signify +your agreement to be bound by them.
+ +Description of MITx
+ +MITx offers online courses, professor-to-student and +student-to-student interactivity, individual assessment of a +student’s work, and the opportunity for students who demonstrate +their mastery of subjects to earn a certificate or credential awarded +by MITx.
+ +Rules for Online Conduct
+ +You agree that you are responsible for your own use of the Site and +for your User Postings. “User Postings” include all +content submitted, posted, published or distributed on the Site by you +or other users of the Site, including but not limited to all forum +posts, notes, questions, and comments. You agree that you will use the +Site in compliance with these TOS and all applicable local, state, +national, and international laws, rules and regulations, including any +laws regarding the transmission of technical data exported from your +country of residence and all United States export control laws. + +
As a condition of your use of the Services, you will not use the +Site in any manner that could damage, disable, overburden, or impair +any MITx server, or the network(s) connected to any MITx server, or +interfere with any other party's use and enjoyment of the +Site. You may not attempt to gain unauthorized access to the Site, +other accounts, computer systems or networks connected to any MITx +server through hacking, password mining or any other means. You may +not obtain or attempt to obtain any materials or information through +any means not intentionally made available through the Site.
+ +The following list of items is strictly prohibited on the Site:
+-
+
- Content that defames or threatens others +
- Harassing statements or content +
- Content that discusses illegal activities with the intent to commit them. +
- Content that infringes another's intellectual property, +including, but not limited to, copyrights, trademarks, or trade +secrets +
- Any inappropriate, profane, pornographic, defamatory, obscene, +indecent, or unlawful content +
- Advertising or any form of commercial solicitation +
- Political content or content related to partisan political +activities +
- Viruses, trojan horses, worms, time bombs, corrupted files, +malware, spyware, or any other similar software that may damage the +operation of another’s computer or property +
- Content that contains intentional inaccurate information with the +intent of misleading others. +
- You, furthermore, agree not to scrape, or otherwise download in
+bulk, user-contributed content, a list or directory of users on the
+system, or other material including but not limited to on-line
+textbooks, User Postings, or user information. You agree not to store
+more than 5 pages of the electronic textbook or 5 forum posts in any
+permanent medium (hard drive, optical disk, etc., flash drive, etc.).
+
You agree to not misrepresent or attempt to misrepresent your +identity while using the Sites (although you are welcome and +encouraged to use an anonymous username in the forums). +
User Accounts and Authority
+ +In order to participate in Site activities, you must provide an +email address ("Email Address") and a user password +("User Password") in order to create a user account +(“User Account”). You agree that you will never divulge or +share access or access information to your User Account with any third +party for any reason. In setting up your User Account, you may be +prompted or required to enter additional information, including your +name. You understand and agree that all information provided by you is +accurate and current. You agree to maintain and update your +information to keep it accurate and current.
+ +We consider the confidentiality and security of your information to +be of the utmost importance. Please see +our Privacy Policy for more information +about what information about you MITx collects and how MITx uses that +information.
+ +Your Right to Use Content on the Site
+ +Unless indicated as being in the public domain, all content on the +Site is protected by United States copyright. The texts, exams and +other instructional materials provided with the courses offered on +this Site are for your personal use in connection with those courses +only. MIT is planning to make MITx course content and software +infrastructure available under open source licenses that will help +create a vibrant ecosystem of contributors and further MIT’s +goal of making education accessible and affordable to the world.
+ +Certain reference documents, digital textbooks, articles and other +information on the Site are used with the permission of third parties +and use of that information is subject to certain rules and +conditions, which will be posted along with the information. By using +this Site you agree to abide by all such terms and conditions. Due to +privacy concerns, student-created content, including all forum posts, +is all Rights Reserved until released under other terms by MITx.
+ +USER POSTINGS
+ +User Postings Representations and Warranties. By +uploading and publishing your User Postings, you affirm, represent, +and warrant that you are the creator and owner of or have the +necessary licenses, rights, consents, and permissions to use and to +authorize MIT and MITx’s Users to use and distribute your User +Postings as necessary to exercise the licenses granted by you in these +TOS and in the manner contemplated by MITx. You, and not MITx, are +solely responsible for your User Postings and the consequences of +posting or publishing them.
+ +Limited License Grant to MIT. By submitting or distributing +User Postings through the Site, you hereby grant to MIT a worldwide, +non-exclusive, transferable, assignable, fully paid-up, royalty-free, +perpetual, irrevocable right and license to host, transfer, display, +perform, reproduce, modify, distribute and re-distribute, relicense, +and otherwise exploit your User Postings, in whole or in part, in any +form, and in any media formats and through any media channels (now +known or hereafter developed).
+ +Limited License Grant to MITx Users. By submitting +or distributing User Postings through the Site, you hereby grant to +each User of the Site a non-exclusive license to access and use your +User Postings in connection with their use of the Site for their own +personal purposes.
+ +Use of MITx and MIT Names, Trademarks and Service Marks
+ +“MITx,” "MIT", "Massachusetts Institute +of Technology", and its logos and seal are trademarks of the +Massachusetts Institute of Technology. You may not use MIT’s +names or logos, or any variations thereof, without prior written +consent of MIT. You may not use the MIT name in any of its forms nor +MIT seals or logos for promotional purposes, or in any way that +deliberately or inadvertently claims, suggests, or in MIT's sole +judgment gives the appearance or impression of a relationship with or +endorsement by MIT. + +
All Trademarks not owned by MIT that appear on the Site or on or +through the services made available on or through the Site, if any, +are the property of their respective owners. Nothing contained +on the Site should be construed as granting, by implication, estoppel, +or otherwise, any license or right to use any such Trademark displayed +on the Site without the written permission of the third party that may +own the applicable Trademark. +name="id.7dd2c542f51d"> + + +
Digital Millennium Copyright Act
+ +It is MIT’s policy to respond to notices of alleged copyright +infringement that comply with the Digital Millennium Copyright +Act. For more information, please go to MIT’s DMCA Notification +Guidelines http://web.mit.edu/copyright/dmca-notices.html, +incorporated herein by reference.
+ +Disclaimer of Warranty / Indemnification/Limitation of Liabilities
+ +THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT, +FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY +INFORMATION THEREIN ARE PROVIDED "AS IS" WITHOUT WARRANTY OF +ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A +PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS +ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant +the Site will operate in an uninterrupted or error-free manner or that +the Site is free of viruses or other harmful components. Use of +information obtained from or through this Site is at your own +risk. Your access to or download of information, materials, or data +through the Site or any reference sites is at your own discretion and +risk and that you will be solely responsible for any damage to your +property (including your computer system) or loss of data that results +from the download or use of such material or data.
+ +User Postings Disclaimer. You understand that when +using the Site you will be exposed to User Postings from a variety of +sources, and that MIT is not responsible for the accuracy, usefulness, +reliability, or intellectual property rights of or relating to such +User Postings. You further understand and acknowledge that you may be +exposed to User Postings that are inaccurate, offensive, defamatory, +indecent or objectionable, and you agree to waive, and hereby do +waive, any legal or equitable rights or remedies you have or may have +against MIT with respect thereto. MIT does not endorse any User +Postings or any opinion, recommendation or advice expressed +therein. MITx has no obligation to monitor any User Postings or +any other user communications through the Site. However, MITx reserves +the right to review User Postings and to edit or remove, in whole or +in part, such User Postings in its sole discretion. If notified by a +User or a content owner of a User Posting that allegedly does not +conform to the TOS, MIT may investigate the allegation and determine +in its sole discretion whether to remove the User Posting, which it +reserves the right to do at any time and without notice.
+ +Links to Other Sites. The Site may include +hyperlinks to sites maintained or controlled by others. MIT is not +responsible for and does not routinely screen, approve, review or +endorse the contents of or use of any of the products or services that +may be offered at these sites. MIT does MIT make any warranty or +representation regarding any linked third party web sites or the +information or materials appearing thereon or any of the products or +services described thereon. Hyperlinks do not imply that MIT is +affiliated or associated with, the linked-third party site. If +you decide to access linked third party web sites, you do so at your +own risk.
+ + +YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR +DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO +THESETOS, OR TO YOUR (OR ANY THIRD PARTY'S) USE OR INABILITY TO +USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR +RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER +BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE +CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT +APPLICABLE LAW REQUIRES SUCH LIABILITY.
+ +IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL, +INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER +FORESEEABLE OR UNFORESEEABLE, (INCLUDING, BUT NOT LIMITED TO, CLAIMS +FOR DEFAMATION, ERRORS, LOSS OF DATA, OR INTERRUPTION IN AVAILABILITY +OF DATA).
+ + +Indemnification
+ +You agree to defend, hold harmless and indemnify MIT, and its +subsidiaries, affiliates, officers, agents, and employees from and +against any third-party claims, actions or demands arising out of, +resulting from or in any way related to your use of the Site, +including any liability or expense arising from any and all claims, +losses, damages (actual and consequential), suits, judgments, +litigation costs and attorneys' fees, of every kind and nature. In +such a case, MIT will provide you with written notice of such claim, +suit or action.
+ +Miscellaneous
+ +Termination Rights. You agree that MIT, in its sole +discretion, may terminate your use of the Site or your participation +in it thereof, for any reason or no reason. If you no longer desire to +participate in the Site, you may terminate your participation therein +upon notice to MIT.
+ +Entire Agreement. This Agreement constitutes the entire agreement +between you and MIT with respect to your use of the Site, superseding +any prior agreements between you and MIT regarding your use of the +Site.
+ +Waiver and Severability of TOS. The failure of MIT to exercise or +enforce any right or provision of the TOS of Site shall not constitute +a waiver of such right or provision. If any provision of the TOS is +found by a court of competent jurisdiction to be invalid, the parties +nevertheless agree that the court should endeavor to give effect to +the parties' intentions as reflected in the provision, and the +other provisions of the TOS remain in full force and effect.
+ +Choice of Law/Forum Selection. You agree that any dispute +arising out of or relating to these Terms or any content posted to a +Site will be governed by the laws of the Commonwealth of +Massachusetts, excluding its conflicts of law provisions. You further +consent to the personal jurisdiction of and exclusive venue in the +federal and state courts located in and serving Boston, Massachusetts +as the legal forum for any such dispute.
+ +Effective Date: January 30, 2012
-
-
- -
- -
-
-
- +
- @@ -35,5 +42,5 @@
- -
- +

-