Skip to content

E
edx-platform
Commit baee9f96 by Ned Batchelder
Options

Merge branch 'master' of github.com:MITx/mitx

parents 78d3d200 e07b667c
Showing with 7 additions and 5 deletions
common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
...@@ -50,7 +50,7 @@ if Backbone? ...@@ -50,7 +50,7 @@ if Backbone?
convertMath: -> convertMath: ->
element = @$(".post-body") element = @$(".post-body")
element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.text()
MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]] MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
renderResponses: -> renderResponses: ->
......
common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
...@@ -47,7 +47,7 @@ if Backbone? ...@@ -47,7 +47,7 @@ if Backbone?
convertMath: -> convertMath: ->
element = @$(".post-body") element = @$(".post-body")
element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.text()
MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]] MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
toggleVote: (event) -> toggleVote: (event) ->
......
common/static/coffee/src/discussion/views/response_comment_show_view.coffee
...@@ -26,7 +26,7 @@ if Backbone? ...@@ -26,7 +26,7 @@ if Backbone?
convertMath: -> convertMath: ->
body = @$el.find(".response-body") body = @$el.find(".response-body")
body.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight body.html() body.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight body.text()
MathJax.Hub.Queue ["Typeset", MathJax.Hub, body[0]] MathJax.Hub.Queue ["Typeset", MathJax.Hub, body[0]]
markAsStaff: -> markAsStaff: ->
......
common/static/coffee/src/discussion/views/thread_response_show_view.coffee
...@@ -30,7 +30,7 @@ if Backbone? ...@@ -30,7 +30,7 @@ if Backbone?
convertMath: -> convertMath: ->
element = @$(".response-body") element = @$(".response-body")
element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.text()
MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]] MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
markAsStaff: -> markAsStaff: ->
......
lms/static/sass/course/courseware/_sidebar.scss
...@@ -67,7 +67,7 @@ section.course-index { ...@@ -67,7 +67,7 @@ section.course-index {
} }
.chapter { .chapter {
width: 100%; width: 100% !important;
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 11px 14px; padding: 11px 14px;
@include linear-gradient(top, rgba(255, 255, 255, .6), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .6), rgba(255, 255, 255, 0));
...@@ -99,6 +99,8 @@ section.course-index { ...@@ -99,6 +99,8 @@ section.course-index {
@include border-radius(0); @include border-radius(0);
margin: 0; margin: 0;
padding: 9px 0 9px 9px; padding: 9px 0 9px 9px;
overflow: auto;
width: 100%;
li { li {
border-bottom: 0; border-bottom: 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment