diff --git a/.DS_Store b/.DS_Store index b0551ee9cc..9a2711a1c5 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/book_toc.html b/book_toc.html index 01b280421d..44904d8f60 100644 --- a/book_toc.html +++ b/book_toc.html @@ -1,337 +1,339 @@ -
  • The Circuit Abstraction -
  • Resistive Networks -
  • Network Theorems -
  • Analysis of Nonlinear Circuits -
  • The Digital Abstraction -
  • The MOSFET Switch -
  • The MOSFET Amplifier -
  • The Small Signal Model -
  • Energy Storage Elements -
  • First-order Transients -
  • Energy and Power in Digital Circuits -
  • Transients in Second Order Circuits -
  • Sinusoidal Steady State -
  • Sinusoidal Steady State: Resonance -
  • The Operational Amplifier Abstraction -
  • Diodes -
  • Maxwell's Equations and the LMD -
  • Trigonometric Functions \& Identities -
  • Complex Numbers -
  • Solving Simultaneous Linear Equations + +
  • The Circuit Abstraction +
  • Resistive Networks +
  • Network Theorems +
  • Analysis of Nonlinear Circuits +
  • The Digital Abstraction +
  • The MOSFET Switch +
  • The MOSFET Amplifier +
  • The Small Signal Model +
  • Energy Storage Elements +
  • First-order Transients +
  • Energy and Power in Digital Circuits +
  • Transients in Second Order Circuits +
  • Sinusoidal Steady State +
  • Sinusoidal Steady State: Resonance +
  • The Operational Amplifier Abstraction +
  • Diodes +
  • Maxwell's Equations and the LMD +
  • Trigonometric Functions \& Identities +
  • Complex Numbers +
  • Solving Simultaneous Linear Equations diff --git a/copyright.html b/copyright.html new file mode 100644 index 0000000000..0f5dc10b47 --- /dev/null +++ b/copyright.html @@ -0,0 +1,30 @@ +<%inherit file="marketing.html" /> + +
    +
    + + +
    +

    MITx

    +

    An MIT Education Anywhere. For free.

    +
    +
    +
    + +
    + +

    Licensing Information

    + + + + + + +
    Videos and Ungraded Exercises Creative Commons License
    The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
    Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
    TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
    Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
    Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
    + +

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

    diff --git a/honor.html b/honor.html new file mode 100644 index 0000000000..fc934c383e --- /dev/null +++ b/honor.html @@ -0,0 +1,26 @@ +<%inherit file="marketing.html" /> + +
    +
    + + +
    +

    MITx

    +

    An MIT Education Anywhere. For free.

    +
    +
    +
    + +
    + +

    Honor Code

    + + + +
    diff --git a/index.html b/index.html index a9de916506..5f74afa364 100644 --- a/index.html +++ b/index.html @@ -1,16 +1,19 @@ -<%inherit file="main.html" /> +<%inherit file="marketing.html" /> -
    +
    -

    6.002

    -

    Circuits & Electronics

    -

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

    - Enroll in 6.002 Circuits & Electronics +
    +

    Circuits & Electronics

    +

    6.002

    + Enroll in 6.002 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.

    @@ -20,57 +23,67 @@
    -
    +

    About 6.002

    -

    6.002 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. 6.002 is worth 4 Engineering Design Points. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.

    - +

    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.

    + +

    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.

    +
    -
    -

    6.002 on MITx

    +
    +

    6.002 on MITx

    -

    Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Students will not receive course credit, but students successfully finishing the course will be well-placed to take an exam to pass out of 6.002 should they ever enroll at MIT, and potentially, similar courses at other schools.

    +

    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.

    -

    In order to succeed in this course, students must have some background in calculus and 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.

    +

    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.

    Requirements

    -

    Students entering the course are expected to know how basic calculus and differential equations, as well as basic linear algebra. In addition, a background in E&M is helpful, although not critical.

    +

    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.

    -

    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 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.

    - + +
    + Enroll in Circuits & Electronics +
    +
    +

    About the course staff

    • +

      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."

      • +

      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.

      • +

      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.

    • +

      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.

      • +

      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.

    • +

      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.

      • +

      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.

    -
    + + @@ -85,10 +98,7 @@ -
    - Enroll in Circuits & Electronics -
    -
    +
    diff --git a/main.html b/main.html index 3e512ca215..68a37d06aa 100644 --- a/main.html +++ b/main.html @@ -6,6 +6,7 @@ + @@ -13,6 +14,7 @@ + diff --git a/marketing.html b/marketing.html new file mode 100644 index 0000000000..c8b7c2f0d8 --- /dev/null +++ b/marketing.html @@ -0,0 +1,104 @@ + + + + <%block name="title">MITX 6.002 + + + + + + + + + + + + + + + + + +<%block name="headextra"/> + + + + + + ${self.body()} + <%block name="bodyextra"/> + + + +
    +
    + Found a bug? Got an idea for improving our system? Let us know. + +
    +
      +
      2. +
      3. +
      4. +
    +
    + +
    +
    + +
    +
    + + + + +

    Supported operations: ^ * / + - || ()

    +

    Supported suffixes: %kMGTcmunp

    +
    +
    + + + + + diff --git a/mitx_global.html b/mitx_global.html index 4291f06367..047e544298 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -1,41 +1,53 @@ -<%inherit file="main.html" /> +<%inherit file="marketing.html" /> -
    +
    -

    An MIT Education Anywhere.
    For free.

    -

    MITx is an open learning software available free of cost, so that others — whether other universities or different educational institutions, such as K–12 school systems — can leverage the same software for their online education offerings.

    +

    MITx

    +

    An MIT Education Anywhere. For free.

    -
    -

    About MITx

    -

    MITx is a portfolio of MIT courses through an online interactive learning platform that:

    +

    MITx is MIT’s online learning initiative.

    -
      -
    • 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.
      • -
    +
    +

    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.

    +
    -

    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 learners around the world.

    +
    +

    It will offer a portfolio of MIT courses for free 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.
      • +
    + +

    Press & links: Boston Globe, New York Times, MIT Press Release, MITx FAQ

    +
    -
    -

    Course offering

    -

    6.002 Circuits and Electronics

    -

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

    +
    +
    +

    Spring 2012 Course offering

    +

    Circuits and Electronics

    +

    6.002x

    +
    +

    - More information about Circuits and Electronics + More information & Enroll

    + +

    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.

    @@ -52,7 +64,8 @@
    - diff --git a/privacy.html b/privacy.html new file mode 100644 index 0000000000..286e503455 --- /dev/null +++ b/privacy.html @@ -0,0 +1,21 @@ +<%inherit file="marketing.html" /> + +
    +
    + + +
    +

    MITx

    +

    An MIT Education Anywhere. For free.

    +
    +
    +
    + +
    + +

    Privacy Policy

    + + +
    diff --git a/sass/_index-functions.scss b/sass/_index-functions.scss new file mode 100644 index 0000000000..d0777bd813 --- /dev/null +++ b/sass/_index-functions.scss @@ -0,0 +1,21 @@ +// Functions +//---------------------------------------- // + +// Flexible grid +@function flex-grid($columns, $container-columns: $fg-max-columns) { + $width: $columns * $fg-column + ($columns - 1) * $fg-gutter; + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($width / $container-width); +} + +// Flexible grid gutter +@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($gutter / $container-width); +} + +// Line-height +@function lh($amount: 1) { + @return $lh * $amount; +} + diff --git a/sass/_index-variables.scss b/sass/_index-variables.scss new file mode 100644 index 0000000000..ad365b9457 --- /dev/null +++ b/sass/_index-variables.scss @@ -0,0 +1,27 @@ +// Variables +//---------------------------------------- // +// // grid +$fg-column: 60px; +$fg-gutter: 25px; +$fg-max-columns: 12; +$fg-max-width: 1400px; +$fg-min-width: 810px; + +$gw-column: 60px; +$gw-gutter: 25px; + +$body-font-family: Georgia, serif; +$header-font-family: "Open Sans", Helvetica, Arial, sans-serif; + +// @media screen and (min-width: 940px) { + $body-font-size: 16px; +// } + + +// @media screen and (max-width: 939px) { +// $body-font-size: 14px; +// } + +$lh: golden-ratio($body-font-size, 1); + +$mit-red: #990000; diff --git a/sass/_index.scss b/sass/_index.scss index 48418821ff..71fdd34cde 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -1,32 +1,147 @@ @font-face { - font-family: 'Oswald'; + font-family: 'Open Sans'; font-style: normal; - font-weight: normal; - src: local('Oswald '), local('Oswald'), url('http://themes.googleusercontent.com/static/fonts/oswald/v3/qpy-UiLNKP-VfOdbcs6r6-vvDin1pK8aKteLpeZ5c0A.woff') format('woff'); + 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: 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'); +} + + + +// 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); +} + +.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; + + &: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; + font: $body-font-size $body-font-family; + +#{$all-text-inputs}, textarea { + @include box-shadow(0 -1px 0 #fff); + @include linear-gradient(#eee, #fff); + border: 1px solid #999; + font: $body-font-size $body-font-family; + padding: 4px; + width: 100%; + + &:focus { + border-color: $mit-red; + } +} } header.announcement { - background: $mit-red; - border-top: 3px solid darken($mit-red, 10%); color: #fff; + border-bottom: 1px solid #000; + background: #e3e3e3; + @include background-size(cover); + + &.home { + @media screen and (min-width: 1200px) { + background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg"); + } + + @media screen and (max-width: 1199px) { + background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg"); + } + + div { + padding: lh(10) lh() lh(3); + } + } + + &.course { + + @media screen and (min-width: 1200px) { + background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); + } + + @media screen and (max-width: 1199px) and (min-width: 700px) { + background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); + @include background-size(cover); + } + + @media screen and (max-width: 699px) { + background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); + @include background-size(cover); + } + + div { + padding: lh(4) lh() lh(2); + } + } div { @extend .wrapper; - padding: 80px $body-line-height 60px; position: relative; - @include box-sizing(border-box); nav { position: absolute; - top: 20px; - right: 0; + top: 0; + right: lh(); + @include border-radius(0 0 3px 3px); + background: rgba(#000, .7); + padding: lh(.5); + + h1 { + @include inline-block(); + margin-right: lh(); + + a { + font: 800 18px $header-font-family; + color: #fff; + text-decoration: none; + } + } a.login { - text-transform: uppercase; + text-decoration: none; color: #fff; font-size: 12px; - margin-right: 20px; - text-shadow: 0 -1px 0 darken($mit-red, 10%); &:hover { color: rgba(#fff, .6); @@ -36,158 +151,298 @@ header.announcement { section { @extend .clearfix; - padding-left: grid-width(3); + @include inline-block(); + background: $mit-red; + margin-left: flex-grid(4) + flex-gutter(); + padding: lh() lh(1.5); h1 { - font-family: "Oswald"; - font-size: 62px; + @include inline-block(); + font-family: "Open Sans"; + font-size: 30px; + font-weight: 800; line-height: 1.2em; - margin: 0; - text-transform: uppercase; - text-shadow: 0 -2px 0 darken($mit-red, 10%); + margin: 0 lh() 0 0; } - p { - line-height: 1.6em; - max-width: 700px; - margin: 2em 0 0; + h2 { + @include inline-block(); + font-family: "Open Sans"; + font-size: 24px; + font-weight: 400; + line-height: 1.2em; } &.course { - padding-left: grid-width(4) + $gw-gutter; + section { + width: flex-grid(4, 8); + margin-right: flex-gutter(8); + float: left; + margin-left: 0; + padding: 0; - a.enroll { - @include button(#fff); - @include inline-block(); - @include box-shadow(0 1px 0 lighten($mit-red, 10%)); - margin-top: lh(); - font-size: 18px; - padding: lh(.5); - border-color: darken($mit-red, 10%); + a { + @extend .button; + background-color: darken($mit-red, 20%); + display: block; + padding: lh(.5) lh(); + text-align: center; - &:hover { - text-decoration: none; + &:hover { + background-color: darken($mit-red, 10%); + } } } + + p { + width: flex-grid(4, 8); + line-height: lh(); + float: left; + } } } } } section.index-content { - @extend .main-content; @extend .wrapper; - @include box-sizing(border-box); - padding: lh(); + @extend .clearfix; section { - width: grid-width(6); @extend .clearfix; float: left; - &.about { - margin-right: $gw-gutter; - } - - &.about-course { - width: grid-width(12); - float: none; - @extend .clearfix; - - section { - width: grid-width(4); - margin-right: $gw-gutter; - - &.requirements { - margin-right: 0; - } - } - } - - &.staff { - @extend .clearfix; - border-top: 1px solid #eee; - float: none; - width: grid-width(12); - margin-top: lh(); - padding-top: lh(); - - ul { - list-style: none; - margin: 0; - - li { - width: grid-width(3); - list-style: none; - float: left; - margin-right: $gw-gutter; - - img { - float: left; - margin: 0 1em 1em 0; - } - - &:last-child { - margin-right: 0; - } - } - } - } - h1 { - font-size: 34px; - margin-top: 0; - font-family: "Oswald"; - } - - ul { - margin: 0 grid-width(1) 1em; - list-style: disc outside none; - - li { - list-style: disc outside none; - } + font-size: 24px; + font-weight: 800; + font-family: "Open Sans"; + margin-bottom: lh(); } p { - line-height: 1.5; + line-height: lh(); + margin-bottom: lh(); } - a.more-info { - // @extend .button; - @include button(simple, $mit-red); - @include inline-block(); - margin-top: lh(); - font-size: 18px; - padding: lh(.5); + ul { + margin: 0; + // list-style: disc outside none; - &:hover { - text-decoration: none; + // li { + // list-style: disc outside none; + // } + } + + &.about { + @include box-sizing(border-box); + border-right: 1px solid #e5e5e5; + margin-right: flex-gutter(); + padding-right: flex-gutter() / 2; + width: flex-grid(8); + + section { + @extend .clearfix; + margin-bottom: lh(); + + p { + width: flex-grid(4, 8); + float: left; + + &:nth-child(odd) { + margin-right: flex-gutter(8); + } + } + + &.features { + border-top: 1px solid #E5E5E5; + padding-top: lh(); + margin-bottom: 0; + + h2 { + text-transform: uppercase; + letter-spacing: 1px; + color: #666; + margin-bottom: lh(); + } + + p { + width: auto; + + strong { + font-family: "Open sans"; + font-weight: 800; + } + + a { + color: $mit-red; + text-decoration: none; + @include transition(); + + &:hover, &:focus { + color: darken($mit-red, 15%); + } + } + } + + ul { + margin-bottom: 0; + + li { + line-height: lh(); + width: flex-grid(4, 8); + float: left; + margin-bottom: lh(.5); + + &:nth-child(odd) { + margin-right: flex-gutter(8); + } + } + } + } } } - } - div.secondary { - border-top: 1px solid #eee; - margin-top: lh(); - padding-top: lh(); + &.course, &.staff { + width: flex-grid(4); - section { - text-align: center; - width: auto; - float: none; + h1 { + font: normal $body-font-size $body-font-family; + text-transform: uppercase; + letter-spacing: 1px; + color: #666; + margin-bottom: lh(); + } - a.enroll { - @include button(simple, $mit-red); - @include inline-block(); - margin-top: lh(); - font-size: 18px; - padding: lh(.5); + h2 { + font: 800 24px $header-font-family; + } - &:hover { - text-decoration: none; + h3 { + font: 400 18px $header-font-family; + } + + a { + @extend .button; + } + + ul { + li { + img { + float: left; + margin-right: lh(.5); + } + } + } + } + + &.course { + h2 { + padding-top: lh(5); + background: url('/static/images/marketing/circuits-bg.jpg') 0 0 no-repeat; + @include background-size(contain); + + @media screen and (max-width: 998px) { + background: url('/static/images/marketing/circuits-medium-bg.jpg') 0 0 no-repeat; + } + } + } + + + // index + //---------------------------------------- // + &.about-course { + @include box-sizing(border-box); + border-right: 1px solid #e5e5e5; + margin-right: flex-gutter(); + padding-right: flex-gutter() / 2; + width: flex-grid(8); + + section { + width: flex-grid(4, 8); + + + &.about-info { + margin-right: flex-gutter(8); + } + + &.requirements { + clear: both; + width: auto; + border-top: 1px solid #E5E5E5; + padding-top: lh(); + margin-bottom: 0; + + p { + float: left; + width: flex-grid(4, 8); + margin-right: flex-gutter(8); + + &:nth-child(odd) { + margin-right: 0; + } + } + } + + &.cta { + width: 100%; + + a.enroll { + @extend .button; + padding: lh(.5) lh(); + display: block; + text-align: center; + font: 800 18px $header-font-family; + } } } } } } + +footer { + @extend .wrapper; + @extend .clearfix; + padding-top: 0; + + div.footer-wrapper { + border-top: 1px solid #e5e5e5; + padding: lh() 0; + background: url('/static/images/marketing/mit-logo.png') right center no-repeat; + + a { + color: #888; + text-decoration: none; + @include transition(); + + &:hover, &:focus { + color: #666; + } + } + + p { + @include inline-block(); + margin-right: lh(); + } + + ul { + @include inline-block(); + + li { + @include inline-block(); + + &:after { + content: ' |'; + display: inline; + color: #ccc; + } + + &:last-child { + &:after { + content: none; + } + } + + } + } + } +} diff --git a/sass/application.scss b/sass/application.scss index 01300635b6..2aebcee3c9 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -12,7 +12,6 @@ @import "textbook"; @import "profile"; @import "wiki-create", "wiki"; -@import "index"; @import "activation"; // left over diff --git a/sass/marketing.scss b/sass/marketing.scss new file mode 100644 index 0000000000..99c1cc2904 --- /dev/null +++ b/sass/marketing.scss @@ -0,0 +1,6 @@ +@import "bourbon/bourbon"; +@import "reset"; + +// pages +@import "index-functions", "index-variables", "index"; +@import "fancybox"; diff --git a/schematicinput.html b/schematicinput.html index 06f27db1c1..8c7f7e0c83 100644 --- a/schematicinput.html +++ b/schematicinput.html @@ -1,10 +1,10 @@ - - + + + % if state == 'unsubmitted': diff --git a/seq_module.js b/seq_module.js index b4c116671c..a636045587 100644 --- a/seq_module.js +++ b/seq_module.js @@ -30,6 +30,10 @@ var ${ id }loc = -1; function ${ id }goto(i) { log_event("seq_goto", {'old':${id}loc, 'new':i,'id':'${id}'}); + + postJSON('/modx/sequential/${ id }/goto_position', + {'position' : i }); + if (${ id }loc!=-1) ${ id }destroy_functions[ ${ id }loc ](); $('#seq_content').html(${ id }contents[i]); @@ -72,5 +76,5 @@ $(function() { } $('#${ id }next').click(function(eo) { ${ id }next();}); $('#${ id }prev').click(function(eo) { ${ id }prev();}); - ${ id }goto(1); + ${ id }goto( ${ position } ); }); diff --git a/tos.html b/tos.html new file mode 100644 index 0000000000..94feac75e2 --- /dev/null +++ b/tos.html @@ -0,0 +1,30 @@ +<%inherit file="marketing.html" /> + +
    +
    + + +
    +

    MITx

    +

    An MIT Education Anywhere. For free.

    +
    +
    +
    + +
    + +

    Terms of Service

    + + + + + + +
    Videos and Ungraded Exercises Creative Commons License
    The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
    Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
    TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
    Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
    Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
    + +

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

    diff --git a/video_init.js b/video_init.js index 91fe5fa953..0cd9408a8d 100644 --- a/video_init.js +++ b/video_init.js @@ -30,7 +30,7 @@ function good() { ajax_video=good; -loadNewVideo(streams["1.0"], ${ video_time }); +loadNewVideo(streams["1.0"], ${ position }); function add_speed(key, stream) { var id = 'speed_' + stream;