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
52d5de5b
Commit
52d5de5b
authored
Dec 13, 2016
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More discussion styles
parent
13eee1c1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
15 deletions
+28
-15
common/static/common/templates/discussion/thread-response-show.underscore
+1
-1
common/static/common/templates/discussion/thread-show.underscore
+1
-1
lms/static/sass/discussion/_mixins.scss
+4
-4
lms/static/sass/discussion/utilities/_shame.scss
+15
-1
lms/static/sass/discussion/views/_response.scss
+1
-2
lms/static/sass/discussion/views/_thread.scss
+6
-6
No files found.
common/static/common/templates/discussion/thread-response-show.underscore
View file @
52d5de5b
<header class="
wrapper-
response-header">
<header class="response-header">
<div class="response-header-content">
<div class="response-header-content">
<%= author_display %>
<%= author_display %>
<p class="posted-details">
<p class="posted-details">
...
...
common/static/common/templates/discussion/thread-show.underscore
View file @
52d5de5b
<div class="discussion-post">
<div class="discussion-post">
<header class="
wrapper-
post-header">
<header class="post-header">
<% if (!readOnly) { %>
<% if (!readOnly) { %>
<div class="post-header-actions post-extended-content">
<div class="post-header-actions post-extended-content">
<%=
<%=
...
...
lms/static/sass/discussion/_mixins.scss
View file @
52d5de5b
...
@@ -43,16 +43,16 @@
...
@@ -43,16 +43,16 @@
@mixin
discussion-wmd-preview-container
{
@mixin
discussion-wmd-preview-container
{
@include
border-radius
(
0
,
0
,
$forum-border-radius
,
$forum-border-radius
);
@include
border-radius
(
0
,
0
,
$forum-border-radius
,
$forum-border-radius
);
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border
:
1px
solid
$
gray-l1
;
border
:
1px
solid
$
forum-color-border
;
border-top
:
none
;
border-top
:
none
;
width
:
100%
;
width
:
100%
;
background
:
$
gray-l4
;
background
:
$
forum-color-background-light
;
box-shadow
:
0
1px
3px
$shadow-l1
inset
;
box-shadow
:
0
1px
3px
$shadow-l1
inset
;
}
}
@mixin
discussion-new-post-wmd-preview-container
{
@mixin
discussion-new-post-wmd-preview-container
{
@include
discussion-wmd-preview-container
;
@include
discussion-wmd-preview-container
;
border-color
:
$
gray-d3
;
border-color
:
$
forum-color-border
;
box-shadow
:
0
1px
3px
$shadow-d1
inset
;
box-shadow
:
0
1px
3px
$shadow-d1
inset
;
}
}
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
@mixin
discussion-wmd-preview
{
@mixin
discussion-wmd-preview
{
padding
:
(
$baseline
/
2
)
$baseline
;
padding
:
(
$baseline
/
2
)
$baseline
;
width
:
auto
;
width
:
auto
;
color
:
$
gray-d3
;
color
:
$
forum-color-background-light
;
ol
,
ul
{
// Fix up the RTL-only _reset.scss, but only in specific places
ol
,
ul
{
// Fix up the RTL-only _reset.scss, but only in specific places
@include
padding-left
(
$baseline
*
2
);
@include
padding-left
(
$baseline
*
2
);
...
...
lms/static/sass/discussion/utilities/_shame.scss
View file @
52d5de5b
...
@@ -118,7 +118,7 @@ li[class*=forum-nav-thread-label-] {
...
@@ -118,7 +118,7 @@ li[class*=forum-nav-thread-label-] {
// -------
// -------
.discussion-module
{
.discussion-module
{
.
wrapper-
post-header
{
.post-header
{
margin-bottom
:
0
!
important
;
// overrides default header styling
margin-bottom
:
0
!
important
;
// overrides default header styling
padding-bottom
:
0
!
important
;
// overrides default header styling
padding-bottom
:
0
!
important
;
// overrides default header styling
...
@@ -135,3 +135,17 @@ li[class*=forum-nav-thread-label-] {
...
@@ -135,3 +135,17 @@ li[class*=forum-nav-thread-label-] {
}
}
}
}
}
}
// overrides courseware styling to keep views consistent everywhere
.discussion-article
{
.response-header
{
line-height
:
1
!
important
;
font-size
:
$forum-base-font-size
!
important
;
margin-bottom
:
0
!
important
;
padding-bottom
:
0
!
important
;
}
p
{
margin-bottom
:
0
!
important
;
}
}
lms/static/sass/discussion/views/_response.scss
View file @
52d5de5b
...
@@ -42,8 +42,7 @@
...
@@ -42,8 +42,7 @@
}
}
// +base - single response element
// +base - single response element
.container
.discussion-response
{
.discussion-response
{
.response-header-content
{
.response-header-content
{
// CASE: larger username for responses
// CASE: larger username for responses
...
...
lms/static/sass/discussion/views/_thread.scss
View file @
52d5de5b
...
@@ -16,7 +16,10 @@
...
@@ -16,7 +16,10 @@
.post-header-actions
{
.post-header-actions
{
@include
float
(
right
);
@include
float
(
right
);
}
}
}
// post article
.discussion-article
{
.posted-details
{
.posted-details
{
@extend
%t-copy-sub2
;
@extend
%t-copy-sub2
;
margin
:
(
$baseline
/
5
)
0
;
margin
:
(
$baseline
/
5
)
0
;
...
@@ -129,7 +132,9 @@
...
@@ -129,7 +132,9 @@
}
}
.discussion-response
.response-body
{
.discussion-response
.response-body
{
@include
padding-right
(
$baseline
);
//ensures content doesn't overlap on post or response actions.
@include
padding
((
$baseline
/
2
)
,
$baseline
,
0
,
0
);
//ensures content doesn't overlap on post or response actions.
margin-bottom
:
0
.2em
;
font-size
:
$forum-base-font-size
;
}
}
// +post - individual element styling
// +post - individual element styling
...
@@ -221,11 +226,6 @@
...
@@ -221,11 +226,6 @@
font-size
:
$forum-large-font-size
;
font-size
:
$forum-large-font-size
;
}
}
}
}
.response-body
{
margin-bottom
:
0
.2em
;
font-size
:
$forum-base-font-size
;
}
}
}
.discussion-reply-new
{
.discussion-reply-new
{
...
...
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