From e0f01aa82883663c14f0cb9a1eced91513361dcc Mon Sep 17 00:00:00 2001 From: Galen Frechette Date: Thu, 28 Jun 2012 18:05:10 -0400 Subject: [PATCH] cleans up course info/profile page --- lms/static/js/course_info.js | 6 +- lms/static/sass/_course_info.scss | 544 +++++++++---------- lms/static/sass/_shared_list_of_courses.scss | 10 - lms/static/sass/application.css | 537 +++++++++--------- lms/templates/6002.html | 109 ++++ lms/templates/course.html | 7 +- lms/templates/main.html | 4 +- 7 files changed, 649 insertions(+), 568 deletions(-) diff --git a/lms/static/js/course_info.js b/lms/static/js/course_info.js index cbb96b911c..1aad48addc 100644 --- a/lms/static/js/course_info.js +++ b/lms/static/js/course_info.js @@ -2,10 +2,10 @@ $(document).ready(function () { $('ul.tabs li').click(function() { $('ul.tabs li').removeClass("enabled"); $(this).addClass("enabled"); - + var data_class = '.' + $(this).attr('data-class'); - + $('.tab').slideUp(); $(data_class + ':hidden').slideDown(); }) -}); \ No newline at end of file +}); diff --git a/lms/static/sass/_course_info.scss b/lms/static/sass/_course_info.scss index f4d6776991..70d470e1e2 100644 --- a/lms/static/sass/_course_info.scss +++ b/lms/static/sass/_course_info.scss @@ -1,301 +1,283 @@ -.grid-container { - display: none; - - > * { - float: left; - height: 20px; - } - - .grid { - background: #FFD3DC; - margin-right: flex-gutter(); - width: flex-grid(1); - - &:last-child { - margin-right: 0px; - }; - } - - .gutter { - background: #E3FFDA; - display:none; - width: $fg-gutter(); - } -} - -.container { - -} - .course-info { - h1, h2, h3, h4, h5, h6 { - font-family: $sans-serif; - font-weight: bold; + .container { + margin-bottom: 60px; } - - font-size: 16px; - - > * { - @include box-sizing(border-box); - margin-top: 20px; - } - - a { - font-family: $serif; - font-size: 16px; - } - - section { - } - - h2 { - font-size: 2em; - } - - h3 { - font-size: 1.4em; - } - - p { -// color: rgb(102,102,102); - } - - header { + + header.course-profile { background: rgb(240,240,240); - border: 1px solid rgb(200,200,200); - @include border-radius(4px); - @include box-shadow(inset 0 0 1px 1px rgb(255,255,255)); - padding: 20px; - padding-left: flex-grid(1) + flex-gutter() * 2; - padding-right: flex-grid(4) + flex-gutter(); - position: relative; - width: flex-grid(12); - - > img { - float: left; - max-height: 86px; - max-width: flex-grid(1) + flex-gutter(); - @include position(absolute, 10px 0 0 10px); - vertical-align: middle; - } - - h2 { - margin-bottom: .5em; - - .course-number { - color: $lighter-base-font-color; - } - } - - h3 { - } - - .course-abstract { - display: none; - } - - .button { - @include button(simple, $blue); - @include box-sizing(border-box); - @include border-bottom-left-radius(0px); - @include border-top-left-radius(0px); - display: block; - font-size: 1.6em; - left: flex-grid(8) + flex-gutter(); - padding-top: 1.5em; - @include position(absolute, -1px -1px -1px 0); - text-align: center; - vertical-align: middle; - } - } // header - - .sidebar { - background: white; - float: right; - margin: 93px 0 0 flex-gutter(); - padding: 0 0 20px flex-gutter(); - padding-bottom: 20px; - position: relative; - width: flex-grid(4); - - .faded-vertical-divider { - @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%, rgba(200,200,200, 0.6) 10%, rgb(200,200,200) 50%, rgba(200,200,200, 0.6) 90%, rgba(255,255,255, 0))); - @include position(absolute, 0px 0 0px 0px); - } - - h3 { - color: #999; - font-size: 1em; - margin-bottom: .5em; - } - - .course-staff { - clear: none; + @include background-image(linear-gradient(-90deg, rgb(230,230,230), rgb(245,245,245))); + @include box-shadow(0 1px 80px 0 rgba(0,0,0, 0.5)); + border-bottom: 1px solid rgb(200,200,200); + @include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.1)); + overflow: hidden; + width: 100%; + + .intro-inner-wrapper { + @include clearfix; + margin: 0 auto; + max-width: 1200px; + padding: 40px 0px 40px; position: relative; - - .teacher { - margin-bottom: 1em; - - .teacher-image { - // display: none; - float: left; - margin: 0 10px 5px 0; - - img { - } - } - - .teacher-name { - color: rgb(100,100,100); - font-size: 1.5em; - font-weight: bold; - line-height: 1.3em; - } - } - } // .course-staff - } - - .main-content-wrap { - float: right; - margin-top: 40px; - padding-bottom: 20px; - width: flex-grid(8); - - .video { - iframe { - border: 10px solid rgb(106,106,106); - @include border-radius(10px); + width: flex-grid(12); + + &::before { + @include background-image(radial-gradient(50% 50%, ellipse closest-side, rgba(#fff, 1), rgba(#fff, 0))); + content: ""; display: block; - margin: 0 auto 20px; + height: 200%; + left: 0px; + position: absolute; + top: 80px; + width: flex-grid(8); + z-index: 1; + } + + .intro { + @include clearfix; + float: left; + margin-right: flex-gutter(); + position: relative; + width: flex-grid(8); + z-index: 2; + + > hgroup { + //@include inline-block; + //padding: 0 30px; + position: relative; + + hr { + @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%, + rgba(200,200,200, 1) 50%, + rgba(200,200,200, 1))); + border: none; + height: 1px; + margin: 10px 0; + position: relative; + + &::after { + @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%, + rgba(255,255,255, 0.6) 50%, + rgba(255,255,255, 0.6))); + bottom: -1px; + content: ""; + display: block; + height: 1px; + position: absolute; + width: 100%; + } + } + + h1 { + font: bold 2.8rem/3.2rem $sans-serif; + margin-bottom: 0px; + text-shadow: 0 1px rgba(255,255,255, 0.6); + //text-align: center; + + span { + color: $lighter-base-font-color; + display: none; + font: 300 1.2rem/3rem $sans-serif; + } + } + + h2 { + //text-align: center; + + a { + color: $lighter-base-font-color; + font: italic bold 1.4rem/1.6rem $sans-serif; + text-shadow: 0 1px rgba(255,255,255, 0.6); + + &:hover { + color: $blue; + } + } + } + } + } + + .actions { + float: left; + padding-top: 5px; + position: relative; + width: flex-grid(4); + z-index: 2; + + a.register { + @include button(shiny, $blue); + @include box-sizing(border-box); + @include border-radius(3px); + display: block; + font: italic 1.2rem/1.6rem $serif; + margin-bottom: 10px; + padding: 10px 0px; + text-transform: uppercase; + text-align: center; + width: flex-grid(12); + } + + .social-sharing { + background: rgb(230,230,230); + height: 40px; + } } } - - .course-description { + } + + .container { + @include clearfix; + + nav { + border-bottom: 1px solid rgb(220,220,220); @include box-sizing(border-box); + @include clearfix; margin-bottom: 40px; - position: relative; - - h3 { - font-size: 2em; - font-weight: bold; - margin-bottom: 1em; - } - - .course-times { - background: #F0F0F0; - @include border-radius(4px); - color: #7A7A7A; - font-size: .8em; - padding: .3em 1em; - @include position(absolute, 0px 0px 0 0); - text-shadow: -1px -1px 0px #e9e9e9; - - .start, .length, .final { - float: left; - margin-right: 1em; - - strong { - display: block; - } - } - - .start { - - } - - .length { - - } - - .final { - margin: 0; - } - } // .course-times - } - - ul.tabs { - list-style-type: none; - font-size: 0; - padding: 0; - margin-top: 40px; - - li { - background: #eee; - @include border-radius(2px); - display: inline-block; - color: #444; - font-size: 16px; - font-weight: bold; - margin-right: 10px; - padding: .3em 1em; - - &.enabled { - color: #fff; - @include linear-gradient($blue, darken($blue, 5%)); - } - - &:hover { - cursor: pointer; - background: #ddd; - - &.enabled { - @include linear-gradient(darken($blue, 5%), darken($blue, 10%)); - color: #fff; - } - } - } - } - - .tabs-content { - - section.tab { + //text-align: center; + width: flex-grid(12); + + &::after { + @extend .faded-hr-divider; + content: ""; display: none; - margin-top: 0; - padding-top: 30px; - - h3 { - margin-bottom: .5em; - font-size: 1.5em; - font-weight: bold; - } } - - section { - margin-top: 30px; - color: #666; + + a { + color: $lighter-base-font-color; + @include inline-block; + font: normal 1.2rem/1.6rem $sans-serif; + padding: 30px 20px; + text-align: center; + + &:hover, &.active { + background: rgb(240,240,240); + color: $base-font-color; + } } } - - .syllabus { - - ul { - list-style: none outside; - line-height: 1.5em; - - li { + + h2 { + color: $lighter-base-font-color; + margin-bottom: 20px; + text-transform: uppercase; + } + + h3 { + color: $base-font-color; + font-weight: 300; + font-family: $sans-serif; + margin-bottom: 10px; + } + } + + .details { + float: left; + margin-right: flex-gutter(); + width: flex-grid(8); + + .inner-wrapper { + //padding: 0 60px; + + > section { + + &::after { + @extend .faded-hr-divider; + content: ""; + display: none; + margin-top: 60px; + } + margin-bottom: 60px; + + + p + h2 { + margin-top: 40px; } } - } //.syllabus - - .faq { - ul { - list-style: none outside; - - li { - margin-bottom: 1em; - - p { - margin-left: 2em; + } + + .course-staff { + .teacher { + margin-bottom: 30px; + + &::after { + @extend .faded-hr-divider; + content: ""; + display: block; + margin-top: 30px; + } + + &:last-child { + &::after { + display: none; + } + } + + .teacher-image { + background: rgb(255,255,255); + border: 1px solid rgb(200,200,200); + float: left; + margin: 0 15px 15px 0; + padding: 1px; + } + } + } + } + + .course-sidebar { + @include box-sizing(border-box); + float: left; + padding-top: 40px; + width: flex-grid(4); + + h3 { + color: $lighter-base-font-color; + font-family: $serif; + font-weight: 300; + margin-bottom: 15px; + text-transform: uppercase; + } + + > section { + border: 1px solid rgb(220,220,220); + @include border-radius(4px); + background: rgb(245,245,245); + margin-bottom: 20px; + padding: 15px; + + &.dates { + p { + border-bottom: 1px solid rgb(220,220,220); + margin-bottom: 15px; + margin-top: 0px; + padding-bottom: 5px; + + &:last-child { + border: none; + margin: 0; + padding: 0; + } + + > span { + margin-left: 20px; } } } - } // .faq - - .more-info { - - p { - margin-left: 2em; + } + + .media { + border: 1px solid rgb(200,200,200); + @include box-sizing(border-box); + margin-bottom: 20px; + padding: 1px; + width: flex-grid(12); + + .hero { + height: 180px; + overflow: hidden; + + img { + min-width: 100%; + } } } - } //.main-info-wrap -} \ No newline at end of file + } +} diff --git a/lms/static/sass/_shared_list_of_courses.scss b/lms/static/sass/_shared_list_of_courses.scss index e040f18c3b..fd1ad26edb 100644 --- a/lms/static/sass/_shared_list_of_courses.scss +++ b/lms/static/sass/_shared_list_of_courses.scss @@ -57,16 +57,6 @@ text-overflow: ellipsis; white-space: nowrap; } - - p { - color: $base-font-color; - display: none; - font: normal 1rem/1.6rem $sans-serif; - overflow: hidden; - text-shadow: 0 1px rgba(255,255,255, 0.6); - text-overflow: ellipsis; - white-space: nowrap; - } } .info-link { diff --git a/lms/static/sass/application.css b/lms/static/sass/application.css index 45022b82e7..c931ca5b67 100755 --- a/lms/static/sass/application.css +++ b/lms/static/sass/application.css @@ -362,7 +362,7 @@ a:link, a:visited { .container:after { clear: both; } -.faded-hr-divider, .horizontal-divider, .modal .inner-wrapper header hr::after, .modal .inner-wrapper form .honor-code-summary hr::after { +.faded-hr-divider, .horizontal-divider, .modal .inner-wrapper header hr::after, .modal .inner-wrapper form .honor-code-summary hr::after, .course-info .container nav::after, .course-info .details .inner-wrapper > section::after, .course-info .details .course-staff .teacher::after { background-image: -webkit-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0)); background-image: -moz-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0)); background-image: -ms-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, rgba(200, 200, 200, 0)); @@ -1785,14 +1785,6 @@ header.app { text-shadow: 0 1px rgba(255, 255, 255, 0.6); text-overflow: ellipsis; white-space: nowrap; } - .highlighted-courses .courses .course header.course-preview > a hgroup p, .find-courses .courses .course header.course-preview > a hgroup p { - color: #3c3c3c; - display: none; - font: normal 1rem/1.6rem "Open Sans", Verdana, Geneva, sans-serif; - overflow: hidden; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); - text-overflow: ellipsis; - white-space: nowrap; } .highlighted-courses .courses .course header.course-preview > a .info-link, .find-courses .courses .course header.course-preview > a .info-link { border-left: 1px solid rgba(150, 150, 150, 0.5); -webkit-box-sizing: border-box; @@ -3394,276 +3386,283 @@ nav.course-material { text-align: center; z-index: 2; } -.grid-container { - display: none; } - .grid-container > * { - float: left; - height: 20px; } - .grid-container .grid { - background: #FFD3DC; - margin-right: 2.024%; - width: 6.478%; } - .grid-container .grid:last-child { - margin-right: 0px; } - .grid-container .gutter { - background: #E3FFDA; - display: none; - width: 25px; } - -.course-info { - font-size: 16px; } - .course-info h1, .course-info h2, .course-info h3, .course-info h4, .course-info h5, .course-info h6 { - font-family: "Open Sans", Verdana, Geneva, sans-serif; - font-weight: bold; } - .course-info > * { +.course-info .container { + margin-bottom: 60px; } +.course-info header.course-profile { + background: #f0f0f0; + background-image: -webkit-linear-gradient(-90deg, #e6e6e6, #f5f5f5); + background-image: -moz-linear-gradient(-90deg, #e6e6e6, #f5f5f5); + background-image: -ms-linear-gradient(-90deg, #e6e6e6, #f5f5f5); + background-image: -o-linear-gradient(-90deg, #e6e6e6, #f5f5f5); + background-image: linear-gradient(-90deg, #e6e6e6, #f5f5f5); + -webkit-box-shadow: 0 1px 80px 0 rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0 1px 80px 0 rgba(0, 0, 0, 0.5); + box-shadow: 0 1px 80px 0 rgba(0, 0, 0, 0.5); + border-bottom: 1px solid #c8c8c8; + -webkit-box-shadow: inset 0 1px 5px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 5px 0 rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 5px 0 rgba(0, 0, 0, 0.1); + overflow: hidden; + width: 100%; } + .course-info header.course-profile .intro-inner-wrapper { + zoom: 1; + margin: 0 auto; + max-width: 1200px; + padding: 40px 0px 40px; + position: relative; + width: 100%; } + .course-info header.course-profile .intro-inner-wrapper:before, .course-info header.course-profile .intro-inner-wrapper:after { + content: ""; + display: table; } + .course-info header.course-profile .intro-inner-wrapper:after { + clear: both; } + .course-info header.course-profile .intro-inner-wrapper::before { + background-image: -webkit-radial-gradient(50% 50%, ellipse closest-side, white, rgba(255, 255, 255, 0)); + background-image: -moz-radial-gradient(50% 50%, ellipse closest-side, white, rgba(255, 255, 255, 0)); + background-image: -ms-radial-gradient(50% 50%, ellipse closest-side, white, rgba(255, 255, 255, 0)); + background-image: -o-radial-gradient(50% 50%, ellipse closest-side, white, rgba(255, 255, 255, 0)); + background-image: radial-gradient(50% 50%, ellipse closest-side, white, rgba(255, 255, 255, 0)); + content: ""; + display: block; + height: 200%; + left: 0px; + position: absolute; + top: 80px; + width: 65.992%; + z-index: 1; } + .course-info header.course-profile .intro-inner-wrapper .intro { + zoom: 1; + float: left; + margin-right: 2.024%; + position: relative; + width: 65.992%; + z-index: 2; } + .course-info header.course-profile .intro-inner-wrapper .intro:before, .course-info header.course-profile .intro-inner-wrapper .intro:after { + content: ""; + display: table; } + .course-info header.course-profile .intro-inner-wrapper .intro:after { + clear: both; } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup { + position: relative; } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup hr { + background-image: -webkit-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, #c8c8c8); + background-image: -moz-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, #c8c8c8); + background-image: -ms-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, #c8c8c8); + background-image: -o-linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, #c8c8c8); + background-image: linear-gradient(180deg, rgba(200, 200, 200, 0) 0%, #c8c8c8 50%, #c8c8c8); + border: none; + height: 1px; + margin: 10px 0; + position: relative; } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup hr::after { + background-image: -webkit-linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 50%, rgba(255, 255, 255, 0.6)); + background-image: -moz-linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 50%, rgba(255, 255, 255, 0.6)); + background-image: -ms-linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 50%, rgba(255, 255, 255, 0.6)); + background-image: -o-linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 50%, rgba(255, 255, 255, 0.6)); + background-image: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 50%, rgba(255, 255, 255, 0.6)); + bottom: -1px; + content: ""; + display: block; + height: 1px; + position: absolute; + width: 100%; } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup h1 { + font: bold 2.8rem/3.2rem "Open Sans", Verdana, Geneva, sans-serif; + margin-bottom: 0px; + text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup h1 span { + color: #a0a0a0; + display: none; + font: 300 1.2rem/3rem "Open Sans", Verdana, Geneva, sans-serif; } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup h2 a { + color: #a0a0a0; + font: italic bold 1.4rem/1.6rem "Open Sans", Verdana, Geneva, sans-serif; + text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + .course-info header.course-profile .intro-inner-wrapper .intro > hgroup h2 a:hover { + color: #1d9dd9; } + .course-info header.course-profile .intro-inner-wrapper .actions { + float: left; + padding-top: 5px; + position: relative; + width: 31.984%; + z-index: 2; } + .course-info header.course-profile .intro-inner-wrapper .actions a.register { + border: 1px solid #002e88; + border-bottom: 1px solid #001e5f; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 0 0 #42bae5; + -moz-box-shadow: inset 0 1px 0 0 #42bae5; + box-shadow: inset 0 1px 0 0 #42bae5; + color: white; + display: inline; + font-size: 14px; + font-weight: bold; + background-color: #1d9dd9; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1d9dd9), color-stop(50%, #006bb8), color-stop(50%, #0052a9), color-stop(100%, #0057ab)); + background-image: -webkit-linear-gradient(top, #1d9dd9 0%, #006bb8 50%, #0052a9 50%, #0057ab 100%); + background-image: -moz-linear-gradient(top, #1d9dd9 0%, #006bb8 50%, #0052a9 50%, #0057ab 100%); + background-image: -ms-linear-gradient(top, #1d9dd9 0%, #006bb8 50%, #0052a9 50%, #0057ab 100%); + background-image: -o-linear-gradient(top, #1d9dd9 0%, #006bb8 50%, #0052a9 50%, #0057ab 100%); + background-image: linear-gradient(top, #1d9dd9 0%, #006bb8 50%, #0052a9 50%, #0057ab 100%); + padding: 7px 20px 8px; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 1px #001067; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + display: block; + font: italic 1.2rem/1.6rem Georgia, Cambria, "Times New Roman", Times, serif; + margin-bottom: 10px; + padding: 10px 0px; + text-transform: uppercase; + text-align: center; + width: 100%; } + .course-info header.course-profile .intro-inner-wrapper .actions a.register:hover { + cursor: pointer; + background-color: #108ec7; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #108ec7), color-stop(50%, #005fa6), color-stop(50%, #004897), color-stop(100%, #004d9a)); + background-image: -webkit-linear-gradient(top, #108ec7 0%, #005fa6 50%, #004897 50%, #004d9a 100%); + background-image: -moz-linear-gradient(top, #108ec7 0%, #005fa6 50%, #004897 50%, #004d9a 100%); + background-image: -ms-linear-gradient(top, #108ec7 0%, #005fa6 50%, #004897 50%, #004d9a 100%); + background-image: -o-linear-gradient(top, #108ec7 0%, #005fa6 50%, #004897 50%, #004d9a 100%); + background-image: linear-gradient(top, #108ec7 0%, #005fa6 50%, #004897 50%, #004d9a 100%); } + .course-info header.course-profile .intro-inner-wrapper .actions a.register:active { + -webkit-box-shadow: inset 0 0 20px 0 #00295f, 0 1px 0 white; + -moz-box-shadow: inset 0 0 20px 0 #00295f, 0 1px 0 white; + box-shadow: inset 0 0 20px 0 #00295f, 0 1px 0 white; } + .course-info header.course-profile .intro-inner-wrapper .actions .social-sharing { + background: #e6e6e6; + height: 40px; } +.course-info .container { + zoom: 1; } + .course-info .container:before, .course-info .container:after { + content: ""; + display: table; } + .course-info .container:after { + clear: both; } + .course-info .container nav { + border-bottom: 1px solid #dcdcdc; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - margin-top: 20px; } - .course-info a { + zoom: 1; + margin-bottom: 40px; + width: 100%; } + .course-info .container nav:before, .course-info .container nav:after { + content: ""; + display: table; } + .course-info .container nav:after { + clear: both; } + .course-info .container nav::after { + content: ""; + display: none; } + .course-info .container nav a { + color: #a0a0a0; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + font: normal 1.2rem/1.6rem "Open Sans", Verdana, Geneva, sans-serif; + padding: 30px 20px; + text-align: center; } + .course-info .container nav a:hover, .course-info .container nav a.active, .course-info .container nav.sequence-nav ol li a.seq_video_active, .course-info .container nav.sequence-nav ol li a.seq_other_active, .course-info .container nav.sequence-nav ol li a.seq_vertical_active, .course-info .container nav.sequence-nav ol li a.seq_problem_active { + background: #f0f0f0; + color: #3c3c3c; } + .course-info .container h2 { + color: #a0a0a0; + margin-bottom: 20px; + text-transform: uppercase; } + .course-info .container h3 { + color: #3c3c3c; + font-weight: 300; + font-family: "Open Sans", Verdana, Geneva, sans-serif; + margin-bottom: 10px; } +.course-info .details { + float: left; + margin-right: 2.024%; + width: 65.992%; } + .course-info .details .inner-wrapper > section { + margin-bottom: 60px; } + .course-info .details .inner-wrapper > section::after { + content: ""; + display: none; + margin-top: 60px; } + .course-info .details .inner-wrapper > section p + h2 { + margin-top: 40px; } + .course-info .details .course-staff .teacher { + margin-bottom: 30px; } + .course-info .details .course-staff .teacher::after { + content: ""; + display: block; + margin-top: 30px; } + .course-info .details .course-staff .teacher:last-child::after { + display: none; } + .course-info .details .course-staff .teacher .teacher-image { + background: white; + border: 1px solid #c8c8c8; + float: left; + margin: 0 15px 15px 0; + padding: 1px; } +.course-info .course-sidebar { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + float: left; + padding-top: 40px; + width: 31.984%; } + .course-info .course-sidebar h3 { + color: #a0a0a0; font-family: Georgia, Cambria, "Times New Roman", Times, serif; - font-size: 16px; } - .course-info h2 { - font-size: 2em; } - .course-info h3 { - font-size: 1.4em; } - .course-info header { - background: #f0f0f0; - border: 1px solid #c8c8c8; + font-weight: 300; + margin-bottom: 15px; + text-transform: uppercase; } + .course-info .course-sidebar > section { + border: 1px solid #dcdcdc; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 0 1px 1px white; - -moz-box-shadow: inset 0 0 1px 1px white; - box-shadow: inset 0 0 1px 1px white; - padding: 20px; - padding-left: 10.526%; - padding-right: 34.008%; - position: relative; + background: #f5f5f5; + margin-bottom: 20px; + padding: 15px; } + .course-info .course-sidebar > section.dates p { + border-bottom: 1px solid #dcdcdc; + margin-bottom: 15px; + margin-top: 0px; + padding-bottom: 5px; } + .course-info .course-sidebar > section.dates p:last-child { + border: none; + margin: 0; + padding: 0; } + .course-info .course-sidebar > section.dates p > span { + margin-left: 20px; } + .course-info .course-sidebar .media { + border: 1px solid #c8c8c8; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin-bottom: 20px; + padding: 1px; width: 100%; } - .course-info header > img { - float: left; - max-height: 86px; - max-width: 8.502%; - position: absolute; - top: 10px; - left: 10px; - vertical-align: middle; } - .course-info header h2 { - margin-bottom: .5em; } - .course-info header h2 .course-number { - color: #a0a0a0; } - .course-info header .course-abstract { - display: none; } - .course-info header .button { - border: 1px solid #0d72a2; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 0 #61b8e1; - -moz-box-shadow: inset 0 1px 0 0 #61b8e1; - box-shadow: inset 0 1px 0 0 #61b8e1; - color: white; - display: inline; - font-size: 11px; - font-weight: bold; - background-color: #1d9dd9; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1d9dd9), color-stop(100%, #0e7cb0)); - background-image: -webkit-linear-gradient(top, #1d9dd9, #0e7cb0); - background-image: -moz-linear-gradient(top, #1d9dd9, #0e7cb0); - background-image: -ms-linear-gradient(top, #1d9dd9, #0e7cb0); - background-image: -o-linear-gradient(top, #1d9dd9, #0e7cb0); - background-image: linear-gradient(top, #1d9dd9, #0e7cb0); - padding: 6px 18px 7px; - text-shadow: 0 1px 0 #076794; - -webkit-background-clip: padding-box; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-border-bottom-left-radius: 0px; - -moz-border-bottom-left-radius: 0px; - -moz-border-radius-bottomleft: 0px; - -ms-border-bottom-left-radius: 0px; - -o-border-bottom-left-radius: 0px; - border-bottom-left-radius: 0px; - -webkit-border-top-left-radius: 0px; - -moz-border-top-left-radius: 0px; - -moz-border-radius-topleft: 0px; - -ms-border-top-left-radius: 0px; - -o-border-top-left-radius: 0px; - border-top-left-radius: 0px; - display: block; - font-size: 1.6em; - left: 68.016%; - padding-top: 1.5em; - position: absolute; - top: -1px; - right: -1px; - bottom: -1px; - text-align: center; - vertical-align: middle; } - .course-info header .button:hover { - -webkit-box-shadow: inset 0 1px 0 0 #35a6db; - -moz-box-shadow: inset 0 1px 0 0 #35a6db; - box-shadow: inset 0 1px 0 0 #35a6db; - cursor: pointer; - background-color: #1e8bbe; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1e8bbe), color-stop(100%, #0e72a1)); - background-image: -webkit-linear-gradient(top, #1e8bbe, #0e72a1); - background-image: -moz-linear-gradient(top, #1e8bbe, #0e72a1); - background-image: -ms-linear-gradient(top, #1e8bbe, #0e72a1); - background-image: -o-linear-gradient(top, #1e8bbe, #0e72a1); - background-image: linear-gradient(top, #1e8bbe, #0e72a1); } - .course-info header .button:active { - border: 1px solid #0d72a2; - -webkit-box-shadow: inset 0 0 8px 4px #0d6892, inset 0 0 8px 4px #0d6892, 0 1px 1px 0 #eeeeee; - -moz-box-shadow: inset 0 0 8px 4px #0d6892, inset 0 0 8px 4px #0d6892, 0 1px 1px 0 #eeeeee; - box-shadow: inset 0 0 8px 4px #0d6892, inset 0 0 8px 4px #0d6892, 0 1px 1px 0 #eeeeee; } - .course-info .sidebar, .course-info section.course-index { - background: white; - float: right; - margin: 93px 0 0 2.024%; - padding: 0 0 20px 2.024%; - padding-bottom: 20px; - position: relative; - width: 31.984%; } - .course-info .sidebar .faded-vertical-divider, .course-info section.course-index .faded-vertical-divider, .course-info .sidebar .vertical-divider, .course-info section.course-index .vertical-divider, .course-info .sidebar header.app .divider, header.app .course-info .sidebar .divider, .course-info section.course-index header.app .divider, header.app .course-info section.course-index .divider, .course-info .sidebar footer nav .copyright a.logo::after, footer nav .copyright .course-info .sidebar a.logo::after, .course-info section.course-index footer nav .copyright a.logo::after, footer nav .copyright .course-info section.course-index a.logo::after, .course-info .sidebar footer nav ol li::after, footer nav ol .course-info .sidebar li::after, .course-info section.course-index footer nav ol li::after, footer nav ol .course-info section.course-index li::after, .course-info .sidebar .home .university-partners .partners li.partner::before, .home .university-partners .partners .course-info .sidebar li.partner::before, .course-info section.course-index .home .university-partners .partners li.partner::before, .home .university-partners .partners .course-info section.course-index li.partner::before { - background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(200, 200, 200, 0.6) 10%, #c8c8c8 50%, rgba(200, 200, 200, 0.6) 90%, rgba(255, 255, 255, 0)); - background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(200, 200, 200, 0.6) 10%, #c8c8c8 50%, rgba(200, 200, 200, 0.6) 90%, rgba(255, 255, 255, 0)); - background-image: -ms-linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(200, 200, 200, 0.6) 10%, #c8c8c8 50%, rgba(200, 200, 200, 0.6) 90%, rgba(255, 255, 255, 0)); - background-image: -o-linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(200, 200, 200, 0.6) 10%, #c8c8c8 50%, rgba(200, 200, 200, 0.6) 90%, rgba(255, 255, 255, 0)); - background-image: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(200, 200, 200, 0.6) 10%, #c8c8c8 50%, rgba(200, 200, 200, 0.6) 90%, rgba(255, 255, 255, 0)); - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; } - .course-info .sidebar h3, .course-info section.course-index h3 { - color: #999; - font-size: 1em; - margin-bottom: .5em; } - .course-info .sidebar .course-staff, .course-info section.course-index .course-staff { - clear: none; - position: relative; } - .course-info .sidebar .course-staff .teacher, .course-info section.course-index .course-staff .teacher { - margin-bottom: 1em; } - .course-info .sidebar .course-staff .teacher .teacher-image, .course-info section.course-index .course-staff .teacher .teacher-image { - float: left; - margin: 0 10px 5px 0; } - .course-info .sidebar .course-staff .teacher .teacher-name, .course-info section.course-index .course-staff .teacher .teacher-name { - color: #646464; - font-size: 1.5em; - font-weight: bold; - line-height: 1.3em; } - .course-info .main-content-wrap { - float: right; - margin-top: 40px; - padding-bottom: 20px; - width: 65.992%; } - .course-info .main-content-wrap .video iframe { - border: 10px solid #6a6a6a; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - -ms-border-radius: 10px; - -o-border-radius: 10px; - border-radius: 10px; - display: block; - margin: 0 auto 20px; } - .course-info .main-content-wrap .course-description { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - margin-bottom: 40px; - position: relative; } - .course-info .main-content-wrap .course-description h3 { - font-size: 2em; - font-weight: bold; - margin-bottom: 1em; } - .course-info .main-content-wrap .course-description .course-times { - background: #F0F0F0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - -ms-border-radius: 4px; - -o-border-radius: 4px; - border-radius: 4px; - color: #7A7A7A; - font-size: .8em; - padding: .3em 1em; - position: absolute; - top: 0px; - right: 0px; - text-shadow: -1px -1px 0px #e9e9e9; } - .course-info .main-content-wrap .course-description .course-times .start, .course-info .main-content-wrap .course-description .course-times .length, .course-info .main-content-wrap .course-description .course-times .final { - float: left; - margin-right: 1em; } - .course-info .main-content-wrap .course-description .course-times .start strong, .course-info .main-content-wrap .course-description .course-times .length strong, .course-info .main-content-wrap .course-description .course-times .final strong { - display: block; } - .course-info .main-content-wrap .course-description .course-times .final { - margin: 0; } - .course-info .main-content-wrap ul.tabs { - list-style-type: none; - font-size: 0; - padding: 0; - margin-top: 40px; } - .course-info .main-content-wrap ul.tabs li { - background: #eee; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - -ms-border-radius: 2px; - -o-border-radius: 2px; - border-radius: 2px; - display: inline-block; - color: #444; - font-size: 16px; - font-weight: bold; - margin-right: 10px; - padding: .3em 1em; } - .course-info .main-content-wrap ul.tabs li.enabled { - color: #fff; - background-color: #1d9dd9; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1d9dd9), color-stop(100%, #1a8dc3)); - background-image: -webkit-linear-gradient(top, #1d9dd9, #1a8dc3); - background-image: -moz-linear-gradient(top, #1d9dd9, #1a8dc3); - background-image: -ms-linear-gradient(top, #1d9dd9, #1a8dc3); - background-image: -o-linear-gradient(top, #1d9dd9, #1a8dc3); - background-image: linear-gradient(top, #1d9dd9, #1a8dc3); } - .course-info .main-content-wrap ul.tabs li:hover { - cursor: pointer; - background: #ddd; } - .course-info .main-content-wrap ul.tabs li:hover.enabled { - background-color: #1a8dc3; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1a8dc3), color-stop(100%, #177cac)); - background-image: -webkit-linear-gradient(top, #1a8dc3, #177cac); - background-image: -moz-linear-gradient(top, #1a8dc3, #177cac); - background-image: -ms-linear-gradient(top, #1a8dc3, #177cac); - background-image: -o-linear-gradient(top, #1a8dc3, #177cac); - background-image: linear-gradient(top, #1a8dc3, #177cac); - color: #fff; } - .course-info .main-content-wrap .tabs-content section.tab { - display: none; - margin-top: 0; - padding-top: 30px; } - .course-info .main-content-wrap .tabs-content section.tab h3 { - margin-bottom: .5em; - font-size: 1.5em; - font-weight: bold; } - .course-info .main-content-wrap .tabs-content section { - margin-top: 30px; - color: #666; } - .course-info .main-content-wrap .syllabus ul { - list-style: none outside; - line-height: 1.5em; } - .course-info .main-content-wrap .faq ul { - list-style: none outside; } - .course-info .main-content-wrap .faq ul li { - margin-bottom: 1em; } - .course-info .main-content-wrap .faq ul li p { - margin-left: 2em; } - .course-info .main-content-wrap .more-info p { - margin-left: 2em; } + .course-info .course-sidebar .media .hero { + height: 180px; + overflow: hidden; } + .course-info .course-sidebar .media .hero img { + min-width: 100%; } html { height: 100%; diff --git a/lms/templates/6002.html b/lms/templates/6002.html index f34f5cdbea..e5d7537ccf 100644 --- a/lms/templates/6002.html +++ b/lms/templates/6002.html @@ -1,6 +1,7 @@ <%inherit file="main.html" /> <%include file="guest_navigation.html" args="active_page='info'" /> +<<<<<<< HEAD <%namespace name='static' file='static_content.html'/>
@@ -112,6 +113,85 @@

Frequently Asked Questions

+======= +
+
+
+
+
+

18th Century History (HC137)

+
+

HarvardX

+
+
+
+ Register + +
+
+
+ +
+
+ + +
+
+

About this course

+

This course explores the history of the modern world since Chinggis Khan. It focuses on the connections between societies from the time of the Mongol conquests and the gradual, but accelerating ways in which connections became ties of inter-dependence. The relations between societies are what will concern us. The forces pulling the world together vary from religious to economic, political to intellectual. These forces bring the world together, but they also create new divisions. Nowadays, we call this "globalization." That term has tended to emphasize the drive to worldwide integration; the view of globalization taken in this course emphasizes disintegration as well as integration. We will tackle some very basic questions: How do we explain the staggering wealth of China in the centuries up to 1750, as well as China's recent ascent? Where did the United States come from, and where is it headed? What are the significance and legacies of empire in the world? How have world wars and revolutions shaped the international system over time? What exactly is globalization, and how does today's globalization compare with the past? How has the relationship between humans and nature changed over the centuries?

+ +

Requirements

+

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 current versions of Mozilla Firefox as well. The video player is designed to work with Flash. While we provide a partial 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.

+
+ +
+

Course staff

+
+
+ +
+

Anant Agarwal

+

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

+

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

+

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.

+
+
+ +
+

Syllabus

+
+ +
+

Textbook

+

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.

+
+ +
+

Frequently Asked Questions

+>>>>>>> cleans up course info/profile page
  • What is the format of the class?

    The course will consist of 24 lectures, each lasting 50 minutes. There will be regular assignments consisting of map tests and short essays.

    @@ -127,6 +207,7 @@
+<<<<<<< HEAD
@@ -224,5 +305,33 @@

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.

+======= +
+
+ +
+
+
+ +
+
+ +
+

Important Dates

+

Class Starts: 7/12/12

+

Final Exam: 12/09/12

+

Total Length: 15 weeks

+
+ +
+

Course Sumamry

+

This course will examine the ways in which the world has grown more integrated yet more divided over the past 300 years.

+
+ +
+

Course Number HC137

+
+
+>>>>>>> cleans up course info/profile page
diff --git a/lms/templates/course.html b/lms/templates/course.html index 54228bc18e..91e4dced27 100644 --- a/lms/templates/course.html +++ b/lms/templates/course.html @@ -4,20 +4,19 @@ %> %for course in courses: -
+

${course.title}

-

${course.institution}

-
➔
+
➔
-

HarvardX

+

${course.institution}

7/23/12 → 12/15/12

diff --git a/lms/templates/main.html b/lms/templates/main.html index d6b193a468..04a2e725db 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -67,7 +67,9 @@ <%include file="footer.html" /> <%block name="js_extra"/> - +