From 3cb33e6847903b354b3ff574502aea813ed9fd9a Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 16 Feb 2012 12:11:35 -0500 Subject: [PATCH 01/68] Added new print styles --HG-- branch : templates-kf-print --- sass/base/_extends.scss | 12 ++++++++++++ sass/layout/_footer.scss | 4 ++++ sass/layout/_header.scss | 4 ++++ sass/print.scss | 7 +------ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c482b947e6..75ba814575 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -53,6 +53,10 @@ h1.top-header { padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); + + @media print { + @include box-shadow(none); + } } .sidebar { @@ -68,6 +72,10 @@ h1.top-header { width: flex-grid(3); position: relative; + @media print { + display: none; + } + h3 { @include box-shadow(0 1px 0 #eee); background: none; @@ -124,6 +132,10 @@ h1.top-header { @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @extend .clearfix; + @media print { + display: none; + } + a { color: darken(#F6EFD4, 80%); diff --git a/sass/layout/_footer.scss b/sass/layout/_footer.scss index 97c28d5fd8..5edcb630b8 100644 --- a/sass/layout/_footer.scss +++ b/sass/layout/_footer.scss @@ -6,6 +6,10 @@ footer { margin-top: $body-line-height; padding: 0 $body-line-height; + @media print { + display: none; + } + p { float: left; diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss index 144194e397..f841bb6049 100644 --- a/sass/layout/_header.scss +++ b/sass/layout/_header.scss @@ -4,6 +4,10 @@ div.header-wrapper { background: $mit-red; border-bottom: 1px solid #fff; + @media print { + display: none; + } + header { @extend .clearfix; @extend .wrapper; diff --git a/sass/print.scss b/sass/print.scss index 12436ba683..8b13789179 100644 --- a/sass/print.scss +++ b/sass/print.scss @@ -1,6 +1 @@ -.header-wrapper {display:none;} -#accordion {display:none;} -.ui-accordion {display:none; -visibility:hidden; -width:0%; -} + From 2fb05da5c42fb5cb3fb1c4f7c63c974c4cd814e6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 16 Feb 2012 13:59:10 -0500 Subject: [PATCH 02/68] More edits to the print styles --HG-- branch : templates-kf-print --- main.html | 1 - sass/courseware/_courseware.scss | 16 ++++++++++++++++ sass/layout/_layout.scss | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/main.html b/main.html index 567f41b1db..2a3f2cca32 100644 --- a/main.html +++ b/main.html @@ -5,7 +5,6 @@ - diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 9d7ab8123a..2a54d0cd21 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -50,6 +50,12 @@ div.course-wrapper { width: auto; border-right: 0; } + + @media print { + display: block; + width: auto; + border-right: 0; + } } section.problem { @@ -63,6 +69,16 @@ div.course-wrapper { padding: 0; } + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + span { &.unanswered, &.ui-icon-bullet { @include inline-block(); diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index c0f52ad268..cc683e3c0a 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -17,6 +17,11 @@ html { background: #fff; border-bottom: 1px solid #bbb; + @media print { + border-bottom: 0; + @include border-radius(none); + } + @media screen and (min-width: 1400px) { // @include border-radius(3px); @include box-shadow(0 0 4px #dfdfdf); From cdaed49a2bca23c8902cf137433f29ef5097cd96 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 20 Feb 2012 20:59:02 -0500 Subject: [PATCH 03/68] Subtitle support working --HG-- branch : pmitros-subtitles --- seq_module.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/seq_module.js b/seq_module.js index 57b73543c6..9c52dacad2 100644 --- a/seq_module.js +++ b/seq_module.js @@ -2,27 +2,29 @@ var ${ id }contents=["", %for t in items: - ${t[1]['content']} , + ${t['content']} , %endfor "" ]; var ${ id }types=["", %for t in items: - "${t[1]['type']}" , + "${t['type']}" , %endfor "" ]; var ${ id }init_functions=["", %for t in items: - function(){ ${t[1]['init_js']} }, + function(){ ${t['init_js']} }, %endfor ""]; +var ${ id }titles=${titles}; + var ${ id }destroy_functions=["", %for t in items: - function(){ ${t[1]['destroy_js']} }, + function(){ ${t['destroy_js']} }, %endfor ""]; @@ -52,6 +54,7 @@ function ${ id }goto(i) { function ${ id }setup_click(i) { $('#tt_'+i).click(function(eo) { ${ id }goto(i);}); $('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive"); + $('#tt_'+i).attr("title", ${ id }titles[i-1]); } From ccc3c710b36bc1a9631ecf3de008bcf375cb8000 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Feb 2012 13:08:35 -0500 Subject: [PATCH 04/68] Added consistant sidebar headers and made textbook sidebar close --HG-- branch : kf-sidebar --- courseware.html | 22 ++------ main.html | 2 + sass/_textbook.scss | 88 ++++++++++++++++++++++---------- sass/base/_extends.scss | 41 +++++++++++++++ sass/courseware/_courseware.scss | 6 +-- sass/courseware/_sidebar.scss | 28 ---------- sass/discussion/_profile.scss | 12 +++-- sass/layout/_layout.scss | 8 +-- staticbook.html | 27 ++++++++-- 9 files changed, 145 insertions(+), 89 deletions(-) diff --git a/courseware.html b/courseware.html index b77806f3e1..cd6f08f387 100644 --- a/courseware.html +++ b/courseware.html @@ -1,37 +1,23 @@ <%inherit file="main.html" /> +<%block name="headextra"> + <%include file="navigation.html" args="active_page='courseware'" />
-
+

Courseware Index

close -
+
${accordion} diff --git a/main.html b/main.html index 4652fa7046..48424122af 100644 --- a/main.html +++ b/main.html @@ -117,5 +117,7 @@ $(function() { }); +<%block name="js_extra"/> + diff --git a/sass/_textbook.scss b/sass/_textbook.scss index ea49f20d96..7c7aef1562 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -1,43 +1,47 @@ div.book-wrapper { @extend .table-wrapper; - ul#booknav { + section.book-sidebar { @extend .sidebar; @include box-sizing(border-box); + @extend .tran; - a { - color: #000; + ul#booknav { - &:hover { - color: #666; - } - } - - li { - background: none; - padding-left: 30px; - - div.hitarea { - margin-left: -22px; - background-image: url('/static/images/treeview-default.gif'); - position: relative; - top: 4px; + a { + color: #000; &:hover { - opacity: 0.6; - filter: alpha(opacity=60); + color: #666; } } - ul { + li { background: none; - } - } + padding-left: 30px; - > li { - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - padding: 7px 7px 7px 30px; + div.hitarea { + margin-left: -22px; + background-image: url('/static/images/treeview-default.gif'); + position: relative; + top: 4px; + + &: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; + } } } @@ -92,4 +96,36 @@ div.book-wrapper { } } } + + &.closed { + section.book-sidebar { + width: flex-grid(.6); + + header#open_close_accordion { + padding: 0; + + a { + background-image: url('/static/images/slide-right-icon.png'); + } + + h2 { + visibility: hidden; + width: 10px; + padding: 0; + } + } + + ul#booknav { + visibility: hidden; + width: 10px; + padding: 0; + overflow: hidden; + height: 100px; + } + } + + section.course-content { + width: flex-grid(11.5) + flex-gutter(); + } + } } diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c482b947e6..48c92cbe9f 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -68,6 +68,13 @@ h1.top-header { width: flex-grid(3); position: relative; + h1, h2 { + font-size: 18px; + text-transform: none; + font-weight: 800; + letter-spacing: 0; + } + h3 { @include box-shadow(0 1px 0 #eee); background: none; @@ -110,11 +117,41 @@ h1.top-header { } } + header#open_close_accordion { + @include box-shadow(0 1px 0 #eee); + border-bottom: 1px solid #d3d3d3; + padding: lh(.5) lh(); + position: relative; + + h2 { + padding-right: 20px; + margin: 0; + } + + a { + width: 16px; + text-indent: -9999px; + height: 16px; + position: absolute; + padding: 8px; + top: 6px; + right: -1px; + border: 1px solid #D3D3D3; + background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; + @include border-radius(3px 0 0 3px); + + &:hover { + background-color: white; + } + } + } + a.button { text-decoration: none; } } + .topbar { background: #F6EFD4; border-bottom: 1px solid darken(#F6EFD4, 10%); @@ -146,3 +183,7 @@ h1.top-header { } } } + +.tran { + @include transition( all, .2s, $ease-in-out-quad); +} diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 9d7ab8123a..13d58a3870 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -5,10 +5,6 @@ div.course-wrapper { list-style: none; } - .tran { - @include transition( all, .2s, $ease-in-out-quad); - } - section.course-content { @extend .content; @@ -160,7 +156,7 @@ div.course-wrapper { section.course-index { width: flex-grid(.6); - div#open_close_accordion { + header#open_close_accordion { padding: 0; a { diff --git a/sass/courseware/_sidebar.scss b/sass/courseware/_sidebar.scss index 3f937433f2..98659f12e0 100644 --- a/sass/courseware/_sidebar.scss +++ b/sass/courseware/_sidebar.scss @@ -2,34 +2,6 @@ section.course-index { @extend .sidebar; @extend .tran; - div#open_close_accordion { - @include box-shadow(0 1px 0 #eee); - border-bottom: 1px solid #d3d3d3; - padding: 0 lh(); - position: relative; - - h2 { - padding-right: 20px; - } - - a { - width: 16px; - text-indent: -9999px; - height: 16px; - position: absolute; - padding: 8px; - top: -12px; - right: -1px; - border: 1px solid #D3D3D3; - background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; - @include border-radius(3px 0 0 3px); - - &:hover { - background-color: white; - } - } - } - div#accordion { h3 { diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 394107a57a..3ff1194bdd 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -3,15 +3,19 @@ body.user-profile-page { // @extend .sidebar; header { @extend .clearfix; + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: 0 lh(); + margin: 0 (-(lh())) lh(); + section { float: left; width: flex-grid(2, 3); margin-right: flex-gutter(3); - h1 { - @extend h2; - margin-top: 0; - } + h1 { + margin-top: 0; + } } p.karma { diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index 584e1e1fa2..d0240b951f 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -11,13 +11,13 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-sizing(border-box); - overflow: hidden; background: #fff; + border: 1px solid #bbb; border-bottom: 1px solid #bbb; + @include box-shadow(0 0 4px #dfdfdf); + @include box-sizing(border-box); margin-top: 3px; - @include box-shadow(0 0 4px #dfdfdf); - border: 1px solid #bbb; + overflow: hidden; @media screen and (min-width: 1400px) { @include border-radius(4px); diff --git a/staticbook.html b/staticbook.html index fe3116025c..dcde36559c 100644 --- a/staticbook.html +++ b/staticbook.html @@ -1,4 +1,6 @@ <%inherit file="main.html" /> + +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='book'" />
-
    - <%include file="book_toc.html" /> -
+ +
+
+

Table of Contents

+ close +
+ +
    + <%include file="book_toc.html" /> +
+
-
From 629509739eebf3466c1548237fe1fba2933cb477 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 22 Feb 2012 15:01:45 -0500 Subject: [PATCH 17/68] Styled the un-answered question sharing prompt --- sass/discussion/_answers.scss | 11 +++++++++++ sass/discussion/_question-view.scss | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 747ffc29ae..6ceead2514 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -74,11 +74,21 @@ div.answer-block { } } + div.accepted-answer { + p { + color:#000; + } + } + div.deleted { p { color: $mit-red; } } + + img.answer-img-accept { + opacity: 0.7; + } } div.paginator { @@ -141,3 +151,4 @@ div.answer-actions { } } + diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 3d878012ee..172415f326 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -138,7 +138,6 @@ div.question-header { } span.user-badges { - // display: block; } } } @@ -155,7 +154,7 @@ div.question-header { font-size: 13px; background: #efefef; - div.block { + .block { border-top: 1px solid #ddd; padding: 15px; display: block; @@ -283,7 +282,8 @@ div.question-header { div.controls { // padding: 15px 0; - background: #efefef ; + // background: #efefef ; + border-top: 1px dashed #ddd; text-align: right; a { display: inline-block; @@ -310,3 +310,12 @@ div.question-status { color: #eee; } } + +div.share-question { + padding: 10px 0 10px 7.5%; + + p { + padding: 0; + margin: 0; + } +} From 3081cc0189943d2109e5ddc877b18fc3be976bac Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 22 Feb 2012 15:01:56 -0500 Subject: [PATCH 18/68] Added styles and js to hide captions --HG-- branch : kf-captions --- courseware.html | 2 - sass/courseware/_video.scss | 348 ++++++++++++++++++++---------------- video.html | 103 +++++++---- 3 files changed, 259 insertions(+), 194 deletions(-) diff --git a/courseware.html b/courseware.html index 67e596545e..af3b721e2e 100644 --- a/courseware.html +++ b/courseware.html @@ -1,13 +1,11 @@ <%inherit file="main.html" /> -<%block name="js_extra"> - <%include file="navigation.html" args="active_page='courseware'" /> diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 264bcc953d..22e90916d5 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -1,185 +1,227 @@ section.course-content { + div.video-subtitles { + position: relative; - div.video-wrapper { - float: left; - width: flex-grid(6, 9); - margin-right: flex-gutter(9); + div.video-wrapper { + float: left; + width: flex-grid(6, 9); + margin-right: flex-gutter(9); - div.video-player { - position: relative; - padding-bottom: 56.25%; - padding-top: 30px; - height: 0; - overflow: hidden; + div.video-player { + position: relative; + padding-bottom: 56.25%; + padding-top: 30px; + height: 0; + overflow: hidden; - object { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; + object { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + + iframe#html5_player { + border: none; + display: none; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } } - iframe#html5_player { - border: none; - display: none; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - } - } + // ul { + // float: left; - // ul { - // float: left; + // li { + // margin-top: 5px; + // display: inline-block; + // cursor: pointer; + // border: 0; + // padding: 0; - // li { - // margin-top: 5px; - // display: inline-block; - // cursor: pointer; - // border: 0; - // padding: 0; + // div { + // &:empty { + // display: none; + // } + // } + // } + // } - // div { - // &:empty { - // display: none; - // } - // } - // } - // } - - section.video-controls { - @extend .clearfix; - background: #333; - border: 1px solid #000; - color: #ccc; - - div#slider { + section.video-controls { @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: 14px; + background: #333; + border: 1px solid #000; + color: #ccc; - a.ui-slider-handle { - @include border-radius(20px); - @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%)); - background: $mit-red url(/static/images/slider-handle.png) center center no-repeat; - border: 0; - border: 1px solid darken($mit-red, 20%); - cursor: pointer; - height: 20px; - margin-left: -10px; - top: -4px; - width: 20px; + 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: 14px; - &:focus { - outline: none; + a.ui-slider-handle { + @include border-radius(20px); + @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%)); + background: $mit-red url(/static/images/slider-handle.png) center center no-repeat; + border: 0; + border: 1px solid darken($mit-red, 20%); + cursor: pointer; + height: 20px; + margin-left: -10px; + top: -4px; + width: 20px; + + &:focus { + outline: none; + } } } - } - ul.vcr { - float: left; - margin-right: lh(); - - li { + ul.vcr { float: left; - margin-bottom: 0; + margin-right: lh(); - 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#vidtime { - float: left; - font-weight: bold; - line-height: 46px; //height of play pause buttons - -webkit-font-smoothing: antialiased; - } - - div.speeds { - float: right; - line-height: 46px; //height of play pause buttons - margin-right: lh(); - -webkit-font-smoothing: antialiased; - - div#video_speeds { - @include inline-block(); - font-weight: bold; - - span { - @include inline-block(); - cursor: pointer; + li { + float: left; margin-bottom: 0; + 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#vidtime { + padding-left: lh(); + font-weight: bold; + line-height: 46px; //height of play pause buttons + -webkit-font-smoothing: antialiased; + } + } + } + + div.secondary-controls { + float: right; + + div.speeds { + float: left; + line-height: 46px; //height of play pause buttons + padding-right: lh(); + margin-right: 0; + -webkit-font-smoothing: antialiased; + @include box-shadow(1px 0 0 #555); + border-right: 1px solid #000; + + div#video_speeds { + @include inline-block(); + font-weight: bold; + + span { + @include inline-block(); + cursor: pointer; + margin-bottom: 0; + + &:hover { + color: $mit-red; + } + } + } + } + + a.hide-subtitles { + float: left; + display: block; + padding-right: lh(.5); + margin-left: 0; + color: #797979; + padding-left: 50px; + line-height: 46px; //height of play pause buttons + font-weight: 800; + background: url('/static/images/cc.png') 16px center no-repeat; + -webkit-font-smoothing: antialiased; + &:hover { - color: $mit-red; + color: #fff; + text-decoration: none; + background-color: #444; } } } } } - } - ol.subtitles { - float: left; - width: flex-grid(3, 9); - height: 530px; - overflow: hidden; + ol.subtitles { + float: left; + width: flex-grid(3, 9); + height: 530px; + overflow: hidden; - li { - margin-bottom: 0px; - cursor: pointer; - border: 0; - padding: 0; - color: #666; - - &.current { - background-color: #f3f3f3; - color: #333; - } - - &:hover { - color: $mit-red; - } - - div { - margin-bottom: 8px; - } - - div:empty { + li { margin-bottom: 0px; + cursor: pointer; + border: 0; + padding: 0; + color: #666; + + &.current { + background-color: #f3f3f3; + color: #333; + } + + &:hover { + color: $mit-red; + } + + div { + margin-bottom: 8px; + } + + div:empty { + margin-bottom: 0px; + } + } + } + + &.closed { + @extend .trans; + + div.video-wrapper { + width: flex-grid(9,9); + } + + ol.subtitles { + width: 0px; + height: 0; } } } - } diff --git a/video.html b/video.html index fdfc9c27a3..394e8f591e 100644 --- a/video.html +++ b/video.html @@ -1,48 +1,73 @@ % if name is not UNDEFINED and name != None: -

${name}

+

${name}

% endif -
-
-
+ +
+ +
+
+
+
+ +
- +
+
+ +
+
    +
  • Pause
    • + +
  • +
    0:00/0:00
    +
    • +
+ + +
+
+ Speed:
+
+ + on +
+
+
-
-
- -
- - -
0:00/0:00
- -
- Speed:
-
-
-
+
    + +
    2. +
    3. +
    4. +
    5. +
    6. +
    7. +
    8. +
    9. +
    10. +
    11. +
    12. +
    13. +
    14. +
    15. + +
-
    - -
    2. -
    3. -
    4. -
    5. -
    6. -
    7. -
    8. -
    9. -
    10. -
    11. -
    12. -
    13. -
    14. -
    15. - -
+<%block name="js_extra"> + + From f7ddb4840cc024a4487ff4aec68a9bf50d65a191 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 22 Feb 2012 15:03:29 -0500 Subject: [PATCH 19/68] Fixed broken anchors --- 6002x-faq.html | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index 8a13ad95f4..d01c011a6d 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -26,7 +26,7 @@ someone else already signed up with that username. Try a different, more unique username. For example, try adding a random number to the end.

- +

I am interested in a different subject. What other courses do you offer?

@@ -34,7 +34,7 @@ you offer? range of courses in the future, at present, 6.002x is the only course available.

- +

How will I know that the course has started?

The course will start on March 5. Check the website @@ -43,20 +43,20 @@ the course website 6.002x.mitx.mit.edu on or slightly before March 5 so you can login, begin to get familiar with the site and start the course.

- +

Why is there no log-in button?

You will not be able to log into the course until either the starting date, or shortly before.

- +

Does the class have a schedule?

The lectures are on-line videos, and may be watched at your own pace and schedule. The course will have fixed deadlines for homework assignments and exams.

- +

I just enrolled for the course. I have not received any form of acknowledgement that I have enrolled.

@@ -74,13 +74,13 @@ most common issues are: to do anything about the old account, if any. If it is not activated through the link in the e-mail, it will disappear later. - +

How do I drop the course?

You do not have to do anything. You can simply stop working on the course at any time you choose to do so.

- +

What happens if I drop the course?

For the prototype course, learners achieving grades of "A," "B," @@ -92,7 +92,7 @@ will be disclosed outside of MITx. You can also choose to opt for a no record at any time. However, the posts you make while enrolled in the class will remain visible.

- +

What is MITx?

@@ -121,7 +121,7 @@ education. The launch of MITx represents a next step forward in that effort.

- +

What is 6.002x, and how is it different from the on-campus version of 6.002? @@ -151,7 +151,7 @@ version of 6.002. professors Anant Agarwal and Jeffrey H. Lang for 6.002.

- +

How do I enroll in 6.002x?

@@ -160,7 +160,7 @@ To enroll, visit http://mitx.mit.edu and sign up.

- +

When will the course be available online?

@@ -169,7 +169,7 @@ When will the course be available online? 6.002x will become available online on Monday, March 5.

- +

Do I need to follow a set timeline in completing 6.002x?

@@ -181,7 +181,7 @@ final exam will be given within a specific range of days. However, faster-paced learners can proceed multiple weeks ahead if they choose.

- +

How much time is required to complete the course?

@@ -191,7 +191,7 @@ course. However, the time taken by individual students might vary considerably depending on background and skill.

- +

Who are the instructors for 6.002x?

@@ -201,7 +201,7 @@ Gerald Sussman and Piotr Mitros. The team also includes several teaching assistants (TAs).

- +

What is the work like in 6.002x?

@@ -223,7 +223,7 @@ videos. Lab and homework exercises will round out the week. Tutorials are also provided as additional reference material.

- +

What if I have a question during the course?

@@ -234,7 +234,7 @@ documents, FAQs, tutorials and videos on using the various components of the course will also be provided.

- +

Will 6.002x offer any means for collaboration among online learners?

@@ -243,7 +243,7 @@ Yes. 6.002x will offer modest support for collaborative work through a prototype wiki and discussion forum.

- +

Are there prerequisites to take the course?

@@ -266,7 +266,7 @@ remedial differential equations component for students with weaker math backgrounds.

- +

How much does the course cost?

@@ -277,7 +277,7 @@ credential for a modest fee. For this prototype course, the fee for a credential will be waived.

- +

What is a credential?

@@ -290,7 +290,7 @@ testing center or otherwise have your identity certified in order to receive this certificate.

- +

Who is grading the course?

@@ -299,7 +299,7 @@ Who is grading the course? including practice exercises, homework assignments, labs and exams.

- +

What is a passing grade?

@@ -310,7 +310,7 @@ affecting a student’s grade and the grade thresholds will be posted on the course website when the course comes online.

- +

Do I need to buy a textbook?

@@ -325,7 +325,7 @@ copyright for the book is owned by Elsevier. The book can be purchased on Amazon.

- +

Do I need to have special software to access 6.002x?

@@ -343,7 +343,7 @@ other browsers and tablets, but portions of the functionality will be unavailable.

- +

When will the next courses become available and what topics will they be on?

From 687ae76315759d3187f7044f79d9c85cb42b328e Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 22 Feb 2012 16:21:00 -0500 Subject: [PATCH 20/68] added social icons for marketing pages --HG-- branch : kf-captions --- marketing.html | 13 +++++++++++++ sass/index/_footer.scss | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/marketing.html b/marketing.html index f612ade780..e09029c24c 100644 --- a/marketing.html +++ b/marketing.html @@ -98,7 +98,20 @@ function postJSON(url, data, callback) {
  • Honor Code
  • Help
    • + +
    + % if settings.COURSEWARE_ENABLED: diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss index 5a6736ba42..e66d2ba5da 100644 --- a/sass/index/_footer.scss +++ b/sass/index/_footer.scss @@ -52,6 +52,40 @@ footer { } } + + &.social { + float: right; + margin-right: 60px; + position: relative; + top: -5px; + + li { + float: left; + margin-right: lh(.5); + + a { + display: block; + height: 29px; + width: 28px; + text-indent: -9999px; + } + + &:after { + content: none; + display: none; + } + + &.twitter a { + background: url('/static/images/marketing/twitter.png') 0 0 no-repeat; + } + &.facebook a { + background: url('/static/images/marketing/facebook.png') 0 0 no-repeat; + } + &.linkedin { + background: url('/static/images/marketing/linkedin.png') 0 0 no-repeat; + } + } + } } } } From 0d9a8088fb047a28bdef660bd35574df44c1af63 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 22 Feb 2012 16:28:44 -0500 Subject: [PATCH 21/68] Added slightly darker social icons so that they can have some opacity on hover --- sass/index/_footer.scss | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss index e66d2ba5da..ec1a1c2f37 100644 --- a/sass/index/_footer.scss +++ b/sass/index/_footer.scss @@ -63,25 +63,31 @@ footer { float: left; margin-right: lh(.5); - a { - display: block; - height: 29px; - width: 28px; - text-indent: -9999px; - } - &:after { content: none; display: none; } + a { + display: block; + height: 29px; + width: 28px; + text-indent: -9999px; + + &:hover { + opacity: .8; + } + } + &.twitter a { background: url('/static/images/marketing/twitter.png') 0 0 no-repeat; } + &.facebook a { background: url('/static/images/marketing/facebook.png') 0 0 no-repeat; } - &.linkedin { + + &.linkedin a { background: url('/static/images/marketing/linkedin.png') 0 0 no-repeat; } } From 9332f63f21f69e2e455695bb644c0678823f5791 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 22 Feb 2012 17:13:11 -0500 Subject: [PATCH 22/68] Fixed edit sidebar + comments actions --- sass/discussion/_question-view.scss | 5 +++++ sass/discussion/_questions.scss | 3 ++- sass/discussion/_sidebar.scss | 13 +++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 172415f326..e004d08ae3 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -249,6 +249,10 @@ div.question-header { display: inline-block; width: 95%; + &#full-width { + width: 100%; + } + div.comment-meta { text-align: right; @@ -317,5 +321,6 @@ div.share-question { p { padding: 0; margin: 0; + font-weight: bold; } } diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index d1765bed91..2b1b978269 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -157,10 +157,11 @@ ul.question-list, div#question-list { text-align: right; li { - @include linear-gradient(#fff, #f5f5f5); border: 1px solid #ddd; + @include box-shadow(0 1px 0 #fff); display: inline-block; height:60px; + @include linear-gradient(#fff, #f5f5f5); margin-right: 10px; width: 60px; diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 37810749a2..8a63e35582 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -193,9 +193,22 @@ div.discussion-wrapper aside { } } + div.question-tips, div.markdown { + ul { + margin-left: 8%; + } + + ol { + margin-left: 8%; + } + } div.markdown ul li { margin: 20px 0; + &:first-child { + margin: 0; + } + ol li { margin: 0; } From 2d6fa2797365b5dcd8d46d72e8add9458c403c91 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 23 Feb 2012 14:47:52 -0500 Subject: [PATCH 23/68] Redesigned the profile sidebar and refactored some scss --- sass/discussion/_profile.scss | 90 +++++++++++++++++------------------ sass/discussion/_sidebar.scss | 58 ++++++++++++++++++++++ 2 files changed, 102 insertions(+), 46 deletions(-) diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 3ff1194bdd..793fa9234a 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -1,41 +1,4 @@ body.user-profile-page { - section.user-info { - // @extend .sidebar; - header { - @extend .clearfix; - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - padding: 0 lh(); - margin: 0 (-(lh())) lh(); - - section { - float: left; - width: flex-grid(2, 3); - margin-right: flex-gutter(3); - - h1 { - margin-top: 0; - } - } - - p.karma { - float: left; - width: flex-grid(1, 3); - border: 1px solid #D3D3D3; - @include border-radius(3px); - @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); - background: #eee; - text-align: center; - padding: lh(.5) 0; - - - strong { - display: block; - font-style: 20px; - } - } - } - } section.questions { h1 { @@ -44,12 +7,11 @@ body.user-profile-page { } ul.sub-info { - border-top: 1px solid #ddd; + // border-top: 1px solid #ddd; margin-top: lh(); list-style: none; > li { - width: flex-grid(2.25, 9); display: table-cell; padding: (flex-gutter(9)/2); border-right: 1px solid #ddd; @@ -64,7 +26,21 @@ body.user-profile-page { padding-right: 0; } + &.votes-badges { + width: flex-grid(2,9); + + } + + &.answer-list { + width: flex-grid(4, 9); + } + + &.tags-list { + width: flex-grid(3,9); + } + h2 { + margin-bottom: 30px; margin-top: 0; } @@ -78,45 +54,67 @@ body.user-profile-page { &.user-stats-table { list-style: none; + + li { + padding: 10px 0 15px; + border-top: 1px solid #eee; + } } &.vote-buttons { list-style: none; + margin-bottom: 30px; li { - @include border-radius(4px); background-color: lighten(#F6EFD4, 3%); background-position: 10px center; background-repeat: no-repeat; + @include border-radius(4px); + display: inline-block; height: 20px; padding: 10px 10px 10px 40px; - display: inline-block; &.up { + background-color:#d1e3a8; background-image: url(/static/images/askbot/vote-arrow-up.png); margin-right: 6px; + + span.vote-count { + color: #3f6c3e; + } } &.down { background-image: url(/static/images/askbot/vote-arrow-down.png); + background-color:#eac6ad; + + span.vote-count { + color: $mit-red; + } + } } } &.badges { - @include border-radius(4px); - background-color: #e3e3e3; @include inline-block(); a { + background-color: #e3e3e3; border: 0; - background: none; - text-transform: uppercase; + @include border-radius(4px); color: #292309; + display: block; font-size: 12px; padding: 10px; + margin-bottom: 10px; text-shadow: 0 1px 0 #fff; - display: block; + text-transform: uppercase; + text-decoration: none; + + &:hover { + background-color: #cdcdcd; + } } } } diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 8a63e35582..1fe95c6efa 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -193,6 +193,64 @@ div.discussion-wrapper aside { } } + div.user-info, div.user-stats { + @extend div.question-stats; + overflow: hidden; + + div { + float: left; + display: block; + } + + div.karma { + background: #eee; + border: 1px solid #D3D3D3; + @include border-radius(3px); + @include box-sizing(border-box); + @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); + padding: lh(.4) 0; + text-align: center; + width: flex-grid(1, 3); + float: right; + + strong { + display: block; + font-style: 20px; + } + } + + div.meta { + width: flex-grid(2,3); + padding-right: flex-gutter(3)*0.5; + @include box-sizing(border-box); + + h2 { + border: 0; + @include box-shadow(none); + margin: 0 0 8px 0; + padding: 0; + } + + p { + color: #777; + font-size: 14px; + } + } + } + + div.user-stats { + overflow: visible; + + ul { + font-size: 14px; + + h2 { + margin:0 (-(lh())) 5px (-(lh())); + padding: lh(.5) lh(); + } + } + } + div.question-tips, div.markdown { ul { margin-left: 8%; From 3439b8f225aea8bc721707985c014c3e25b7aca5 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 23 Feb 2012 15:13:11 -0500 Subject: [PATCH 24/68] Changed sup and sub styling + amplifier label colors --- sass/base/_reset.scss | 2 +- sass/courseware/_amplifier.scss | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sass/base/_reset.scss b/sass/base/_reset.scss index 726fccc466..3cf4758c7b 100644 --- a/sass/base/_reset.scss +++ b/sass/base/_reset.scss @@ -10,7 +10,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, -small, strong, sub, sup, var, +small, strong, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, diff --git a/sass/courseware/_amplifier.scss b/sass/courseware/_amplifier.scss index 28325a306f..19c7ab9a2b 100644 --- a/sass/courseware/_amplifier.scss +++ b/sass/courseware/_amplifier.scss @@ -71,3 +71,24 @@ div#schematic-container { } //End JM MOSFET AMPLIFIER +// Labels +div.graph-controls, div#graph-listen { + + label { + @include border-radius(2px); + font-weight: bold; + padding: 3px; + } + + label[for="vinCheckbox"], label[for="vinRadioButton"]{ + color: desaturate(#00bfff, 50%); + } + label[for="voutCheckbox"], label[for="voutRadioButton"]{ + color: darken(#ffcf48, 20%); + } + label[for="vrCheckbox"], label[for="vrRadioButton"]{ + color: desaturate(#1df914, 40%); + } + +} + From 3f7c4ada6d73837d51a62d337d5c79eab6a7912e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 23 Feb 2012 17:04:54 -0500 Subject: [PATCH 25/68] Added tooltip on hover --- sass/discussion/_forms.scss | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index c7cfe85648..8bea8d79ce 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -22,13 +22,38 @@ form.answer-form { .title-desc { @include box-sizing(border-box); + @include border-radius(4px); background: #333; color: #fff; + display: none; font-size: 13px; - padding: 5px 10px; - width: flex-grid(6); + padding: 7px 14px; -webkit-font-smoothing: antialiased; } + + &:hover { + .title-desc { + display: inline-block; + position: absolute; + margin-left: 10px; + z-index: 1; + width: 200px; + + &:before { + border-color: transparent #333 transparent transparent; + border-style:solid; + border-width:12px 12px 12px 0; + content:""; + height:0; + left:-10px; + position:absolute; + top:1; + width:0; + + } + } + } + } span.form-error, label.form-error { From b18d7c1f03a3b6b234512c457085c9d0fa295b80 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 24 Feb 2012 23:06:52 -0500 Subject: [PATCH 26/68] Fixed format specifier to not print out 12 instead of 12.0 on profile page --- profile.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profile.html b/profile.html index fd5b3ef0ab..a126ad1fe9 100644 --- a/profile.html +++ b/profile.html @@ -108,7 +108,7 @@ $(function() { %>

    - ${ section['section'] } ${"({0}/{1}) {2}".format( earned, total, percentageString )}

    + ${ section['section'] } ${"({0:g}/{1:g}) {2}".format( earned, total, percentageString )} ${section['subtitle']} %if 'due' in section and section['due']!="": due ${section['due']} @@ -118,7 +118,7 @@ $(function() {
      ${ "Problem Scores: " if section['graded'] else "Practice Scores: "} %for score in section['scores']: -
    1. ${ score[0] }/${ score[1] }
      2. +
    2. ${"{0:g}/{1:g}".format(score[0],score[1])}
      3. %endfor
    %endif From f0e2b6002493f8bf8ab20e505363768b1f0b1c81 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 24 Feb 2012 23:39:23 -0500 Subject: [PATCH 27/68] Fixed bug where tooltip of profile graph totals wouldn't show up --- profile_graphs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profile_graphs.js b/profile_graphs.js index 502c3c1469..5ffbde5521 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -58,7 +58,7 @@ $(function () { color: colors[${sectionIndex}].toString(), }); ticks = ticks.concat( [ [${tickIndex}, "${section['totallabel']}"] ] ); - detail_tooltips["${section['category']} Average"] = [ "${section['totalscore']['summary']}" ]; + detail_tooltips["${section['category']} Total"] = [ "${section['totalscore']['summary']}" ]; <% tickIndex += 1 + sectionSpacer %> %else: ##This is for sections like midterm or final, which have no smaller components From b57f9db65eb5093cf7070e342815d108707e0930 Mon Sep 17 00:00:00 2001 From: Jean-Michel Claus Date: Mon, 27 Feb 2012 11:12:10 -0500 Subject: [PATCH 28/68] Added border and padding above amp lab to separate it from text. --- sass/courseware/_amplifier.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/courseware/_amplifier.scss b/sass/courseware/_amplifier.scss index 19c7ab9a2b..963fdfd0cb 100644 --- a/sass/courseware/_amplifier.scss +++ b/sass/courseware/_amplifier.scss @@ -1,9 +1,10 @@ // JM MOSFET AMPLIFIER div#graph-container { @extend .clearfix; - + border-top: 1px solid #ddd; + padding-top: lh(1.0); + canvas#graph { - background-color: rgb(60, 60, 100); width: flex-grid(4.5, 9); float: left; margin-right: flex-gutter(9); @@ -46,7 +47,6 @@ div#schematic-container { @extend .clearfix; canvas { - background-color: rgb(60, 60, 100); width: flex-grid(4.5, 9); float: left; margin-right: flex-gutter(9); From 5d24d6cc3667c8d1043ec250c14e74c1214448c4 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 27 Feb 2012 12:15:54 -0500 Subject: [PATCH 29/68] Added more js to the footer and added some small other style fixes --- courseware.html | 2 ++ main.html | 19 +++++++++---------- marketing.html | 2 -- sass/courseware/_courseware.scss | 2 +- sass/index/_footer.scss | 4 ++++ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/courseware.html b/courseware.html index af3b721e2e..67e596545e 100644 --- a/courseware.html +++ b/courseware.html @@ -1,11 +1,13 @@ <%inherit file="main.html" /> +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='courseware'" /> diff --git a/main.html b/main.html index 76a035c449..f7a4e2a90c 100644 --- a/main.html +++ b/main.html @@ -9,11 +9,6 @@ - - - - - - <%block name="headextra"/> diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index f408f3cbb0..5100e46ea7 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -145,7 +145,7 @@ div.course-wrapper { div#seq_content { h1 { background: none; - margin-bottom: 0; + margin-bottom: lh(); padding-bottom: 0; border-bottom: none; } diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss index ec1a1c2f37..dc3747dd64 100644 --- a/sass/index/_footer.scss +++ b/sass/index/_footer.scss @@ -59,6 +59,10 @@ footer { position: relative; top: -5px; + @media screen and (max-width: 780px) { + float: none; + } + li { float: left; margin-right: lh(.5); From d4f5ff92ad15af28ab45a8ca5e6349ceec974d6e Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 27 Feb 2012 12:19:59 -0500 Subject: [PATCH 30/68] added fix for info page --- sass/_info.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sass/_info.scss b/sass/_info.scss index 9e67b5c657..418cc1a00a 100644 --- a/sass/_info.scss +++ b/sass/_info.scss @@ -27,10 +27,16 @@ div.info-wrapper { margin: 0 flex-gutter() 0 0; } - p { + section.update-description { float: left; width: flex-grid(7, 9); margin-bottom: 0; + + p { + &:last-child { + margin-bottom: 0; + } + } } } } From fda5c61b9f871f3971b666b04f23935234db83b1 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 27 Feb 2012 15:35:40 -0500 Subject: [PATCH 31/68] Added styles for speeds in video player --- sass/courseware/_video.scss | 40 ++++++++++++++++++++++++++++++------- video.html | 11 +++++++++- video_init.js | 6 +++++- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 22e90916d5..0836d07158 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -54,6 +54,7 @@ section.course-content { section.video-controls { @extend .clearfix; background: #333; + position: relative; border: 1px solid #000; color: #ccc; @@ -133,22 +134,47 @@ section.course-content { float: right; div.speeds { + border-right: 1px solid #000; + border-left: 1px solid #000; + @include box-shadow(1px 0 0 #555, inset 1px 0 0 #555); float: left; line-height: 46px; //height of play pause buttons - padding-right: lh(); margin-right: 0; -webkit-font-smoothing: antialiased; - @include box-shadow(1px 0 0 #555); - border-right: 1px solid #000; - div#video_speeds { - @include inline-block(); + h3 { + a { + color: #fff; + display: block; + padding: 0 lh(.5); + + &:hover { + text-decoration: none; + background-color: #444; + } + } + } + + ol#video_speeds { + @extend .clearfix; + background: #333; + border: 1px solid #000; font-weight: bold; + @include inline-block(); + padding: 0 lh(); + position: absolute; + right: 79px; + @include box-shadow(inset 0 1px 0 #555); - span { - @include inline-block(); + li { cursor: pointer; + float: left; margin-bottom: 0; + margin-right: lh(.5); + + &:last-child { + margin-right: 0; + } &:hover { color: $mit-red; diff --git a/video.html b/video.html index 394e8f591e..b5ac71ba55 100644 --- a/video.html +++ b/video.html @@ -28,7 +28,8 @@
    - Speed:
    +

    Speed

    +
      on @@ -68,6 +69,14 @@ $(this).text((link_text == 'on') ? 'off' : 'on'); return false; }); + + + $('.speeds ol').hide(); + + $('.speeds h3 a').click(function() { + $('.speeds ol').toggle(); + return false; + }); }); diff --git a/video_init.js b/video_init.js index 0ec2fe2e2c..5ed773b98f 100644 --- a/video_init.js +++ b/video_init.js @@ -34,9 +34,13 @@ loadNewVideo(streams["1.0"], ${ position }); function add_speed(key, stream) { var id = 'speed_' + stream; - $("#video_speeds").append(' '+key+'x'); + + $("#video_speeds").append('
    1. '+key+'x
      2. '); + $("#"+id).click(function(){ change_video_speed(key, stream); + $(this).siblings().removeClass("active"); + $(this).addClass("active"); }); } From 1cefd73b0ce1a232f6ae39ec1a23d4790469bcfb Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 27 Feb 2012 16:20:08 -0500 Subject: [PATCH 32/68] changed dotted to dashed --- sass/_profile.scss | 2 +- sass/courseware/_courseware.scss | 2 +- sass/discussion/_question-view.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/_profile.scss b/sass/_profile.scss index a9dfb886a6..669daecffb 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -77,7 +77,7 @@ div.profile-wrapper { width: 100%; h2 { - border-right: 1px dotted #ccc; + border-right: 1px dashed #ddd; @include box-sizing(border-box); display: table-cell; margin: 0; diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 5100e46ea7..52525a5a88 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -36,7 +36,7 @@ div.course-wrapper { margin-bottom: 15px; width: flex-grid(2, 9); padding-right: flex-gutter(9); - border-right: 1px dotted #ccc; + border-right: 1px dashed #ddd; @include box-sizing(border-box); display: table-cell; vertical-align: top; diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index e004d08ae3..c6ee7a75da 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -100,7 +100,7 @@ div.question-header { display: inline-block; float: left; width: flex-grid(1.8,8); - border-left: 1px dotted #CCC; + border-left: 1px dashed #ddd; div.post-update-info { @include box-sizing(border-box); From 4072569d71250f4ac94b199906c0d3382d5514e4 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 27 Feb 2012 16:27:37 -0500 Subject: [PATCH 33/68] Change links in navigation to real href not redirects --- navigation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/navigation.html b/navigation.html index bba364d18b..345e6eaa3c 100644 --- a/navigation.html +++ b/navigation.html @@ -11,8 +11,8 @@
    2. Courseware
    3. Course Info
    4. Textbook
      5. -
    5. Discussion
      6. -
    6. Wiki
      7. +
    7. Discussion
      8. +
    8. Wiki
    9. Profile
      10. From 8d84f6efe15324b73fa4239c3dcc6983b748cf86 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 27 Feb 2012 16:59:11 -0500 Subject: [PATCH 34/68] Minor visual bug fixes in Askbot --- sass/discussion/_askbot-original.scss | 14 +++++++------- sass/discussion/_discussion.scss | 7 ++++--- sass/discussion/_form-wmd-toolbar.scss | 1 - sass/discussion/_forms.scss | 8 +------- sass/discussion/_profile.scss | 2 +- sass/discussion/_questions.scss | 9 ++++++++- sass/discussion/_sidebar.scss | 18 ++++++++++++++++++ 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index d6ae9b96a4..3fccf8ccb0 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -1165,13 +1165,13 @@ body.anon #searchbar { font-weight: normal; cursor: help; } -.question-options { - margin-top: 1px; - color: #666; - line-height: 13px; - margin-bottom: 5px; - label { - vertical-align: text-bottom; } } +// .question-options { +// margin-top: 1px; +// color: #666; +// line-height: 13px; +// margin-bottom: 5px; +// label { +// vertical-align: text-bottom; } } // .edit-content-html { // border-top: 1px dotted #d8d2a9; diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 3de284476e..1935711314 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -1,5 +1,5 @@ // Base extends (Merge with main stylesheet later) -.light-button { +.light-button, a.light-button { @include box-shadow(inset 0 1px 0 #fff); @include linear-gradient(#fff, lighten(#888, 40%)); @include border-radius(3px); @@ -12,7 +12,7 @@ -webkit-font-smoothing: antialiased; &:hover, &:focus { - @include linear-gradient(#fff, lighten(#888, 30%)); + @include linear-gradient(#fff, lighten(#888, 37%)); border: 1px solid #ccc; text-decoration: none; } @@ -43,7 +43,7 @@ body.askbot { vertical-align: top; width: flex-grid(9) + flex-gutter(); - .tabula-rasa { + a.tabula-rasa, .tabula-rasa{ @extend .light-button; @include border-radius(5px); display: block; @@ -58,6 +58,7 @@ body.askbot { &:first-child { margin-top: 70px; } + &:last-child { margin-bottom: 70px; } diff --git a/sass/discussion/_form-wmd-toolbar.scss b/sass/discussion/_form-wmd-toolbar.scss index be5bdaa24a..ecfe535c4a 100644 --- a/sass/discussion/_form-wmd-toolbar.scss +++ b/sass/discussion/_form-wmd-toolbar.scss @@ -3,7 +3,6 @@ } #wmd-button-bar { - background: url(/static/images/askbot/editor-toolbar-background.png) repeat-x bottom; border: 1px solid #ddd; height:36px; float:left; diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index 8bea8d79ce..068e439b7d 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -3,7 +3,6 @@ form.answer-form { border-top: 1px solid #ddd; overflow: hidden; padding-left: flex-grid(1.1); - // padding-top: 20px; textarea { @include box-sizing(border-box); @@ -105,12 +104,8 @@ input.after-editor { form.question-form { @extend .answer-form; border: none; - padding: 0; - margin-top: -15px; + padding: 15px 0 0 0; - h1 a { - float: right; - } input[type="text"] { @include box-sizing(border-box); @@ -121,4 +116,3 @@ form.question-form { margin-top: 10px; } } - diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 793fa9234a..f82bff5a46 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -2,7 +2,7 @@ body.user-profile-page { section.questions { h1 { - @extend .top-header; + margin: 0; } } diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 2b1b978269..5a63313bc3 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -5,6 +5,14 @@ div.question-list-header { width: flex-grid(9,9); @extend h1.top-header; + h1 { + margin: 0; + + > a.light-button { + + } + } + section.question-list-meta { display: block; overflow: hidden; @@ -121,7 +129,6 @@ ul.question-list, div#question-list { &.question-body { @include box-sizing(border-box); margin-right: flex-gutter(); - padding-left: 10px; width: flex-grid(5.5,9); h2 { diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 1fe95c6efa..c5dd987d1d 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -271,4 +271,22 @@ div.discussion-wrapper aside { margin: 0; } } + + div.view-profile { + h2 { + border-top: 0; + @include box-shadow(none); + } + a { + width: 100%; + @include box-sizing(border-box); + text-align: center; + padding: 10px; + display: block; + + span { + font-weight: bold; + } + } + } } From 7fa6e5c0d0c2bf90d2ab5f8a7e5d4b2aaec4c72f Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 27 Feb 2012 17:17:46 -0500 Subject: [PATCH 35/68] Changed the comment horizontal divider + Fixed the alignment of navigation buttons --- sass/discussion/_question-view.scss | 4 +--- sass/discussion/_questions.scss | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index c6ee7a75da..72bca7f36d 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -285,9 +285,7 @@ div.question-header { } div.controls { - // padding: 15px 0; - // background: #efefef ; - border-top: 1px dashed #ddd; + border-top: 1px solid #efefef; text-align: right; a { display: inline-block; diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 5a63313bc3..4d3b1be05e 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -9,7 +9,7 @@ div.question-list-header { margin: 0; > a.light-button { - + float: right; } } From c33d60f85b74ebec2d8e956b747519977644926c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 28 Feb 2012 09:43:28 -0500 Subject: [PATCH 36/68] revert speed style --- sass/courseware/_video.scss | 55 +++++++++++++++++++++++-------------- video.html | 4 +-- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 0836d07158..0949b96e64 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -143,44 +143,57 @@ section.course-content { -webkit-font-smoothing: antialiased; h3 { + @include inline-block(); + a { color: #fff; - display: block; padding: 0 lh(.5); + @include inline-block(); &:hover { text-decoration: none; - background-color: #444; + // background-color: #444; } } } + // fix for now ol#video_speeds { - @extend .clearfix; - background: #333; - border: 1px solid #000; - font-weight: bold; @include inline-block(); - padding: 0 lh(); - position: absolute; - right: 79px; - @include box-shadow(inset 0 1px 0 #555); + padding-right: lh(.5); li { cursor: pointer; - float: left; - margin-bottom: 0; - margin-right: lh(.5); - - &:last-child { - margin-right: 0; - } - - &:hover { - color: $mit-red; - } + @include inline-block(); } } + + // ol#video_speeds { + // @extend .clearfix; + // background: #333; + // border: 1px solid #000; + // font-weight: bold; + // @include inline-block(); + // padding: 0 lh(); + // position: absolute; + // right: 79px; + // @include box-shadow(inset 0 1px 0 #555); + + // li { + // cursor: pointer; + // float: left; + // margin-bottom: 0; + // margin-right: lh(.5); + + // &:last-child { + // margin-right: 0; + // } + + // &:hover { + // color: $mit-red; + // } + // } + // } } a.hide-subtitles { diff --git a/video.html b/video.html index b5ac71ba55..86c35364aa 100644 --- a/video.html +++ b/video.html @@ -71,12 +71,12 @@ }); - $('.speeds ol').hide(); + /* $('.speeds ol').hide(); $('.speeds h3 a').click(function() { $('.speeds ol').toggle(); return false; - }); + });*/ }); From d41574674fa1bb02c5f27dc75e617f7cb75d329c Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 28 Feb 2012 10:34:58 -0500 Subject: [PATCH 37/68] Minor visual enhancements --- sass/discussion/_profile.scss | 6 +++--- sass/discussion/_question-view.scss | 12 +++++++++--- sass/discussion/_sidebar.scss | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index f82bff5a46..8b9ef2562f 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -14,7 +14,7 @@ body.user-profile-page { > li { display: table-cell; padding: (flex-gutter(9)/2); - border-right: 1px solid #ddd; + border-right: 1px dashed #efefef; @include box-sizing(border-box); &:first-child { @@ -76,7 +76,7 @@ body.user-profile-page { &.up { background-color:#d1e3a8; - background-image: url(/static/images/askbot/vote-arrow-up.png); + background-image: url(/static/images/askbot/vote-arrow-up-activate.png); margin-right: 6px; span.vote-count { @@ -85,7 +85,7 @@ body.user-profile-page { } &.down { - background-image: url(/static/images/askbot/vote-arrow-down.png); + background-image: url(/static/images/askbot/vote-arrow-down-activate.png); background-color:#eac6ad; span.vote-count { diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 72bca7f36d..09cb76b8f4 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -19,14 +19,19 @@ div.question-header { &.post-vote { @include border-radius(4px); - background-color: lighten(#F6EFD4, 3%); + background-color: lighten(#F6EFD4, 5%); + border: 1px solid darken( #F6EFD4,10% ); + @include box-shadow(inset 0 1px 0px #fff); } &.question-img-upvote, &.answer-img-upvote { background-image: url(/static/images/askbot/vote-arrow-up.png); + @include box-shadow(inset 0 1px 0px rgba(255, 255, 255, 0.5)); &:hover, &.on { background-color:#d1e3a8; + border-color: darken(#D1E3A8, 20%); + background-image: url(/static/images/askbot/vote-arrow-up-activate.png); } } @@ -34,7 +39,9 @@ div.question-header { background-image: url(/static/images/askbot/vote-arrow-down.png); &:hover, &.on { - background-color:#eac6ad; + background-color:#EAC6AD; + border-color: darken(#EAC6AD, 20%); + background-image: url(/static/images/askbot/vote-arrow-down-activate.png); } } } @@ -319,6 +326,5 @@ div.share-question { p { padding: 0; margin: 0; - font-weight: bold; } } diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index c5dd987d1d..47003ad4e7 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -283,6 +283,11 @@ div.discussion-wrapper aside { text-align: center; padding: 10px; display: block; + margin-top: 10px; + + &:first-child { + margin-top: 0; + } span { font-weight: bold; From 1a6f06416b47226c994fd5327c576b032e5b8ec3 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 28 Feb 2012 17:13:03 -0500 Subject: [PATCH 38/68] added new tooltips and styles for new tool tips --HG-- branch : kf-tooltips --- courseware.html | 8 +- main.html | 2 +- sass/application.scss | 2 +- sass/courseware/_sequence-nav.scss | 198 ++++++++++++++++++----------- sass/courseware/_video.scss | 27 ---- seq_module.html | 7 +- seq_module.js | 2 +- video.html | 8 -- 8 files changed, 134 insertions(+), 120 deletions(-) diff --git a/courseware.html b/courseware.html index 67e596545e..2d6cdbf937 100644 --- a/courseware.html +++ b/courseware.html @@ -4,8 +4,12 @@ diff --git a/main.html b/main.html index f7a4e2a90c..dea829f05f 100644 --- a/main.html +++ b/main.html @@ -85,6 +85,7 @@ + <%block name="js_extra"/> - diff --git a/sass/application.scss b/sass/application.scss index 20e50f8605..c3f529534e 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -4,7 +4,7 @@ @import "base/reset", "base/font-face"; @import "base/variables", "base/functions", "base/extends", "base/base"; @import "layout/layout", "layout/header", "layout/footer", "layout/leanmodal"; -@import "jquery-ui-1.8.16.custom"; +@import "plugins/jquery-ui-1.8.16.custom"; // pages @import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav", "courseware/amplifier"; diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index fb2534c4f5..24d0687015 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -6,102 +6,150 @@ nav.sequence-nav { display: table-row; float: left; width: flex-grid(7.5,9) + flex-gutter(); + position: relative; a { @extend .block-link; } - .inactive { - background-repeat: no-repeat; - - &:hover { - background-color: lighten(#F6EFD4, 3%); - } - } - - .visited { - background-color: shade(#F6EFD4, 10%); - background-repeat: no-repeat; - border-color: shade(#F6EFD4, 10%); - - &:hover { - background-color: #F6EFD4; - } - } - - .active { - // @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); - @include box-shadow(0 1px 0 #fff); - background-color: #fff; - background-repeat: no-repeat; - - &:hover { - background-color: #fff; - } - } - li { - @include box-shadow(1px 0 0 #fff); - background-position: center center; - border: none; - border-right: 1px solid darken(#F6EFD4, 10%); - cursor: pointer; display: table-cell; - padding: 14px 4px; - width: 28px; - // @media screen and (max-width: 800px) { - // padding: 12px 8px; - // } + .inactive { + background-repeat: no-repeat; - //video - &.seq_video_inactive { - @extend .inactive; - background-image: url('/static/images/sequence-nav/video-icon-normal.png'); + &:hover { + background-color: lighten(#F6EFD4, 3%); + } } - &.seq_video_visited { - @extend .visited; - background-image: url('/static/images/sequence-nav/video-icon-visited.png'); + .visited { + background-color: shade(#F6EFD4, 10%); + background-repeat: no-repeat; + border-color: shade(#F6EFD4, 10%); + + &:hover { + background-color: #F6EFD4; + background-position: center center; + } } - &.seq_video_active { - @extend .active; - background-image: url('/static/images/sequence-nav/video-icon-current.png'); + .active { + // @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); + @include box-shadow(0 1px 0 #fff); + background-color: #fff; + background-repeat: no-repeat; + + &:hover { + background-color: #fff; + background-position: center; + } } - //other - &.seq_other_inactive { - @extend .inactive; - background-image: url('/static/images/sequence-nav/document-icon-normal.png'); - } + a { + @include box-shadow(1px 0 0 #fff); + background-position: center center; + border: none; + border-right: 1px solid darken(#F6EFD4, 10%); + cursor: pointer; + padding: 14px 4px; + width: 28px; + height: 17px; - &.seq_other_visited { - @extend .visited; - background-image: url('/static/images/sequence-nav/document-icon-visited.png'); - } + // @media screen and (max-width: 800px) { + // padding: 12px 8px; + // } - &.seq_other_active { - @extend .active; - background-image: url('/static/images/sequence-nav/document-icon-current.png'); - } + //video + &.seq_video_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/video-icon-normal.png'); + background-position: center; + } - //vertical & problems - &.seq_vertical_inactive, &.seq_problem_inactive { - @extend .inactive; - background-image: url('/static/images/sequence-nav/list-icon-normal.png'); - } + &.seq_video_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/video-icon-visited.png'); + background-position: center; + } - &.seq_vertical_visited, &.seq_problem_visited { - @extend .visited; - background-image: url('/static/images/sequence-nav/list-icon-visited.png'); - } + &.seq_video_active { + @extend .active; + background-image: url('/static/images/sequence-nav/video-icon-current.png'); + background-position: center; + } - &.seq_vertical_active, &.seq_problem_active { - @extend .active; - background-image: url('/static/images/sequence-nav/list-icon-current.png'); - } + //other + &.seq_other_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/document-icon-normal.png'); + background-position: center; + } + &.seq_other_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/document-icon-visited.png'); + background-position: center; + } + + &.seq_other_active { + @extend .active; + background-image: url('/static/images/sequence-nav/document-icon-current.png'); + background-position: center; + } + + //vertical & problems + &.seq_vertical_inactive, &.seq_problem_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/list-icon-normal.png'); + background-position: center; + } + + &.seq_vertical_visited, &.seq_problem_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/list-icon-visited.png'); + background-position: center; + } + + &.seq_vertical_active, &.seq_problem_active { + @extend .active; + background-image: url('/static/images/sequence-nav/list-icon-current.png'); + background-position: center; + } + } + + p { + position: absolute; + display: none; + background: #B3A87E; + padding: 6px; + white-space: pre-wrap; + z-index: 99; + margin: 4px 0 0 -5px; + text-shadow: 0 -1px 0 darken(#B3A87E, 10%); + color: #fff; + + &:empty { + background: none; + + &::after { + display: none; + } + } + + &::after { + background: #B3A87E; + content: " "; + display: block; + height: 10px; + position: absolute; + top: -5px; + left: 18px; + @include transform(rotate(45deg)); + @include transition(); + width: 10px; + } + } } } diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 0949b96e64..cc176b71b1 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -167,33 +167,6 @@ section.course-content { @include inline-block(); } } - - // ol#video_speeds { - // @extend .clearfix; - // background: #333; - // border: 1px solid #000; - // font-weight: bold; - // @include inline-block(); - // padding: 0 lh(); - // position: absolute; - // right: 79px; - // @include box-shadow(inset 0 1px 0 #555); - - // li { - // cursor: pointer; - // float: left; - // margin-bottom: 0; - // margin-right: lh(.5); - - // &:last-child { - // margin-right: 0; - // } - - // &:hover { - // color: $mit-red; - // } - // } - // } } a.hide-subtitles { diff --git a/seq_module.html b/seq_module.html index 3f28739a55..3df90fc343 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,7 +1,7 @@ - - -
      - +
      diff --git a/seq_module.js b/seq_module.js index 9c52dacad2..c7b9fabab9 100644 --- a/seq_module.js +++ b/seq_module.js @@ -54,7 +54,7 @@ function ${ id }goto(i) { function ${ id }setup_click(i) { $('#tt_'+i).click(function(eo) { ${ id }goto(i);}); $('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive"); - $('#tt_'+i).attr("title", ${ id }titles[i-1]); + $('#tt_'+i).parent().append("

      " + ${ id }titles[i-1] + "

      "); } diff --git a/video.html b/video.html index 86c35364aa..3337ea45e3 100644 --- a/video.html +++ b/video.html @@ -69,14 +69,6 @@ $(this).text((link_text == 'on') ? 'off' : 'on'); return false; }); - - - /* $('.speeds ol').hide(); - - $('.speeds h3 a').click(function() { - $('.speeds ol').toggle(); - return false; - });*/ }); From 1628b3e59a08e664932235442d57353a774ef17e Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 28 Feb 2012 17:14:52 -0500 Subject: [PATCH 39/68] Moved jquery ui scss to its own folder --HG-- branch : kf-tooltips --- sass/{ => plugins}/_jquery-ui-1.8.16.custom.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sass/{ => plugins}/_jquery-ui-1.8.16.custom.scss (100%) diff --git a/sass/_jquery-ui-1.8.16.custom.scss b/sass/plugins/_jquery-ui-1.8.16.custom.scss similarity index 100% rename from sass/_jquery-ui-1.8.16.custom.scss rename to sass/plugins/_jquery-ui-1.8.16.custom.scss From 37d1ed27e7e8e544e0ba360d794b1216173f8b09 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 28 Feb 2012 17:28:49 -0500 Subject: [PATCH 40/68] Added Wiki navigation icons and styled the article list view --- sass/discussion/_question-view.scss | 2 +- sass/wiki/_wiki.scss | 31 +++++++++++++++++++++++++++-- simplewiki_base.html | 22 ++++++++++---------- simplewiki_searchresults.html | 24 ++++++++++++---------- 4 files changed, 54 insertions(+), 25 deletions(-) diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 09cb76b8f4..70fd3c7cd8 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -106,7 +106,7 @@ div.question-header { div.post-update-container { display: inline-block; float: left; - width: flex-grid(1.8,8); + width: 20%; border-left: 1px dashed #ddd; div.post-update-info { diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 8078273514..3b131f846b 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -35,7 +35,6 @@ div.wiki-wrapper { @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include border-radius(0); @include transition(); - background: darken(#F6EFD4, 5%); border: 0; border-left: 1px solid darken(#f6efd4, 20%); color: darken(#F6EFD4, 80%); @@ -45,10 +44,24 @@ div.wiki-wrapper { text-transform: uppercase; letter-spacing: 1px; padding: 14px; + padding-left: 38px; margin: 0; + + &.view { + background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/view.png') no-repeat 12px 12px; + } + + &.history { + background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/history.png') no-repeat 12px 12px; + } + + &.edit { + background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/edit.png') no-repeat 12px 12px; + } + &:hover { - background: none; + background-color: #F6EFD4; } } } @@ -66,6 +79,20 @@ div.wiki-wrapper { line-height: 1.6em; } + ul.article-list { + margin-left: 15px; + + li { + margin: 10px 0; + list-style-image: url('/static/images/bullet-triangle.png'); + + h3 { + font-size: 18px; + font-weight: normal; + } + } + } + #wiki_history_table { tr.dark { background-color: $light-gray; diff --git a/simplewiki_base.html b/simplewiki_base.html index d77be2272e..81b88ec1b9 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -122,14 +122,14 @@
    10. -
      - -
      - -
      - - -
      +
      + +
      + +
      + + +
      11. @@ -149,15 +149,15 @@
      • - +
      • - +
      • - +
      %endif diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index c7d43dbeb5..ee67f365ff 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -5,24 +5,26 @@ <%block name="title">Search Results - MITx 6.002 Wiki <%! - from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse %> <%block name="wiki_page_title"> %if wiki_search_query: - Search results for ${wiki_search_query | h} +Search results for ${wiki_search_query | h} %else: - Displaying all articles +Displaying all articles %endif <%block name="wiki_body"> - %for article in wiki_search_results: - <% article_deleted = not article.current_revision.deleted == 0 %> - ${article.get_url()} ${'(Deleted)' if article_deleted else ''}
      - %endfor - - %if not wiki_search_results: - No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! - %endif +
        +%for article in wiki_search_results: +<% article_deleted = not article.current_revision.deleted == 0 %> +

      • ${article.title} ${'(Deleted)' if article_deleted else ''}

        • +%endfor + +%if not wiki_search_results: +No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! +%endif +
      From d7fff54080564f0e0fff80b8bc80b6f19e20aa3b Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 10:07:01 -0500 Subject: [PATCH 41/68] Removed date sorting and added question excerpts --- sass/discussion/_questions.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 4d3b1be05e..c6acfc05b7 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -138,6 +138,10 @@ ul.question-list, div#question-list { text-transform: none; } + p.excerpt { + color: #777; + } + div.user-info { display: inline-block; vertical-align: top; @@ -158,6 +162,8 @@ ul.question-list, div#question-list { } &.question-meta { + float: right; + margin-top: 10px; width: flex-grid(3.5,9); ul { From 8bb11c52afe1e746f521f100c025053146c4bc56 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 10:50:19 -0500 Subject: [PATCH 42/68] Fixed sidebar and question list layout in smaller resolutions --- sass/discussion/_discussion.scss | 1 + sass/discussion/_questions.scss | 11 +++++++---- sass/discussion/_sidebar.scss | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 1935711314..42d8350fef 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -39,6 +39,7 @@ body.askbot { div.discussion-content { @include box-sizing(border-box); display: table-cell; + min-width: 650px; padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index c6acfc05b7..7d82f8bbd5 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -87,11 +87,13 @@ div.question-list-header { } - ul.tags li { - background: #fff; + ul.tags { + li { + background: #fff; - &:before { - border-color: transparent #fff transparent transparent; + &:before { + border-color: transparent #fff transparent transparent; + } } } } @@ -145,6 +147,7 @@ ul.question-list, div#question-list { div.user-info { display: inline-block; vertical-align: top; + margin-bottom: 10px; span.relative-time { font-weight: normal; diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 47003ad4e7..fb007bab3b 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -7,6 +7,10 @@ div.discussion-wrapper aside { padding: lh(); width: flex-grid(3); + &.main-sidebar { + min-width:200px; + } + h1 { @extend .bottom-border; margin: (-(lh())) (-(lh())) 0; @@ -26,8 +30,15 @@ div.discussion-wrapper aside { box-shadow: none; } - input[type="text"] { - width: 76%; + div.inputs { + input[type="submit"] { + width: 27%; + float: right; + } + + input[type="text"] { + width: 62%; + } } div.box { From 919cf9b1da30172d1971871a3ea1488e6ed3324d Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 13:38:41 -0500 Subject: [PATCH 43/68] Fixed minor alignment and baseline issues --- sass/discussion/_questions.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 7d82f8bbd5..72e4e69444 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -42,7 +42,7 @@ div.question-list-header { div.question-sort { float: right; margin-left: flex-gutter(); - margin-top: 10px; + margin-top: 6px; nav { @extend .action-link; @@ -169,6 +169,7 @@ ul.question-list, div#question-list { margin-top: 10px; width: flex-grid(3.5,9); + ul { text-align: right; @@ -181,6 +182,10 @@ ul.question-list, div#question-list { margin-right: 10px; width: 60px; + &:last-child { + margin-right: 0px; + } + &:hover { span, div { color: #555; From 4a734bf1b5a1eb68142353d3722020b1704a816e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 15:02:37 -0500 Subject: [PATCH 44/68] Fixed wiki history table and header alignment issues --- sass/application.scss | 2 +- sass/wiki/_table.scss | 48 ++++++++++++++++++++++++ sass/wiki/_wiki.scss | 9 ++--- simplewiki_history.html | 83 +++++++++++++++++++++-------------------- 4 files changed, 94 insertions(+), 48 deletions(-) create mode 100644 sass/wiki/_table.scss diff --git a/sass/application.scss b/sass/application.scss index c3f529534e..65825e4de4 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -11,7 +11,7 @@ @import "textbook"; @import "info"; @import "profile"; -@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki"; +@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "help"; @import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile"; diff --git a/sass/wiki/_table.scss b/sass/wiki/_table.scss new file mode 100644 index 0000000000..ffb2796906 --- /dev/null +++ b/sass/wiki/_table.scss @@ -0,0 +1,48 @@ +table.wiki-history { + thead { + background: #ddd; + // border-bottom: 1px solid #ddd; + + tr { + height: 40px; + + th { + padding-top: 10px; + padding-left: 15px; + + &#revision { + width: 5%; + } + + &#comment { + width: 15%; + } + + &#diff { + width: 60%; + } + + &#modified { + width:20%; + } + } + } + } + tbody { + tr td { + padding: 8px 15px; + } + } + + tr.dark { + background-color: #efefef; + } +} + +div.history-controls { + margin-top: 20px; + + input[type="submit"] { + @extend .light-button; + } +} diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 3b131f846b..bff06a37a6 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -7,6 +7,8 @@ div.wiki-wrapper { header { @extend .topbar; + height:46px; + @include box-shadow(inset 0 1px 0 white); &:empty { display: none !important; @@ -43,7 +45,7 @@ div.wiki-wrapper { font-size: 12px; text-transform: uppercase; letter-spacing: 1px; - padding: 14px; + padding: 14.9px; padding-left: 38px; margin: 0; @@ -93,10 +95,5 @@ div.wiki-wrapper { } } - #wiki_history_table { - tr.dark { - background-color: $light-gray; - } - } } } diff --git a/simplewiki_history.html b/simplewiki_history.html index 87daba9f21..ddee16c1f6 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -17,7 +17,7 @@ ${ wiki_article.title }
      - +
      @@ -27,34 +27,34 @@ ${ wiki_article.title } - <% loopCount = 0 %> - %for revision in wiki_history: - %if revision.deleted < 2 or show_delete_revision: - <% loopCount += 1 %> - - - - - - - %endif + <% loopCount = 0 %> + %for revision in wiki_history: + %if revision.deleted < 2 or show_delete_revision: + <% loopCount += 1 %> + + + + + + + %endif %endfor %if wiki_prev_page or wiki_next_page: @@ -72,17 +72,18 @@ ${ wiki_article.title } %endif
      Revision
      - - - - ${ revision.revision_text if revision.revision_text else "None" } - %for x in revision.get_diff(): - ${x|h}
      - %endfor       		${revision.get_user()} -
      - ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} -
      + + + + ${ revision.revision_text if revision.revision_text else "None" } + %for x in revision.get_diff(): + ${x|h}
      + %endfor       		${revision.get_user()} +
      + ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} +
      - - -%if show_delete_revision: - - - - -%endif +
      + + %if show_delete_revision: + + + + + %endif +
      From 8b4979065dd7a67cb76750891da351faf53f6904 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 29 Feb 2012 15:50:29 -0500 Subject: [PATCH 45/68] Added new styles and color for profile graph --HG-- branch : kf-profile-graph --- profile_graphs.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/profile_graphs.js b/profile_graphs.js index 502c3c1469..0a5b68bdb2 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -9,15 +9,18 @@ $(function () { display: 'none', top: y + 5, left: x + 5, - border: '1px solid #fdd', - padding: '2px', - 'background-color': '#fee', + border: '1px solid #000', + padding: '4px 6px', + color: '#fff', + 'background-color': '#333', opacity: 0.90 }).appendTo("body").fadeIn(200); } /* -------------------------------- Grade detail bars -------------------------------- */ - var colors = [$.color.parse("#E8B800"), $.color.parse("#A0CEFA"), $.color.parse("#BD3738"), $.color.parse("#429A2E")]; + var colors = [ $.color.parse("#b72121"), $.color.parse("#600101"), $.color.parse("#666666"), $.color.parse("#333333")]; + // var colors = [ $.color.parse("#2e80ce"), $.color.parse("#14518b"), $.color.parse("#599535"), $.color.parse("#3d731c")]; + // var colors = [ $.color.parse("#3f80be"), $.color.parse("#128251"), $.color.parse("#e1b900"), $.color.parse("#d10404")]; //var colors = [$.color.parse("#1B2045"), $.color.parse("#557a00"), $.color.parse("#F5600"), $.color.parse("#FEBA2C")]; //var colors = [$.color.parse("#E7C856"), $.color.parse("#CD462E"), $.color.parse("#B01732"), $.color.parse("#41192A")]; //var colors = [$.color.parse("#434F5E"), $.color.parse("#BEF731"), $.color.parse("#FB5455"), $.color.parse("#44C4B7")]; @@ -76,7 +79,7 @@ $(function () { %endfor //Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up - series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red"} ); + series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "#333"} ); /* ----------------------------- Grade overviewew bar -------------------------*/ @@ -113,12 +116,12 @@ $(function () { var options = { series: {stack: true, lines: {show: false, steps: false }, - bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, + bars: {show: true, barWidth: 0.8, align: 'center', lineWidth: 0, fill: .8 },}, xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}, ticks: ticks, labelAngle: 90}, yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50}, grid: { hoverable: true, clickable: true, borderWidth: 1, - markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#EBFFD5"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#E6FFFF"}, - {yaxis: {from: 0.6, to: 0.7 }, color: "#FFF2E3"}, ] }, + markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#ddd"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#e9e9e9"}, + {yaxis: {from: 0.6, to: 0.7 }, color: "#f3f3f3"}, ] }, legend: {show: false}, }; From 4520b15da95ae3fed065f9e9cac9ffbded366b8f Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 16:05:50 -0500 Subject: [PATCH 46/68] Removed border from last course chapter in profile --- sass/_profile.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sass/_profile.scss b/sass/_profile.scss index 669daecffb..f696116ab8 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -76,6 +76,10 @@ div.profile-wrapper { padding: lh() 0; width: 100%; + &:last-child { + border-bottom: 0px; + } + h2 { border-right: 1px dashed #ddd; @include box-sizing(border-box); From cbfe2ae85162ea2a7646414d2de715eef7bc5fec Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 29 Feb 2012 16:52:01 -0500 Subject: [PATCH 47/68] Fixed https link --- activation_active.html | 2 +- activation_complete.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/activation_active.html b/activation_active.html index 5f2af64c21..c51cccbb70 100644 --- a/activation_active.html +++ b/activation_active.html @@ -8,6 +8,6 @@

      This account has already been activated. We will notify you as soon as the course starts.

      -

      For now you can go to the MITx homepage or the 6.002x course page.

      +

      For now you can go to the MITx homepage or the 6.002x course page.

      diff --git a/activation_complete.html b/activation_complete.html index f976f00239..1a46dc21a9 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -5,6 +5,6 @@

      Activation Complete!

      Thanks for activating your email. We will notify you as soon as the course starts.

      -

      For now you can go to the MITx homepage or the 6.002x course page.

      +

      For now you can go to the MITx homepage or the 6.002x course page.

      From 4c16563def07f402b0008724130edfc0d4a9f39e Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 29 Feb 2012 17:25:14 -0500 Subject: [PATCH 48/68] Removed long comment; browser bug was rendering part of it --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index d6fe0d288d..961cedaa30 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,6 @@

      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.

      -
      From 682a167c6569e0a621006f47faa535720b30fd2e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 10:00:12 -0500 Subject: [PATCH 49/68] Changed height and padding for wiki header --- sass/base/_extends.scss | 1 + sass/wiki/_wiki.scss | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 985365736d..ad2716ee2f 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,7 @@ h1.top-header { font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; text-shadow: 0 1px 0 #fff; + height:46px; @media print { display: none; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index bff06a37a6..60dd559a31 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -20,10 +20,10 @@ div.wiki-wrapper { p { float: left; - padding: 15px; + padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: 1em; + line-height: lh(); } ul { @@ -34,6 +34,7 @@ div.wiki-wrapper { float: left; input[type="button"] { + @extend .block-link; @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include border-radius(0); @include transition(); @@ -42,28 +43,31 @@ div.wiki-wrapper { color: darken(#F6EFD4, 80%); text-shadow: none; font-weight: normal; - font-size: 12px; - text-transform: uppercase; + // font-size: 12px; + // text-transform: uppercase; letter-spacing: 1px; - padding: 14.9px; + // padding: 14.9px; + padding: lh(.60) lh(); padding-left: 38px; margin: 0; - + background-position: 12px center; + background-color: darken(#F6EFD4, 5%); + background-repeat: no-repeat; &.view { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/view.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/view.png'); } &.history { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/history.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/history.png'); } &.edit { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/edit.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/edit.png'); } &:hover { - background-color: #F6EFD4; + background-color: transparent; } } } From f7996b58f8d611e3956c5a724d57509e9de0c915 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 11:35:32 -0500 Subject: [PATCH 50/68] added a fix for the wiki topbar --- sass/wiki/_wiki.scss | 1 + simplewiki_base.html | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 60dd559a31..2677ca34f2 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -12,6 +12,7 @@ div.wiki-wrapper { &:empty { display: none !important; + border-bottom: 0; } a { diff --git a/simplewiki_base.html b/simplewiki_base.html index 81b88ec1b9..996e59a9cd 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -137,31 +137,31 @@
      -
      %if wiki_article is not UNDEFINED: +
      %if wiki_article.locked: -

      This article has been locked

      +

      This article has been locked

      %endif -

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      +

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      %endif - %if wiki_article is not UNDEFINED: -
        + %if wiki_article is not UNDEFINED: +
          -
        • - -
          • +
        • + +
          • -
        • - -
          • +
        • + +
          • -
        • - -
          • -
        +
      • + +
        • +
      +
      %endif -

      <%block name="wiki_page_title"/>

      From 1987e8a29b970ec8b6e1ae0e914cdc5297814c92 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 11:39:18 -0500 Subject: [PATCH 51/68] tooltip lost styles --- sass/courseware/_sequence-nav.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 24d0687015..9270bf3a99 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -121,12 +121,12 @@ nav.sequence-nav { p { position: absolute; display: none; - background: #B3A87E; + background: #333; padding: 6px; white-space: pre-wrap; z-index: 99; margin: 4px 0 0 -5px; - text-shadow: 0 -1px 0 darken(#B3A87E, 10%); + text-shadow: 0 -1px 0 #000; color: #fff; &:empty { @@ -138,7 +138,7 @@ nav.sequence-nav { } &::after { - background: #B3A87E; + background: #333; content: " "; display: block; height: 10px; From 4d53b370d7f0e1b8135bf9bc40e3b5d255167c44 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 12:25:26 -0500 Subject: [PATCH 52/68] Edited the simple wiki templates to allow for more flexibility in title markup + changed the layout of search results --- sass/wiki/_wiki.scss | 74 ++++++++++++++++++++++++++++------- simplewiki_base.html | 7 ++-- simplewiki_create.html | 2 +- simplewiki_edit.html | 2 +- simplewiki_error.html | 2 +- simplewiki_history.html | 2 + simplewiki_searchresults.html | 4 ++ simplewiki_view.html | 2 +- 8 files changed, 73 insertions(+), 22 deletions(-) diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 60dd559a31..e97e89f1b9 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -3,7 +3,10 @@ div.wiki-wrapper { width: 100%; section.wiki-body { + @extend .clearfix; @extend .content; + position: relative; + header { @extend .topbar; @@ -74,27 +77,70 @@ div.wiki-wrapper { } } - h1.wiki-title { - font-weight: bold; - padding-bottom: 10px; - margin-bottom: 20px; - border-bottom: 1px solid #ccc; - } + h2.wiki-title { + margin-top: 0; + margin-bottom: 15px; + width: flex-grid(4, 9); + padding-right: flex-gutter(9); + border-right: 1px dashed #ddd; + @include box-sizing(border-box); + display: table-cell; + vertical-align: top; + + @media screen and (max-width:1120px) { + display: block; + width: auto; + border-right: 0; + } + + @media print { + display: block; + width: auto; + border-right: 0; + } + } p { line-height: 1.6em; } - ul.article-list { - margin-left: 15px; + section.results { + display: table-cell; + width: flex-grid(5, 9); + padding-left: flex-gutter(9); - li { - margin: 10px 0; - list-style-image: url('/static/images/bullet-triangle.png'); + @media screen and (max-width:1120px) { + display: block; + width: auto; + padding: 0; + } - h3 { - font-size: 18px; - font-weight: normal; + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + + ul.article-list { + margin-left: 15px; + + li { + list-style: none; + margin: 0; + padding: 10px 0; + border-bottom: 1px solid #eee; + + &:last-child { + border-bottom: 0; + } + h3 { + font-size: 18px; + font-weight: normal; + } } } } diff --git a/simplewiki_base.html b/simplewiki_base.html index 81b88ec1b9..db1120c15f 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -127,8 +127,8 @@
      - - + + @@ -163,8 +163,7 @@ %endif -

      <%block name="wiki_page_title"/>

      - + <%block name="wiki_page_title"/> <%block name="wiki_body"/>
      diff --git a/simplewiki_create.html b/simplewiki_create.html index a2161a22a7..6903c5ecd2 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -5,7 +5,7 @@ <%block name="title">Create Article - MITx 6.002 Wiki <%block name="wiki_page_title"> -Create article +

      Create article

      <%block name="wiki_body"> diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 54fe13fe24..50cc33d20c 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -5,7 +5,7 @@ <%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> -${ wiki_article.title } +

      ${ wiki_article.title }

      <%block name="wiki_head"> diff --git a/simplewiki_error.html b/simplewiki_error.html index 8b7324a998..73408349eb 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -10,7 +10,7 @@ <%block name="wiki_page_title"> -Oops... +

      Oops...

      diff --git a/simplewiki_history.html b/simplewiki_history.html index ddee16c1f6..9b7c9e11db 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -9,7 +9,9 @@ %> <%block name="wiki_page_title"> +

      ${ wiki_article.title } +

      <%block name="wiki_body"> diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index ee67f365ff..0b47bc08a2 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -9,14 +9,17 @@ from django.core.urlresolvers import reverse %> <%block name="wiki_page_title"> +

      %if wiki_search_query: Search results for ${wiki_search_query | h} %else: Displaying all articles %endif +

      <%block name="wiki_body"> +
        %for article in wiki_search_results: <% article_deleted = not article.current_revision.deleted == 0 %> @@ -27,4 +30,5 @@ Displaying all articles No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! %endif
      +
      diff --git a/simplewiki_view.html b/simplewiki_view.html index ef7b02d6b2..0421214a59 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -5,7 +5,7 @@ <%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> - ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} +

      ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}

      <%block name="wiki_body"> From f885cd85b6a1f5e44b754975215d4451b3dd7443 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 12:45:17 -0500 Subject: [PATCH 53/68] Fix styles for topbar --- sass/_textbook.scss | 2 +- sass/base/_extends.scss | 2 +- sass/courseware/_sequence-nav.scss | 2 +- sass/wiki/_wiki.scss | 24 +++++++++++------------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sass/_textbook.scss b/sass/_textbook.scss index 8943eb1064..f0e43cd523 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -54,7 +54,7 @@ div.book-wrapper { a { @extend .block-link; - padding: 14px; + padding: 0 lh(); } ul { diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index ad2716ee2f..2ac93d731e 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,7 @@ h1.top-header { font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; text-shadow: 0 1px 0 #fff; + line-height: 46px; height:46px; @media print { @@ -191,7 +192,6 @@ h1.top-header { border-left: 1px solid darken(#f6efd4, 20%); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); display: block; - padding: lh(.75); text-transform: uppercase; &:hover { diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 9270bf3a99..47b23adbc9 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -172,7 +172,7 @@ nav.sequence-nav { border-left: 1px solid darken(#f6efd4, 20%); cursor: pointer; display: table-cell; - padding: 14px 4px; + padding: 0 4px; text-indent: -9999px; width: 82px; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 2677ca34f2..5de3851cd0 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -24,7 +24,6 @@ div.wiki-wrapper { padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: lh(); } ul { @@ -36,24 +35,23 @@ div.wiki-wrapper { input[type="button"] { @extend .block-link; - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - @include border-radius(0); - @include transition(); + background-color: darken(#F6EFD4, 5%); + background-position: 12px center; + background-repeat: no-repeat; border: 0; border-left: 1px solid darken(#f6efd4, 20%); + @include border-radius(0); + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); color: darken(#F6EFD4, 80%); - text-shadow: none; font-weight: normal; - // font-size: 12px; - // text-transform: uppercase; + font-size: 12px; letter-spacing: 1px; - // padding: 14.9px; - padding: lh(.60) lh(); - padding-left: 38px; + line-height: 46px; margin: 0; - background-position: 12px center; - background-color: darken(#F6EFD4, 5%); - background-repeat: no-repeat; + padding: 0 lh() 0 38px; + text-shadow: none; + text-transform: uppercase; + @include transition(); &.view { background-image: url('/static/images/sequence-nav/view.png'); From d3460a8ed2dddf9cfeea5c7fb853e38222bff1f6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 13:37:44 -0500 Subject: [PATCH 54/68] Added fix for tooltips linehight --- sass/courseware/_sequence-nav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 47b23adbc9..6c605760f0 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -128,6 +128,7 @@ nav.sequence-nav { margin: 4px 0 0 -5px; text-shadow: 0 -1px 0 #000; color: #fff; + line-height: lh(); &:empty { background: none; From 5b8f0205bc6df0285ae0f98a03ae67d9b154724a Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 14:27:47 -0500 Subject: [PATCH 55/68] Minor adjustemnts to the topbar and Mathjax2 --- main.html | 2 +- sass/courseware/_sequence-nav.scss | 6 +++--- sass/wiki/_wiki.scss | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.html b/main.html index dea829f05f..b3c1d67a91 100644 --- a/main.html +++ b/main.html @@ -20,7 +20,7 @@ displayMath: [["\\[","\\]"]]} }); - + <%block name="headextra"/> diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 6c605760f0..99e29a39d2 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -24,9 +24,9 @@ nav.sequence-nav { } .visited { - background-color: shade(#F6EFD4, 10%); + background-color: #DCCDA2; background-repeat: no-repeat; - border-color: shade(#F6EFD4, 10%); + @include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); &:hover { background-color: #F6EFD4; @@ -52,7 +52,7 @@ nav.sequence-nav { border: none; border-right: 1px solid darken(#F6EFD4, 10%); cursor: pointer; - padding: 14px 4px; + padding: 15px 4px 14px; width: 28px; height: 17px; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 850099fc4e..4e88811dc7 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -24,9 +24,10 @@ div.wiki-wrapper { p { float: left; - padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); + line-height: 46px; + padding-left: lh(); } ul { @@ -46,6 +47,7 @@ div.wiki-wrapper { @include border-radius(0); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); color: darken(#F6EFD4, 80%); + display: block; font-weight: normal; font-size: 12px; letter-spacing: 1px; From 068e9eadeca717ecc47fefec6e5f6dad3a4976f1 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 15:30:56 -0500 Subject: [PATCH 56/68] Adde new warning messages for userers IE8 and under --- create_account.html | 3 ++- login.html | 3 +++ main.html | 3 +++ sass/base/_extends.scss | 9 +++++++++ sass/index/_extends.scss | 7 +++++++ sass/layout/_leanmodal.scss | 4 ---- sass/marketing-ie.scss | 5 ----- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/create_account.html b/create_account.html index 3a57707693..40cfaacd1c 100644 --- a/create_account.html +++ b/create_account.html @@ -2,8 +2,9 @@

      Enroll in 6.002x Circuits & Electronics

      - +
      <% if 'error' in locals(): e = error %> diff --git a/login.html b/login.html index abf59aae74..0372532284 100644 --- a/login.html +++ b/login.html @@ -4,6 +4,9 @@

      Log in to MITx

      +
        diff --git a/main.html b/main.html index b3c1d67a91..888fb82903 100644 --- a/main.html +++ b/main.html @@ -27,6 +27,9 @@ "> + ${self.body()} <%block name="bodyextra"/> diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 2ac93d731e..d55fe62f96 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -204,3 +204,12 @@ h1.top-header { .tran { @include transition( all, .2s, $ease-in-out-quad); } + +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + padding: lh(); + text-align: left; + margin-bottom: 0; +} diff --git a/sass/index/_extends.scss b/sass/index/_extends.scss index eaeb34a9e8..04bd5b83b6 100644 --- a/sass/index/_extends.scss +++ b/sass/index/_extends.scss @@ -85,3 +85,10 @@ } } +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + margin-bottom: lh(); + padding: lh(); +} diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index b344fbf9b9..b9399a39e4 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -47,10 +47,6 @@ div.leanModal_box { &#enroll { max-width: 600px; - p.ie-warning { - display: none; - } - ol { @extend .clearfix; padding-top: lh(); diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss index 43c1e06f12..c92fd2f7fb 100644 --- a/sass/marketing-ie.scss +++ b/sass/marketing-ie.scss @@ -9,11 +9,6 @@ body { } div#enroll { - p.ie-warning { - display: block !important; - line-height: 1.3em; - } - form { display: none; } From 9a109167caac0acfb25f3ca3e9bbd675edf78244 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 15:47:56 -0500 Subject: [PATCH 57/68] Added badges styling --- sass/application.scss | 2 +- sass/discussion/_askbot-original.scss | 120 +++++++++++++------------- sass/discussion/_badges.scss | 69 +++++++++++++++ sass/discussion/_profile.scss | 4 + 4 files changed, 134 insertions(+), 61 deletions(-) create mode 100644 sass/discussion/_badges.scss diff --git a/sass/application.scss b/sass/application.scss index 65825e4de4..d4b2d01a84 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -14,4 +14,4 @@ @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "help"; -@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile"; +@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile", "discussion/badges"; diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index 3fccf8ccb0..66b59855e1 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -1652,73 +1652,73 @@ body.anon #searchbar { // padding: 5px; // margin: 0px 0 10px 0; } } -@media screen and (-webkit-min-device-pixel-ratio:0) { - textarea { - padding-left: 3px !important; } } +// @media screen and (-webkit-min-device-pixel-ratio:0) { +// textarea { +// padding-left: 3px !important; } } -.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { - background: url(../images/socialsprite.png) no-repeat; - display: block; - text-indent: -100em; - height: 25px; - width: 25px; - margin-bottom: 3px; } +// .facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { +// background: url(../images/socialsprite.png) no-repeat; +// display: block; +// text-indent: -100em; +// height: 25px; +// width: 25px; +// margin-bottom: 3px; } -.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { - opacity: 0.8; - filter: alpha(opacity = 80); } +// .facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { +// opacity: 0.8; +// filter: alpha(opacity = 80); } -.facebook-share.icon { - background-position: -26px 0px; } +// .facebook-share.icon { +// background-position: -26px 0px; } -.identica-share.icon { - background-position: -78px 0px; } +// .identica-share.icon { +// background-position: -78px 0px; } -.twitter-share.icon { - margin-top: 10px; - background-position: 0px 0px; } +// .twitter-share.icon { +// margin-top: 10px; +// background-position: 0px 0px; } -.linkedin-share.icon { - background-position: -52px 0px; } +// .linkedin-share.icon { +// background-position: -52px 0px; } -.openid-signin, .meta, .users-page, .user-profile-edit-page { - font-size: 13px; - line-height: 1.3; - color: #525252; } +// .openid-signin, .meta, .users-page, .user-profile-edit-page { +// font-size: 13px; +// line-height: 1.3; +// color: #525252; } -.openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { - font-size: 13px; - color: #707070; - line-height: 1.3; - font-family: arial; - color: #525252; - margin-bottom: 12px; } +// .openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { +// font-size: 13px; +// color: #707070; +// line-height: 1.3; +// font-family: arial; +// color: #525252; +// margin-bottom: 12px; } -.openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { - color: #525252; - padding-left: 0px; - font-size: 16px; } +// .openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { +// color: #525252; +// padding-left: 0px; +// font-size: 16px; } -.openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { - margin-bottom: 15px; } +// .openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { +// margin-bottom: 15px; } -.openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { - border: #cce6ec 3px solid; - height: 25px; - padding-left: 5px; - width: 395px; - font-size: 14px; } +// .openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { +// border: #cce6ec 3px solid; +// height: 25px; +// padding-left: 5px; +// width: 395px; +// font-size: 14px; } -.openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { - width: 405px; - height: 30px; } +// .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { +// width: 405px; +// height: 30px; } -.openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { - border: #cce6ec 3px solid; - padding-left: 5px; - padding-top: 5px; - width: 395px; - font-size: 14px; } +// .openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { +// border: #cce6ec 3px solid; +// padding-left: 5px; +// padding-top: 5px; +// width: 395px; +// font-size: 14px; } // .openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { // background: url(../images/small-button-blue.png) repeat-x top; @@ -2327,14 +2327,14 @@ label.retag-error { .hilite3 { background-color: #0ff; } -.gold, .badge1 { - color: #ffcc00; } +// .gold, .badge1 { +// color: #ffcc00; } -.silver, .badge2 { - color: #cccccc; } +// .silver, .badge2 { +// color: #cccccc; } -.bronze, .badge3 { - color: #cc9933; } +// .bronze, .badge3 { +// color: #cc9933; } .score { font-weight: 800; diff --git a/sass/discussion/_badges.scss b/sass/discussion/_badges.scss new file mode 100644 index 0000000000..13adb85b74 --- /dev/null +++ b/sass/discussion/_badges.scss @@ -0,0 +1,69 @@ +div.badges-intro { + margin: 20px 0; +} + +div.badge-intro { + @extend .badges-intro; + .badge1, .badge2, .badge3 { + font-size: 20px; + } +} + +ul.badge-list { + li.badge { + border-bottom: 1px solid #eee; + @extend .clearfix; + list-style: none; + padding: 10px 0; + + &:last-child { + border-bottom: 0; + } + + div.check { + float:right; + min-width:flex-grid(1,9); + text-align:right; + + span { + font-size:19px; + padding-right:5px; + color:green; + } + } + div.badge-name { + float:left; + width:flex-grid(3,9); + + span { + font-size: 20px; + } + } + + p { + margin: 0; + float:left; + } + } +} + +.gold, .badge1 { + color: #ffcc00; +} + +.silver, .badge2 { + color: #cccccc; +} + +.bronze, .badge3 { + color: #cc9933; +} +div.badge-desc { + > div { + margin-bottom: 20px; + span { + font-size: 18px; + @include border-radius(10px); + } + } +} diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 8b9ef2562f..dcf765aaf0 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -29,6 +29,10 @@ body.user-profile-page { &.votes-badges { width: flex-grid(2,9); + p { + margin-top: 15px; + } + } &.answer-list { From 3f09848a056619e486f058f822dd71358fc726cf Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 16:21:04 -0500 Subject: [PATCH 58/68] Fixed article list width bug --- sass/wiki/_wiki.scss | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 4e88811dc7..9a8788bdd4 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -79,16 +79,16 @@ div.wiki-wrapper { } h2.wiki-title { - margin-top: 0; - margin-bottom: 15px; - width: flex-grid(4, 9); - padding-right: flex-gutter(9); - border-right: 1px dashed #ddd; @include box-sizing(border-box); - display: table-cell; + display: inline-block; + float: left; + margin-bottom: 15px; + margin-top: 0; + padding-right: flex-gutter(9); vertical-align: top; + width: flex-grid(2.5, 9); - @media screen and (max-width:1120px) { + @media screen and (max-width:900px) { display: block; width: auto; border-right: 0; @@ -106,14 +106,19 @@ div.wiki-wrapper { } section.results { - display: table-cell; - width: flex-grid(5, 9); - padding-left: flex-gutter(9); + @include box-sizing(border-box); + display: inline-block; + border-left: 1px dashed #ddd; + float: left; + padding-left: 10px; + width: flex-grid(6.5, 9); - @media screen and (max-width:1120px) { + @media screen and (max-width:900px) { + border: 0; display: block; + padding-left: 0; + width: 100%; width: auto; - padding: 0; } @media print { @@ -128,6 +133,11 @@ div.wiki-wrapper { ul.article-list { margin-left: 15px; + width: 100%; + + @media screen and (max-width:900px) { + margin-left: 0px; + } li { list-style: none; From b71ff071422e181ba5ad6e5ae12b3231443e5d53 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sat, 3 Mar 2012 17:39:22 -0500 Subject: [PATCH 59/68] More info on browsers, redirect to /info --- help.html | 2 +- marketing.html | 2 +- mitx_help.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/help.html b/help.html index 175c6a9252..0a88b9b55e 100644 --- a/help.html +++ b/help.html @@ -22,7 +22,7 @@
        System-related questions
        -
        technical@mitx.mit.edu
        +
        technical@mitx.mit.edu -- For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details.
        Content-related questions
        content@mitx.mit.edu
        Bug reports
        diff --git a/marketing.html b/marketing.html index 8cbbb3e2fc..88ff5199e1 100644 --- a/marketing.html +++ b/marketing.html @@ -134,7 +134,7 @@ $(document).ready(function(){ submit_data, function(json) { if(json.success) { - location.href="/courseware"; + location.href="/info"; } else if($('#login_error').length == 0) { $('#login_form').prepend('
        Email or password is incorrect.
        '); } else { diff --git a/mitx_help.html b/mitx_help.html index a9ec20eb44..64c22cfff4 100644 --- a/mitx_help.html +++ b/mitx_help.html @@ -11,7 +11,7 @@ reach us at:

        System-related questions
        -
        technical@mitx.mit.edu
        +
        technical@mitx.mit.edu -- For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details.
        Content-related questions
        content@mitx.mit.edu
        Bug reports
        From d321eb873a354bf9d648e1500dc8f6f490cae1cd Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sat, 3 Mar 2012 18:02:16 -0500 Subject: [PATCH 60/68] info files now referenced explicitly instead of symlink --- info.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.html b/info.html index 4f5336432b..6171e90b0c 100644 --- a/info.html +++ b/info.html @@ -5,10 +5,10 @@
        - <%include file="info_files/updates.html" /> + <%include file="updates.html" />
        - <%include file="info_files/handouts.html" /> + <%include file="handouts.html" />
        From c636264196ab085815507785fdf9d9e4458a7b4a Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Sat, 3 Mar 2012 23:49:20 -0500 Subject: [PATCH 61/68] Changed the wiki titles to say 6.002x (they were missing the x) --- simplewiki_create.html | 2 +- simplewiki_edit.html | 2 +- simplewiki_error.html | 2 +- simplewiki_history.html | 2 +- simplewiki_searchresults.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simplewiki_create.html b/simplewiki_create.html index 6903c5ecd2..9c29c214b2 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Create Article - MITx 6.002 Wiki +<%block name="title">Create Article - MITx 6.002x Wiki <%block name="wiki_page_title">

        Create article

        diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 50cc33d20c..435870071d 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%block name="wiki_page_title">

        ${ wiki_article.title }

        diff --git a/simplewiki_error.html b/simplewiki_error.html index 73408349eb..cdb46c1a0f 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse %> -<%block name="title">Oops... - MITx 6.002 Wiki +<%block name="title">Oops... - MITx 6.002x Wiki <%block name="wiki_page_title"> diff --git a/simplewiki_history.html b/simplewiki_history.html index 9b7c9e11db..9385ff8d87 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%! from django.core.urlresolvers import reverse diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index 0b47bc08a2..fa4f699d9f 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Search Results - MITx 6.002 Wiki +<%block name="title">Search Results - MITx 6.002x Wiki <%! from django.core.urlresolvers import reverse From ad8969746deee7107c51ae43569e742f46e6e8d3 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 10:17:20 -0500 Subject: [PATCH 62/68] Remove info files, change Youtube to use https --- info_files | 1 - video_init.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 info_files diff --git a/info_files b/info_files deleted file mode 120000 index d5782be16c..0000000000 --- a/info_files +++ /dev/null @@ -1 +0,0 @@ -../data/info/ \ No newline at end of file diff --git a/video_init.js b/video_init.js index 5ed773b98f..897f4cfd85 100644 --- a/video_init.js +++ b/video_init.js @@ -5,7 +5,7 @@ var atts = { id: "myytplayer" }; // If the user doesn't have flash, use the HTML5 Video instead. YouTube's // iFrame API which supports HTML5 is still developmental so it is not default if (swfobject.hasFlashPlayerVersion("10.1")){ - swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent", + swfobject.embedSWF(document.location.protocol + "//www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent", "ytapiplayer", "640", "385", "8", null, null, params, atts); } else { @@ -14,7 +14,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){ $("#html5_player").show(); var tag = document.createElement('script'); - tag.src = "http://www.youtube.com/player_api"; + tag.src = document.location.protocol + "//www.youtube.com/player_api"; var firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); // Make sure the callback is called once API ready, YT seems to be buggy From 2c81042f992defe46aacbbbd8428abfca537dd0d Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 10:46:44 -0500 Subject: [PATCH 63/68] Help text clarification --- help.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/help.html b/help.html index 0a88b9b55e..cc962a6fc7 100644 --- a/help.html +++ b/help.html @@ -22,7 +22,7 @@
        System-related questions
        -
        technical@mitx.mit.edu -- For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details.
        +
        technical@mitx.mit.edu
        Content-related questions
        content@mitx.mit.edu
        Bug reports
        @@ -31,7 +31,12 @@
        suggestions@mitx.mit.edu
        -

        Please bear in mind that while we read them, we do not expect to - have time to respond to all e-mails.

        +

        Please bear in mind that while we read them, we do not + expect to have time to respond to all e-mails. For technical + questions, please make sure you are using the latest version + of Firefox + or Chrome, and + include browser and version in your e-mail, as well as + screenshots or other pertinent details.

      From 83eab20221a1fa922873e4002d3decea93d22ac9 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 11:34:14 -0500 Subject: [PATCH 64/68] 6002->6002x --- simplewiki_view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplewiki_view.html b/simplewiki_view.html index 0421214a59..1f45515a6d 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%block name="wiki_page_title">

      ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}

      From 84e23af9f4c831c7b77c425c9eadf7a58c09d391 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 12:03:24 -0500 Subject: [PATCH 65/68] More self-help --- 6002x-faq.html | 23 +++++++++++++++++++++-- help.html | 9 ++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index d01c011a6d..964d01b87f 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -26,13 +26,31 @@ someone else already signed up with that username. Try a different, more unique username. For example, try adding a random number to the end.

      +

      I forgot my password

      + +

      The log-in form will have a link to reset your password once the +course opens.

      + +

      The videos stall out

      + +

      You should confirm your internet connection is fast enough to stream +videos, and that Youtube is not blocked by your internet +provider. Since the videos are hosted by YouTube, we have no control +over most technical problems with video playback (aside from those +related specifically to our player).

      + +

      You should also confirm you have a current version of Flash +installed. While our player supports YouTube's HTML5 API (which allows +playback without Flash), this support is experimental, and YouTube can +(and occasionally does) introduce bugs.

      +

      I am interested in a different subject. What other courses do you offer?

      6.002x is the pilot course for MITx. While we plan to offer a range of courses in the future, at present, 6.002x is the only course -available.

      +available. Specific future offerings will be announced later.

      How will I know that the course has started?

      @@ -64,7 +82,8 @@ of acknowledgement that I have enrolled. most common issues are:
      • Typo in e-mail address -
      • Old browser. We recommend trying a modern version of Firefox or Chrome +
      • Old browser. We recommend downloading the current version of +Firefox or Chrome. The course requires a modern browser.
      • JavaScript disabled
      • Activation e-mail in spam folder. Check spam folder.
      • Non-unique username. Try adding a random string at the end. diff --git a/help.html b/help.html index cc962a6fc7..b542829c1b 100644 --- a/help.html +++ b/help.html @@ -9,7 +9,14 @@

        Self-help

        From ecfd3ace0724e678f1da4d412cbde27755173a9d Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 12:22:12 -0500 Subject: [PATCH 66/68] Anant's better phrasing for video --- 6002x-faq.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index 964d01b87f..5d4319ca96 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -39,10 +39,9 @@ provider. Since the videos are hosted by YouTube, we have no control over most technical problems with video playback (aside from those related specifically to our player).

        -

        You should also confirm you have a current version of Flash -installed. While our player supports YouTube's HTML5 API (which allows -playback without Flash), this support is experimental, and YouTube can -(and occasionally does) introduce bugs.

        +

        You should also confirm you have a current version of Flash installed. +While our player supports YouTube's HTML5 API (which allows playback without +Flash), this support is experimental.

        I am interested in a different subject. What other courses do From 1ee30d28a42f68f5e60accdbcf8f4666fc17aa9a Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 12:53:31 -0500 Subject: [PATCH 67/68] No course credit --- 6002x-faq.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index 5d4319ca96..cd817014a6 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -302,10 +302,11 @@ What is a credential?

        Any learner who successfully completes 6.002x will receive an electronic certificate indicating a grade. 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. +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. MITx certificates are not +planned to count towards MIT course credit.

        From 8ebb6273d90a4d30bb3e4c92a051f90ad058f270 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 4 Mar 2012 13:01:11 -0500 Subject: [PATCH 68/68] Can't log in updated --- 6002x-faq.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index cd817014a6..73e04e8a7e 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -61,10 +61,13 @@ so you can login, begin to get familiar with the site and start the course.

        -

        Why is there no log-in button?

        +

        I can't log in

        You will not be able to log into the course until either the -starting date, or shortly before.

        +starting date, or shortly before. If you have problems logging in once +the course has started, please verify that you are using the latest +version of either Firefox or Google Chrome, and have JavaScript and +cookies enabled.

        Does the class have a schedule?