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..65825e4de4 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -4,14 +4,14 @@ @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"; @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/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 0836d07158..cc176b71b1 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -143,42 +143,28 @@ 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(); } } } 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/_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..70fd3c7cd8 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); } } } @@ -99,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 { @@ -319,6 +326,5 @@ div.share-question { p { padding: 0; margin: 0; - font-weight: bold; } } diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 4d3b1be05e..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; @@ -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; + } } } } @@ -138,9 +140,14 @@ ul.question-list, div#question-list { text-transform: none; } + p.excerpt { + color: #777; + } + div.user-info { display: inline-block; vertical-align: top; + margin-bottom: 10px; span.relative-time { font-weight: normal; @@ -158,8 +165,11 @@ ul.question-list, div#question-list { } &.question-meta { + float: right; + margin-top: 10px; width: flex-grid(3.5,9); + ul { text-align: right; @@ -172,6 +182,10 @@ ul.question-list, div#question-list { margin-right: 10px; width: 60px; + &:last-child { + margin-right: 0px; + } + &:hover { span, div { color: #555; diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index c5dd987d1d..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 { @@ -283,6 +294,11 @@ div.discussion-wrapper aside { text-align: center; padding: 10px; display: block; + margin-top: 10px; + + &:first-child { + margin-top: 0; + } span { font-weight: bold; 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 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 8078273514..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; @@ -35,7 +37,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%); @@ -44,11 +45,25 @@ div.wiki-wrapper { font-size: 12px; text-transform: uppercase; letter-spacing: 1px; - padding: 14px; + padding: 14.9px; + 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,10 +81,19 @@ div.wiki-wrapper { line-height: 1.6em; } - #wiki_history_table { - tr.dark { - background-color: $light-gray; + 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; + } } } + } } 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/simplewiki_base.html b/simplewiki_base.html index d77be2272e..81b88ec1b9 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -122,14 +122,14 @@
  • -
    - -
    - -
    - - -
    +
    + +
    + +
    + + +
    • @@ -149,15 +149,15 @@ %endif 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 +
    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 + diff --git a/video.html b/video.html index b5ac71ba55..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; - }); });