diff --git a/.DS_Store b/.DS_Store index a630216fad..b9a4099392 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/404.html b/404.html new file mode 100644 index 0000000000..644f802a13 --- /dev/null +++ b/404.html @@ -0,0 +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/copyright.html b/copyright.html index a238a12ec3..003db8c2af 100644 --- a/copyright.html +++ b/copyright.html @@ -7,31 +7,32 @@ -

MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.

+

MIT and MITx are trademarks of the Massachusetts Institute + of Technology, and may not be used without permission.

diff --git a/honor.html b/honor.html index 5a36865865..a763eb4f50 100644 --- a/honor.html +++ b/honor.html @@ -2,12 +2,48 @@
-

Honor Code

+

Collaboration Policy

- +

By enrolling in a course on MITx, you are joining a + special worldwide community of learners. The aspiration + of MITx is to provide anyone in the world who has the + motivation and ability to engage MIT coursework the opportunity + to attain the best MIT-based educational experience that + Internet technology enables. You are part of the community who + will help MITx achieve this goal. + +

MITx depends upon your motivation to learn the material + and to do so with honesty. In order to participate + in MITx, you must agree to the Honor Code below and any + additional terms specific to a class. This Honor Code, and any + additional terms, will be posted on each class website. + +

+

MITx Honor Code Pledge

+ +

By enrolling in an MITx course, I agree that I will: + +

    +
  • Complete all mid-terms and final exams with my own work + and only my own work. I will not submit the work of any + other person. +
  • Maintain only one user account and not let anyone else + use my username and/or password. +
  • Not engage in any activity that would dishonestly improve + my results, or improve or hurt the results of others. +
  • Not post answers to problems that are being used to + assess student performance. +
+
+

Unless otherwise indicated by the instructor of an MITx + course, learners on MITx are encouraged to: +

diff --git a/index.html b/index.html index 7b6c327ad4..7e879ddbdb 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,9 @@

Circuits & Electronics

6.002x

- Enroll in 6.002 Circuits & Electronics + Enroll in 6.002x Circuits & Electronics
-

Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002x Circuits and Electronics” is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012.

+

6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012.

<%block name="header_class">course @@ -18,9 +18,9 @@

About 6.002x

-

6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.

+

6.002x (Circuits and Electronics) is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.

-

The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. Students should expect to spend approximately 10 hours per week on the course. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.

+

The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10 hours per week on the course.

@@ -28,21 +28,26 @@

6.002x on MITx

-

Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.

+

If you successfully complete the course, you will receive an electronic certificate of accomplishment from MITx. This certificate will indicate that you earned it from MITx’s pilot course. In this prototype version, MITx will not require that you be tested in a testing center or otherwise have your identity certified in order to receive this certificate.

-

The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant sections will be provided electronically as part of the on-line course. The book can be purchased on Amazon. Copyright for the book is with Elsevier and the book cannot be printed etc.

+

The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on Amazon.

Requirements

-

In order to succeed in this course, students must have taken an AP level physics course in electricity and magnetism. Students must know basic calculus and linear algebra, and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for students with weaker math backgrounds.

+

In order to succeed in this course, you must have taken an AP level physics course in electricity and magnetism. You must know basic calculus and linear algebra and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for those who need it.

-

The course web site was developed and tested primarily with Google Chrome. We support Mozilla Firefox as well. While we will attempt to make it possible to complete the course with Internet Explorer, portions of the web site functionality will be unavailable. The videos require Flash.

+

The course web site was developed and tested primarily with + Google Chrome. We support current versions of Mozilla Firefox as + well. The video player is designed to work with Flash. While we + provide a non-Flash fallback for the video, as well as partial + support for Internet Explorer, other browsers, and tablets, + portions of the functionality will be unavailable.

