Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
8b64dd6a
Commit
8b64dd6a
authored
Sep 10, 2012
by
Tom Giannattasio
Committed by
Ibrahim Awwal
Sep 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new inline thread styles
parent
5841bdce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
18 deletions
+46
-18
lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee
+2
-0
lms/static/sass/_discussion.scss
+44
-18
No files found.
lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee
View file @
8b64dd6a
...
...
@@ -193,6 +193,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView
expandPost
:
(
event
)
->
@
expanded
=
true
@
$el
.
addClass
(
'expanded'
)
@
$el
.
find
(
'.post-body'
).
html
(
@
model
.
get
(
'body'
))
@
convertMath
()
@
$el
.
find
(
'.expand-post'
).
css
(
'display'
,
'none'
)
...
...
@@ -204,6 +205,7 @@ class @DiscussionThreadInlineView extends DiscussionContentView
collapsePost
:
(
event
)
->
@
expanded
=
false
@
$el
.
removeClass
(
'expanded'
)
@
$el
.
find
(
'.post-body'
).
html
(
@
model
.
get
(
'abbreviatedBody'
))
@
convertMath
()
@
$el
.
find
(
'.collapse-post'
).
css
(
'display'
,
'none'
)
...
...
lms/static/sass/_discussion.scss
View file @
8b64dd6a
...
...
@@ -1570,11 +1570,18 @@ body.discussion {
.discussion-module
{
@extend
.discussion-body
;
margin
:
20px
0
;
padding
:
20px
;
background
:
#f6f6f6
!
important
;
border-radius
:
3px
;
.discussion-show
{
@include
white-button
;
display
:
inline-block
;
}
display
:
block
;
width
:
200px
;
margin
:
auto
;
text-align
:
center
;
}
.new-post-btn
{
display
:
inline-block
;
...
...
@@ -1585,21 +1592,44 @@ body.discussion {
/* Course content p has a default margin-bottom of 1.416em, this is just to reset that */
.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
{
margin-bottom
:
0em
;
}
.discussion-article
{
border
:
1px
solid
#
b2b2b2
;
border-
radius
:
3px
;
b
ox-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0
.15
)
;
border
:
1px
solid
#
ddd
;
border-
bottom-width
:
0
;
b
ackground
:
#fff
;
min-height
:
0
;
padding
:
10px
10px
40px
;
padding
:
10px
10px
15px
10px
;
box-shadow
:
0
1px
0
#ddd
;
@include
transition
(
all
.2s
);
.discussion-post
{
padding
:
1
7px
23
px
;
padding
:
1
2px
20px
0
20
px
;
@include
clearfix
;
header
{
...
...
@@ -1607,10 +1637,14 @@ body.discussion {
margin-bottom
:
15px
;
h3
{
font-size
:
22
px
;
font-size
:
19
px
;
font-weight
:
700
;
margin-bottom
:
0px
;
}
h4
{
font-size
:
16px
;
}
}
.post-body
{
...
...
@@ -1620,18 +1654,10 @@ body.discussion {
}
.post-tools
{
position
:
absolute
;
bottom
:
0
;
left
:
0
;
width
:
100%
;
border-radius
:
0
0
3px
3px
;
border-top
:
1px
solid
#ddd
;
@include
linear-gradient
(
top
,
#f2f2f2
,
#e2e2e2
);
margin-left
:
20px
;
a
{
display
:
block
;
width
:
100%
;
text-align
:
center
;
font-size
:
12px
;
line-height
:
30px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment