Commit 8b64dd6a by Tom Giannattasio Committed by Ibrahim Awwal

new inline thread styles

parent 5841bdce
...@@ -193,6 +193,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView ...@@ -193,6 +193,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView
expandPost: (event) -> expandPost: (event) ->
@expanded = true @expanded = true
@$el.addClass('expanded')
@$el.find('.post-body').html(@model.get('body')) @$el.find('.post-body').html(@model.get('body'))
@convertMath() @convertMath()
@$el.find('.expand-post').css('display', 'none') @$el.find('.expand-post').css('display', 'none')
...@@ -204,6 +205,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView ...@@ -204,6 +205,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView
collapsePost: (event) -> collapsePost: (event) ->
@expanded = false @expanded = false
@$el.removeClass('expanded')
@$el.find('.post-body').html(@model.get('abbreviatedBody')) @$el.find('.post-body').html(@model.get('abbreviatedBody'))
@convertMath() @convertMath()
@$el.find('.collapse-post').css('display', 'none') @$el.find('.collapse-post').css('display', 'none')
......
...@@ -1570,11 +1570,18 @@ body.discussion { ...@@ -1570,11 +1570,18 @@ body.discussion {
.discussion-module { .discussion-module {
@extend .discussion-body; @extend .discussion-body;
margin: 20px 0;
padding: 20px;
background: #f6f6f6 !important;
border-radius: 3px;
.discussion-show { .discussion-show {
@include white-button; @include white-button;
display: inline-block; display: block;
} width: 200px;
margin: auto;
text-align: center;
}
.new-post-btn { .new-post-btn {
display: inline-block; display: inline-block;
...@@ -1585,21 +1592,44 @@ body.discussion { ...@@ -1585,21 +1592,44 @@ body.discussion {
/* Course content p has a default margin-bottom of 1.416em, this is just to reset that */ /* Course content p has a default margin-bottom of 1.416em, this is just to reset that */
.discussion-thread { .discussion-thread {
padding: 0.5em 0; padding: 0;
@include transition(all .25s);
.dogear,
.vote-btn {
display: none;
}
&.expanded {
padding: 20px 0;
.dogear,
.vote-btn {
display: block;
}
.discussion-article {
border: 1px solid #b2b2b2;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
border-radius: 3px;
}
}
p { p {
margin-bottom: 0em; margin-bottom: 0em;
} }
.discussion-article { .discussion-article {
border: 1px solid #b2b2b2; border: 1px solid #ddd;
border-radius: 3px; border-bottom-width: 0;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); background: #fff;
min-height: 0; min-height: 0;
padding: 10px 10px 40px; padding: 10px 10px 15px 10px;
box-shadow: 0 1px 0 #ddd;
@include transition(all .2s);
.discussion-post { .discussion-post {
padding: 17px 23px; padding: 12px 20px 0 20px;
@include clearfix; @include clearfix;
header { header {
...@@ -1607,10 +1637,14 @@ body.discussion { ...@@ -1607,10 +1637,14 @@ body.discussion {
margin-bottom: 15px; margin-bottom: 15px;
h3 { h3 {
font-size: 22px; font-size: 19px;
font-weight: 700; font-weight: 700;
margin-bottom: 0px; margin-bottom: 0px;
} }
h4 {
font-size: 16px;
}
} }
.post-body { .post-body {
...@@ -1620,18 +1654,10 @@ body.discussion { ...@@ -1620,18 +1654,10 @@ body.discussion {
} }
.post-tools { .post-tools {
position: absolute; margin-left: 20px;
bottom: 0;
left: 0;
width: 100%;
border-radius: 0 0 3px 3px;
border-top: 1px solid #ddd;
@include linear-gradient(top, #f2f2f2, #e2e2e2);
a { a {
display: block; display: block;
width: 100%;
text-align: center;
font-size: 12px; font-size: 12px;
line-height: 30px; line-height: 30px;
......
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