- Enroll in Circuits & Electronics + Enroll in 6.002x Circuits & Electronics
@@ -54,43 +59,20 @@
  • Anant Agarwal

    -

    The Director of MIT's Computer Science and Artificial Intelligence Laboratory. His research focus is in parallel computer architectures, and he is the founder of several successful startups. Most recently, he founded Tilera, which produces scalable multicore embedded processors. He co-author the course textbook "Foundations of Analog and Digital Electronic Circuits."

  • - -
  • - -

    Chris Terman

    -

    The Co-Director MIT CSAIL, and a highly regarded instructor. He is the author of JSim, an educational package for on-line circuit schematic entry and simulation, and XTutor, and on-line question-and-answer tutoring system.

  • +

    Director of MIT’s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT’s Smullin and Jamieson prizes for teaching and co-authored the course textbook “Foundations of Analog and Digital Electronic Circuits.”

  • Gerald Sussman

    -

    A Professor of Electrical Engineering at MIT. He is a well know educator in the computer science community, perhaps best know as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textboooks in computer science, or as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.

  • +

    Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.

  • Piotr Mitros

    -

    A Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Piotr has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.

  • +

    Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.

    - - - - - - - - - - - - - - - - - -
    <%include file="create_account.html" />
    diff --git a/main.html b/main.html index fe74e8e81f..a3bc73e1a6 100644 --- a/main.html +++ b/main.html @@ -3,16 +3,16 @@ <%block name="title">MITX 6.002 - + - - - - - + + + + + @@ -27,7 +27,7 @@ displayMath: [["\\[","\\]"]]} }); - + - + + - - - - + + + +
    -

    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.

    diff --git a/registration/password_reset_email.html b/registration/password_reset_email.html index de9dc79c52..7f8cdbe927 100644 --- a/registration/password_reset_email.html +++ b/registration/password_reset_email.html @@ -3,12 +3,12 @@ {% trans "Please go to the following page and choose a new password:" %} {% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} +https://6002x.mitx.mit.edu{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} {% trans "Thanks for using our site!" %} -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} +{% blocktrans %}The MITx team{% endblocktrans %} {% endautoescape %} diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index 6fb2f026d6..461bc05176 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -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 1ed3c8b530..de1f917fca 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -109,18 +109,24 @@ @extend .clearfix; a { - @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%); - padding: lh(.75); - text-transform: uppercase; - display: block; &:hover { color: darken(#F6EFD4, 60%); text-decoration: none; - background: none; + } + + &.block-link { + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); + background: darken(#F6EFD4, 5%); + border-left: 1px solid darken(#f6efd4, 20%); + padding: lh(.75); + text-transform: uppercase; + display: block; + + &:hover { + background: none; + } } } } diff --git a/sass/_base-variables.scss b/sass/_base-variables.scss index 6f96fd715e..c89d62b3f2 100644 --- a/sass/_base-variables.scss +++ b/sass/_base-variables.scss @@ -24,7 +24,7 @@ // ---------------------------------------- // // fonts -$body-font-family: "Droid Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;; +$body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;; $body-font-size: 14px; // grid diff --git a/sass/_base.scss b/sass/_base.scss index 4ceba8b593..a703cf208e 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; @@ -21,7 +27,6 @@ p { em { font-style: italic; - font-family: Georgia, serif; } #{$all-text-inputs}, textarea { diff --git a/sass/_courseware-video.scss b/sass/_courseware-video.scss index 10504ff39c..389c23c370 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,112 @@ 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 { + cursor: pointer; + + &:hover { + color: $mit-red; + } } } } @@ -75,6 +146,7 @@ section.course-content { ol.subtitles { float: left; width: flex-grid(3, 9); + min-height: 570px; li { margin-bottom: 0px; diff --git a/sass/_courseware.scss b/sass/_courseware.scss index 9587b6d826..3c59e6e0c8 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -65,6 +65,7 @@ div.course-wrapper { text-decoration: none; margin-bottom: lh(.5); display: block; + color: #000; &:hover { color: #666; @@ -111,6 +112,10 @@ div.course-wrapper { margin-bottom: $body-line-height; @extend .topbar; + a { + @extend .block-link; + } + li { border: none; cursor: pointer; @@ -160,7 +165,7 @@ div.course-wrapper { &.seq_video_visited { width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -64px 15px no-repeat; + background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -81px 15px no-repeat; &:hover { background-color: #F6EFD4; } @@ -168,7 +173,7 @@ div.course-wrapper { &.seq_video_active { width: 14px; - background: #FFFBEB url('/static/images/video-icon.png') -25px 15px no-repeat; + 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; diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss index 73b39f738f..8c7f04871a 100644 --- a/sass/_discussion-questions.scss +++ b/sass/_discussion-questions.scss @@ -74,10 +74,6 @@ ul.question-list { font-weight: normal; margin: 0px 0 15px 0; text-transform: none; - - a { - color: #000; - } } div.user-info { @@ -158,3 +154,41 @@ div.search-tips { .search-result-summary { } +div.post-update-info { + @include box-sizing(border-box); + @include border-radius(5px); + background:lighten(#F6EFD4, 5%); + padding: 10px; + + 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; + } + } +} 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/_font-face.scss b/sass/_font-face.scss index 132e3a0d75..33162954b8 100644 --- a/sass/_font-face.scss +++ b/sass/_font-face.scss @@ -1,12 +1,125 @@ +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */ + + +// Not used in UI +// @font-face { +// font-family: 'Open Sans'; +// src: url('/static/fonts/OpenSans-Light-webfont.eot'); +// src: url('/static/fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), +// url('/static/fonts/OpenSans-Light-webfont.woff') format('woff'), +// url('/static/fonts/OpenSans-Light-webfont.ttf') format('truetype'), +// url('/static/fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg'); +// font-weight: 300; +// font-style: normal; + +// } + +// @font-face { +// font-family: 'Open Sans'; +// src: url('/static/fonts/OpenSans-LightItalic-webfont.eot'); +// src: url('/static/fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'), +// url('/static/fonts/OpenSans-LightItalic-webfont.woff') format('woff'), +// url('/static/fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'), +// url('/static/fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg'); +// font-weight: 300; +// font-style: italic; + +// } + @font-face { - font-family: 'Droid Sans'; - font-style: normal; - font-weight: normal; - src: local('Droid Sans'), local('DroidSans'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/s-BiyweUPV0v-yRb-cjciL3hpw3pgy2gAi-Ip7WPMi0.woff') format('woff'); + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-Regular-webfont.eot'); + src: url('/static/fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-Regular-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-Regular-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg'); + font-weight: 600; + font-style: normal; + } + @font-face { - font-family: 'Droid Sans'; - font-style: normal; - font-weight: bold; - src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/EFpQQyG9GqCrobXxL-KRMXbFhgvWbfSbdVg11QabG8w.woff') format('woff'); + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-Italic-webfont.eot'); + src: url('/static/fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-Italic-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-Italic-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg'); + font-weight: 400; + font-style: italic; + } + +// Not used in UI +// @font-face { +// font-family: 'Open Sans'; +// src: url('/static/fonts/OpenSans-Semibold-webfont.eot'); +// src: url('/static/fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), +// url('/static/fonts/OpenSans-Semibold-webfont.woff') format('woff'), +// url('/static/fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), +// url('/static/fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg'); +// font-weight: 600; +// font-style: normal; + +// } + +// @font-face { +// font-family: 'Open Sans'; +// src: url('/static/fonts/OpenSans-SemiboldItalic-webfont.eot'); +// src: url('/static/fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), +// url('/static/fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'), +// url('/static/fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'), +// url('/static/fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg'); +// font-weight: 600; +// font-style: italic; + +// } + +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-Bold-webfont.eot'); + src: url('/static/fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-Bold-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-Bold-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg'); + font-weight: 700; + font-style: normal; + +} + +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-BoldItalic-webfont.eot'); + src: url('/static/fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-BoldItalic-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg'); + font-weight: 700; + font-style: italic; + +} + +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-ExtraBold-webfont.eot'); + src: url('/static/fonts/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-ExtraBold-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-ExtraBold-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg'); + font-weight: 800; + font-style: normal; + +} + +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.eot'); + src: url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'), + url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'), + url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg'); + font-weight: 800; + font-style: italic; + +} + diff --git a/sass/_index-extends.scss b/sass/_index-extends.scss new file mode 100644 index 0000000000..15187b73e4 --- /dev/null +++ b/sass/_index-extends.scss @@ -0,0 +1,71 @@ +.wrapper { + @include box-sizing(border-box); + margin: 0 auto; + max-width: $fg-max-width; + min-width: $fg-min-width; + padding: lh(); + width: flex-grid(12); +} + +.subpage { + @extend .clearfix; + @extend .wrapper; + + > div { + padding-left: flex-grid(4) + flex-gutter(); + + p { + margin-bottom: lh(); + } + + h1 { + margin-bottom: lh(.5); + } + + h2 { + font: 18px $header-font-family; + color: #000; + margin-bottom: lh(.5); + } + + ul { + list-style: disc outside none; + + li { + list-style: disc outside none; + } + } + } +} + +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +.button { + @include border-radius(3px); + @include border-radius(3px); + @include inline-block(); + @include transition(); + background-color: $mit-red; + color: #fff; + margin: lh() 0 lh(.5); + padding: lh(.25) lh(.5); + text-decoration: none; + font-style: normal; + -webkit-font-smoothing: antialiased; + + &:hover { + background-color: darken($mit-red, 10%); + } + + span { + font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; + font-style: italic; + } +} + diff --git a/sass/_index-variables.scss b/sass/_index-variables.scss index 80b1512232..47eb6b9179 100644 --- a/sass/_index-variables.scss +++ b/sass/_index-variables.scss @@ -25,5 +25,5 @@ $header-font-family: "Open Sans", Helvetica, Arial, sans-serif; $lh: golden-ratio($body-font-size, 1); // Colors -$mit-red: #990000; +$mit-red: #933; $cream: #F6EFD4; diff --git a/sass/_index.scss b/sass/_index.scss index a441f03738..f1dd89392f 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -1,103 +1,3 @@ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 800; - src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 800; - src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxsBo4hlZyBvkZICS3KpNonM.woff') format('woff'); -} -// Extends -//---------------------------------------- // -.wrapper { - @include box-sizing(border-box); - margin: 0 auto; - max-width: $fg-max-width; - min-width: $fg-min-width; - padding: lh(); - width: flex-grid(12); -} - -.subpage { - @extend .clearfix; - @extend .wrapper; - - > div { - padding-left: flex-grid(4) + flex-gutter(); - - p { - margin-bottom: lh(); - } - - h1 { - margin-bottom: lh(.5); - } - - h2 { - font: 18px $header-font-family; - color: #000; - margin-bottom: lh(.5); - } - - ul { - list-style: disc outside none; - - li { - list-style: disc outside none; - } - } - } -} - -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.button { - @include border-radius(3px); - @include border-radius(3px); - @include inline-block(); - @include transition(); - background-color: $mit-red; - color: #fff; - margin: lh() 0 lh(.5); - padding: lh(.25) lh(.5); - text-decoration: none; - font-style: normal; - -webkit-font-smoothing: antialiased; - - &:hover { - background-color: darken($mit-red, 10%); - } - - span { - font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; - font-style: italic; - } -} - body { background-color: #fff; color: #444; @@ -144,17 +44,17 @@ body { } header.announcement { - // @include background-size(cover); + @include background-size(cover); background: #333; border-bottom: 1px solid #000; color: #fff; -webkit-font-smoothing: antialiased; &.home { - background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg"); + background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); @media screen and (min-width: 1200px) { - background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg"); + background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } // @media screen and (max-width: 1199px) { @@ -347,6 +247,10 @@ section.index-content { letter-spacing: 1px; color: #666; margin-bottom: lh(); + + span { + text-transform: none; + } } p { @@ -454,7 +358,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/_layout.scss b/sass/_layout.scss index f1fd1d4395..2614e3b56c 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -6,12 +6,13 @@ html { font: $body-font-size $body-font-family; text-align: center; margin: 0; - background: #f3f3f3; + background: #f6f6f6; div.header-wrapper { - @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%), 0 1px 1px #ccc); - @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); - border-bottom: 1px solid darken($mit-red, 10%); + // @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); + @include box-shadow(inset 0 -1px 2px darken($mit-red, 10%)); + background: $mit-red; + border-bottom: 1px solid #fff; header { @extend .clearfix; @@ -21,37 +22,53 @@ html { h1 { border-right: 1px solid darken($mit-red, 5%); - font-size: $body-font-size; - font-weight: bold; - margin: 0 $gw-gutter 0 0; - padding: 15px $gw-gutter 15px 0; + color: #000; display: block; float: left; - color: #000; + font-size: 20px; + font-weight: 800; + margin: 0 lh() 0 0; + padding: 17px lh() 17px 0; text-shadow: 0 1px 0 lighten($mit-red, 10%); - - em { - @include inline-block(); - padding-right: lh(); - } + line-height: lh(); } nav { float: left; display: block; margin: 0; + padding: 0; text-shadow: 0 -1px 0 darken($mit-red, 10%); + -webkit-font-smoothing: antialiased; + + h2 { + float: left; + margin: 0 lh() 0 0; + padding: 19px lh() 12px 0; + line-height: lh(); + border-right: 1px solid darken($mit-red, 5%); + + a { + color: #fff; + + &:hover { + color: rgba(#fff, .7); + text-decoration: none; + } + } + } ul { @extend .clearfix; display: inline-block; - padding: 15px 0; + padding: 19px 0 12px; margin: 0; li { margin-right: lh(); display: inline-block; margin-bottom: 0; + line-height: lh(); a { color: #fff; @@ -71,11 +88,16 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-shadow(0 1px 0 #fff); + @include box-shadow(0 0 4px #ddd); @include box-sizing(border-box); background: #fff; - border: 1px solid #ccc; - border-top: 0; + border-bottom: 1px solid #bbb; + + @media screen and (min-width: 1400px) { + margin-top: lh(.5); + @include border-radius(3px); + border: 1px solid #bbb; + } } img { diff --git a/sass/_question-view.scss b/sass/_question-view.scss new file mode 100644 index 0000000000..4f3cac582f --- /dev/null +++ b/sass/_question-view.scss @@ -0,0 +1,101 @@ +div.question-header { + div.vote-buttons { + display: inline-block; + float: left; + width: flex-grid(1,9); + margin-right: flex-gutter(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: 25px; + + &.question-img-upvote, &.answer-img-upvote { + background-image: url(/static/images/askbot/vote-arrow-up-new.png); + background-color: #F6EFD4; + + &:hover, &.on { + background-image: url(/static/images/askbot/vote-arrow-up-on-new.png); + } + } + + &.question-img-downvote, &.answer-img-downvote { + background-image: url(/static/images/askbot/vote-arrow-down-new.png); + + &:hover, &.on { + background-image: url(/static/images/askbot/vote-arrow-down-on-new.png); + } + } + } + } + + div.question-container { + display: inline-block; + float: left; + width: flex-grid(8,9); + + h1 { + margin-top: 0; + } + + div.meta-bar { + border-bottom: 1px solid #eee; + display: block; + margin: 20px 0 10px; + overflow: hidden; + padding-bottom: 15px; + + + 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-info { + display: inline-block; + float: left; + width: flex-grid(1.8,8); + } + } + } +} + + diff --git a/sass/_textbook.scss b/sass/_textbook.scss index b0fbdcd372..2212367a02 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -4,13 +4,39 @@ div.book-wrapper { ul#booknav { @extend .sidebar; @include box-sizing(border-box); - padding: lh(); + + a { + color: #000; + + &:hover { + color: #666; + } + } li { + background: none; + padding-left: 30px; + + div.hitarea { + margin-left: -22px; + background-image: url('/static/images/treeview-default.gif'); + + &:hover { + opacity: 0.6; + filter: alpha(opacity=60); + } + } + ul { background: none; } } + + > li { + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: 7px 7px 7px 30px; + } } section.book { @@ -20,6 +46,10 @@ div.book-wrapper { @extend .topbar; @extend .clearfix; + a { + @extend .block-link; + } + ul { @extend .clearfix; 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/_wiki.scss b/sass/_wiki.scss index a558e373dc..a3c6c95e3c 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -78,6 +78,10 @@ div.wiki-wrapper { header { @extend .topbar; + a { + @extend .block-link; + } + p { float: left; padding: 15px; diff --git a/sass/application.scss b/sass/application.scss index cf57b00093..6d046c2a6a 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -14,7 +14,7 @@ @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" ; // left over @import "theme"; 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/sass/marketing.scss b/sass/marketing.scss index 545fe122f0..61dff2d197 100644 --- a/sass/marketing.scss +++ b/sass/marketing.scss @@ -1,6 +1,7 @@ @import "bourbon/bourbon"; @import "reset"; +@import "font-face"; // pages -@import "index-functions", "index-variables", "index"; +@import "index-functions", "index-variables", "index-extends", "index"; @import "leanmodal"; diff --git a/server-down.html b/server-down.html new file mode 100644 index 0000000000..40786ed3ba --- /dev/null +++ b/server-down.html @@ -0,0 +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 new file mode 100644 index 0000000000..c88afb95dd --- /dev/null +++ b/server-error.html @@ -0,0 +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 new file mode 100644 index 0000000000..5f770c1abf --- /dev/null +++ b/server-overloaded.html @@ -0,0 +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.

    +
    diff --git a/simplewiki_base.html b/simplewiki_base.html index 87f4cd8275..f73c63218e 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -42,7 +42,7 @@ tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]], displayMath: [ ['$$','$$'], ["\\[","\\]"]]} }); - + diff --git a/simplewiki_edit.html b/simplewiki_edit.html index fc5f63d970..7ead7f4abc 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -12,7 +12,7 @@ ${ wiki_article.title }
    ${wiki_form} - + diff --git a/simplewiki_error.html b/simplewiki_error.html index 91721abfc5..5f9bb0be5c 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -74,6 +74,10 @@ ${wiki_error}

    The article you tried to access has been deleted. You may be able to restore it to an earlier version in its history, or create a new version.

    +%elif wiki_err_norevision is not UNDEFINED: +

    + This article does not contain revision ${wiki_err_norevision | h}. +

    %else:

    An error has occured. diff --git a/simplewiki_history.html b/simplewiki_history.html index efeeb95430..0cdeaf4b30 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -70,7 +70,8 @@ ${ wiki_article.title } %endif - +circuit:basic

    $LaTeX Math Expression$

    To create a new wiki article, create a link to it. Clicking the link gives you the creation page. -

    [Article](/wiki/view/Article/Child/)

    +

    [Article](/wiki/view/Article/)

    Other useful examples:

    [Link](http://google.com)

    Huge Header diff --git a/simplewiki_view.html b/simplewiki_view.html index d939e3e1d8..6492174670 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -8,6 +8,6 @@ <%block name="wiki_body">

    - ${ wiki_article.current_revision.contents_parsed| n} + ${ wiki_article_revision.contents_parsed| n}
    diff --git a/staticbook.html b/staticbook.html index af3cade9cb..46348a1441 100644 --- a/staticbook.html +++ b/staticbook.html @@ -16,7 +16,7 @@ function goto_page(n) { if(n<10) { prefix="00"; } - $("#bookpage").attr("src","/static/book/p"+prefix+n+".jpg"); + $("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".jpg"); }; function prev_page() { @@ -56,7 +56,7 @@ function next_page() { - + diff --git a/tos.html b/tos.html index e71023997e..9a4d327e87 100644 --- a/tos.html +++ b/tos.html @@ -2,11 +2,290 @@
    -

    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:

    +
      +
    1. Content that defames or threatens others +
    2. Harassing statements or content +
    3. Content that discusses illegal activities with the intent to commit them. +
    4. Content that infringes another's intellectual property, +including, but not limited to, copyrights, trademarks, or trade +secrets +
    5. Any inappropriate, profane, pornographic, defamatory, obscene, +indecent, or unlawful content +
    6. Advertising or any form of commercial solicitation +
    7. Political content or content related to partisan political +activities +
    8. 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 +
    9. Content that contains intentional inaccurate information with the +intent of misleading others. +
    10. 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

    +
    diff --git a/video.html b/video.html index 20dd38d063..7e13c80974 100644 --- a/video.html +++ b/video.html @@ -8,13 +8,20 @@
    -
    -
    0:00/0:00
    -
    + +
    + + +
    0:00/0:00
    + +
    + Speed:
    +
    +